This commit was manufactured by cvs2svn to create branch 'R3_0_maintenance'.
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
index bd5f99c..fd30bc3 100644
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.web_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_tests.feature"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.0.5.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
index f2ee132..f4464e1 100644
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_tests.feature"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.0.4.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -21,6 +21,11 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
+   <requires>
+      <import feature="org.eclipse.wst.xml_ui.feature" version="3.0.5"/>
+      <import feature="org.eclipse.test" version="3.3.0"/>
+   </requires>
+
    <plugin
          id="org.eclipse.wst.dtd.core.tests"
          download-size="0"
diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
index 3ba1a9b..b09eedd 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.204.qualifier
 Bundle-ClassPath: jspcoretests.jar
 Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
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
index dba6304..d98679f 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,7 +26,6 @@
 import org.eclipse.jst.jsp.core.tests.translation.JSPJavaTranslatorCoreTest;
 import org.eclipse.jst.jsp.core.tests.validation.JSPActionValidatorTest;
 import org.eclipse.jst.jsp.core.tests.validation.JSPBatchValidatorTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPDirectiveValidatorTest;
 import org.eclipse.jst.jsp.core.tests.validation.JSPJavaValidatorTest;
 import org.eclipse.jst.jsp.css.core.tests.source.JSPedCSSSourceParserTest;
 
@@ -36,7 +35,7 @@
 	}
 
 	public JSPCoreTestSuite() {
-		super("JSP Core Test Suite");
+		super("SSE JSP Core Test Suite");
 
 		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
 		String wtp_autotest_noninteractive = null;
@@ -50,22 +49,21 @@
 		addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
 		addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
 		addTest(new TestSuite(FormatTester.class, "FormatTester"));
-		addTest(new TestSuite(TestModelRelease.class, "Model Tests"));
-		addTest(new TestSuite(TestModelWithNoFile.class, "Model with no file Tests"));
+		addTest(new TestSuite(TestModelRelease.class, "JSP Model Tests"));
+		addTest(new TestSuite(TestModelWithNoFile.class, "JSP Model with no file Tests"));
 		// temporarily removed since unstable, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213754 
 		// addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests"));
 		addTest(new TestSuite(JSPTokenizerTest.class, "Special Parsing Tests"));
-		addTest(new TestSuite(JSPJavaTranslatorCoreTest.class, "Core Translator Tests"));
-		addTest(new TestSuite(TestModelIncludes.class, "Core Fragment Inclusion Tests"));
-		addTest(new TestSuite(JSPCorePreferencesTest.class, "Preference Tests"));
+		addTest(new TestSuite(JSPJavaTranslatorCoreTest.class));
+		addTest(new TestSuite(TestModelIncludes.class));
+		addTest(new TestSuite(JSPCorePreferencesTest.class));
 		addTest(new TestSuite(JSPedCSSSourceParserTest.class, "Special Parsing Tests for JSP-CSS content"));
-		addTest(new TestSuite(JSPJavaValidatorTest.class, "Java Validator Tests"));
+		addTest(new TestSuite(JSPJavaValidatorTest.class, "JSP Java Validator Tests"));
 		addTest(new TestSuite(TestImportedNodes.class, "Imported Nodes Tests"));
 		addTest(new TestSuite(TestFixedCMDocuments.class, "Fixed CMDocument Creation Tests"));
 		addTest(new TestSuite(TestTaglibCMTests.class, "Custom Tag Library Content Model Tests"));
-		addTest(new TestSuite(JSPActionValidatorTest.class, "Action Validator Tests"));
-		addTest(new TestSuite(JSPBatchValidatorTest.class, "Batch Validator Tests"));
-		addTest(new TestSuite(JSPDirectiveValidatorTest.class, "Directive Validator Tests"));
+		addTest(new TestSuite(JSPActionValidatorTest.class, "JSP Action Validator Tests"));
+		addTest(new TestSuite(JSPBatchValidatorTest.class, "JSP Batch Validator Tests"));
 
 		if (wtp_autotest_noninteractive != null)
 			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
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
index f609b6c..c1c838e 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,7 +18,6 @@
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
 
 /**
  * This class tests basic creation of IModelManager plugin and the
@@ -43,8 +42,8 @@
 		assertTrue("modelManager must not be null", modelManager != null);
 
 		try {
-			model = modelManager.getModelForEdit(getClass().getName() + "." + getName() + ".test.jsp", new NullInputStream(), null);
-			assertTrue("basic JSP empty model could not be created", model != null);
+			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();
@@ -53,26 +52,6 @@
 
 	}
 
-	public void testCopyJSPModelForEdit() throws IOException {
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			model = modelManager.getModelForEdit("test.jsp", new NullInputStream(), null);
-			IStructuredModel modelCopy = modelManager.copyModelForEdit(model.getId(), getName()+".newId");
-			assertNotNull("copied JSP model was null", modelCopy);
-			assertEquals("ModelHandlers differ", model.getModelHandler(), modelCopy.getModelHandler());
-			assertEquals("StructuredDocument RegionParsers differ", model.getStructuredDocument().getParser().getClass(), modelCopy.getStructuredDocument().getParser().getClass());
-			assertEquals("Text document contents differ", model.getStructuredDocument().get(), modelCopy.getStructuredDocument().get());
-		}
-		catch (ResourceInUse e) {
-			fail("Resource in use reported for " + model.getId());
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
 	public void testNullArgument() throws UnsupportedEncodingException, IOException {
 		IStructuredModel model = null;
 		Exception e = null;
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
index 348a3d8..394b7df 100644
--- 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
@@ -580,7 +580,7 @@
 				System.out.println(formattedString);
 				System.out.println("=======================================");
 			}
-			assertEquals(expected, formatted);
+			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/contentmodels/TestTaglibCMTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
index 557a1e4..6858790 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
@@ -64,7 +64,6 @@
 
 	public void testLoadCustomTagsThroughJSPSyntax() throws IOException, CoreException {
 		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/test1.jsp"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
 
 		IDOMModel model = null;
 		try {
@@ -85,7 +84,6 @@
 
 	public void testLoadCustomTagsThroughXMLSyntax() throws IOException, CoreException {
 		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/testX.jsp"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
 
 		IDOMModel model = null;
 		try {
@@ -115,7 +113,6 @@
 		project.refreshLocal(IResource.DEPTH_INFINITE, null);
 
 		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append("DynamicWebProject/WebContent/index.jsp"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
 
 		IDOMModel model = null;
 		try {
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
index 3e6c937..cfb55d5 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,29 +10,22 @@
  *******************************************************************************/
 package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
 import junit.framework.TestCase;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
 import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
 import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
 import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
 
 public class TestModelHandlers extends TestCase {
 	private static ModelHandlerRegistry getModelHandlerRegistry() {
@@ -161,105 +154,6 @@
 		project.delete(true, null);
 	}
 
-	public void testDirtyStateForMisspelledEmbeddedCharset() throws Exception {
-		String projectName = "TestModelHandlers." + getName();
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(projectName, null, null);
-		}
-		IFile testFile = project.getFile("charaset.jsp");
-		String contents = "<%@ page language=\"java\" contentType=\"text/xml; charaset=UTF-8\" pageEncoding=\"UTF-8\"%>\n" + 
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-				"<Contents>\n" + 
-				"<Error state=\"fatal\" code=\"\">\n" + 
-				"</Error>\n" + 
-				"</Contents>";
-		if (!testFile.exists()) {
-			testFile.create(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		else {
-			testFile.setContents(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-
-			Document doc = ((IDOMModel) model).getDocument();
-			PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-			EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-
-			assertFalse("newly opened model was dirty, embedded handler changed? current family:" + embeddedHandler.getFamilyId(), model.isDirty());
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-		project.delete(true, null);
-	}
-	
-	public void testDirtyStateForEmbeddedCharsetWithoutContentType() throws Exception {
-		String projectName = "TestModelHandlers." + getName();
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(projectName, null, null);
-		}
-		IFile testFile = project.getFile("charaset.jsp");
-		String contents = "<%@ page language=\"java\" contentType=\"charset=UTF-8\" pageEncoding=\"UTF-8\"%>\n" + 
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-				"<Contents>\n" + 
-				"<Error state=\"fatal\" code=\"\">\n" + 
-				"</Error>\n" + 
-				"</Contents>";
-		if (!testFile.exists()) {
-			testFile.create(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		else {
-			testFile.setContents(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-
-			Document doc = ((IDOMModel) model).getDocument();
-			PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-			EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-
-			assertFalse("newly opened model was dirty, embedded handler changed? current family:" + embeddedHandler.getFamilyId(), model.isDirty());
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-		project.delete(true, null);
-	}
-
-	public void testDirtyStateForUnsupportedEmbeddedContentType() throws Exception {
-		String projectName = "TestModelHandlers." + getName();
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(projectName, null, null);
-		}
-		IFile testFile = project.getFile("unsupported.jsp");
-		String contents = "<%@ page language=\"java\" contentType=\"image/gif\"%>\n" + 
-		"out.write(\"GIF89a\"";
-		if (!testFile.exists()) {
-			testFile.create(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		else {
-			testFile.setContents(new ByteArrayInputStream(contents.getBytes("utf8")), IResource.FORCE, null);
-		}
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-			assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-		project.delete(true, null);
-	}
-
 	public void testDirtyStateForEmbeddedContentTypeSubXML() throws Exception {
 		String name = "bug243243";
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
index 700c3b1..ef81df8 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
@@ -21,7 +21,14 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jst.jsp.core.internal.contenttype.BooleanStack;
 import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
+import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 
@@ -48,11 +55,13 @@
 
 	protected void setUp() throws Exception {
 		super.setUp();
+		BooleanStack.maxDepth = 500;
 		tokenizer = new JSPTokenizer();
 	}
 
 	protected void tearDown() throws Exception {
 		super.tearDown();
+		BooleanStack.maxDepth = 100;
 		tokenizer = null;
 	}
 
@@ -181,8 +190,7 @@
 	}
 	
 	// Need to simulate typing characters into the document to cause the stack overflow.
-	// Test is irrelevant due to changes in [280496]
-	/*public void test265380() throws Exception {
+	public void test265380() throws Exception {
 		String projectName = "bug_265380";
 		int oldDepth = BooleanStack.maxDepth;
 		// Make the maxDepth equivalent to that we'd see in a normal editor
@@ -217,5 +225,5 @@
 				model.releaseFromEdit();
 			BooleanStack.maxDepth = oldDepth;
 		}
-	}*/
+	}
 }
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
index 60ac2aa..8169d29 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
@@ -13,7 +13,6 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -21,7 +20,6 @@
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -35,7 +33,6 @@
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
 import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
 import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
 import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
@@ -46,10 +43,7 @@
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
 import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -57,7 +51,6 @@
 public class JSPJavaTranslatorCoreTest extends TestCase {
 
 	static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
-	private static byte[] creationLock = new byte[0];
 
 	public JSPJavaTranslatorCoreTest() {
 	}
@@ -196,7 +189,6 @@
 			Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new NullProgressMonitor());
 			Job.getJobManager().join(ValidatorManager.VALIDATOR_JOB_FAMILY, new NullProgressMonitor());
 			Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
-			Thread.sleep(200);
 			Job.getJobManager().beginRule(root = ResourcesPlugin.getWorkspace().getRoot(), null);
 		}
 		catch (InterruptedException e) {
@@ -274,14 +266,13 @@
 
 		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
 		IFile main = project.getFile("WebContent/main.jsp");
-		ValidationResult result = new JSPJavaValidator().validate(main, IResourceDelta.ADDED, new ValidationState(), new NullProgressMonitor());
-		List messages = result.getReporter(null).getMessages();
+		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
 
 		StringBuffer s = new StringBuffer();
-		for (int i = 0; i < messages.size(); i++) {
-			s.append("\nproblem on line " + ((IMessage)messages.get(i)).getAttribute(IMarker.LINE_NUMBER) + ": " + ((IMessage)messages.get(i)).getText());
+		for (int i = 0; i < markers.length; i++) {
+			s.append("\nproblem on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": " + markers[i].getAttribute(IMarker.MESSAGE));
 		}
-		assertEquals("problem markers found" + s.toString(), 0, messages.size());
+		assertEquals("problem markers found" + s.toString(), 0, markers.length);
 	}
 
 	public void test_181057a() throws Exception {
@@ -342,18 +333,15 @@
 			// line/start-end
 			markerText.append("\nL" + markers[i].getAttribute(IMarker.LINE_NUMBER) + "/o" + markers[i].getAttribute(IMarker.CHAR_START) + "-"  + markers[i].getAttribute(IMarker.CHAR_END) + ":" + markers[i].getAttribute(IMarker.MESSAGE));
 		}
-		int numberOfSyntaxErrors = 0;
 		for (int i = 0; i < markers.length; i++) {
 			Object message = markers[i].getAttribute(IMarker.MESSAGE);
 			assertNotNull("Marker message was null!", message);
 			if (message.toString().startsWith("Syntax error")) {
-				numberOfSyntaxErrors++;
 				assertTrue("Syntax error reported before line 25" + markerText, ((Integer) markers[i].getAttribute(IMarker.LINE_NUMBER)).intValue() >= 25);
-//				assertTrue("Syntax error reported before offset 371" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() >= 370);
-//				assertTrue("Syntax error reported after 456" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() < 456);
+				assertTrue("Syntax error reported before offset 371" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() >= 370);
+				assertTrue("Syntax error reported after 456" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() < 456);
 			}
 		}
-//		assertEquals("wrong number of syntax errors reported\n" + markerText, 3, numberOfSyntaxErrors);
 
 		// clean up if we got to the end
 		project.delete(true, true, null);
@@ -375,149 +363,9 @@
 		helper.setURI(main.getFullPath().toOSString());
 		validator.validate(helper, reporter);
 
-		assertTrue("Unexpected problems found", reporter.getMessages().size() == 0);
+		assertTrue("Problem markers found", reporter.getMessages().size() == 0);
 
 		// clean up if we got to the end
 		project.delete(true, true, null);
 	}
-
-	public void test_preludes() throws Exception {
-		String testName = "testPreludeAndCodas";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
-		synchronized (creationLock) {
-			if (!project.isAccessible()) {
-				// Create new project
-				project = BundleResourceUtil.createSimpleProject(testName, null, null);
-				assertTrue(project.exists());
-				BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			}
-		}
-
-		IFile main = project.getFile("/web stuff/prelude-user/test.jsp");
-		assertTrue("sample test file not accessible", main.isAccessible());
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(main);
-			
-			ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-			
-			JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			IJSPTranslation translation = translationAdapter.getJSPTranslation();
-			assertNotNull("no Java translation found", translation);
-			assertTrue("prelude0 contents not included", translation.getJavaText().indexOf("int prelude0") > 0);
-			assertTrue("prelude1 contents not included", translation.getJavaText().indexOf("int prelude1") > 0);
-
-			assertTrue("import statement not found", translation.getJavaText().indexOf("import java.lang.ref.Reference") > 0);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	public void test_codas() throws Exception {
-		String testName = "testPreludeAndCodas";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
-		synchronized (creationLock) {
-			if (!project.isAccessible()) {
-				// Create new project
-				project = BundleResourceUtil.createSimpleProject(testName, null, null);
-				assertTrue(project.exists());
-				BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			}
-		}
-
-		IFile main = project.getFile("/web stuff/coda-user/test.jsp");
-		assertTrue("sample test file not accessible", main.isAccessible());
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(main);
-			
-			ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-			
-			JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			IJSPTranslation translation = translationAdapter.getJSPTranslation();
-			assertNotNull("no Java translation found", translation);
-			assertTrue("coda0 contents not included", translation.getJavaText().indexOf("int coda0") > 0);
-			assertTrue("coda1 contents not included", translation.getJavaText().indexOf("int coda1") > 0);
-
-			assertTrue("import statement not found", translation.getJavaText().indexOf("import java.lang.ref.Reference") > 0);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-	public void test_prelude_and_coda() throws Exception {
-		String testName = "testPreludeAndCodas";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
-		synchronized (creationLock) {
-			if (!project.isAccessible()) {
-				// Create new project
-				project = BundleResourceUtil.createSimpleProject(testName, null, null);
-				assertTrue(project.exists());
-				BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			}
-		}
-
-		IFile main = project.getFile("/web stuff/both/test.jsp");
-		assertTrue("sample test file not accessible", main.isAccessible());
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(main);
-			
-			ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-			
-			JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			IJSPTranslation translation = translationAdapter.getJSPTranslation();
-			assertNotNull("no Java translation found", translation);
-			assertTrue("prelude0 contents not included", translation.getJavaText().indexOf("int prelude0") > 0);
-			assertTrue("prelude1 contents included", translation.getJavaText().indexOf("int prelude1") < 0);
-			assertTrue("coda0 contents not included", translation.getJavaText().indexOf("int coda0") > 0);
-			assertTrue("coda1 contents included", translation.getJavaText().indexOf("int coda1") < 0);
-
-			assertTrue("import statement not found", translation.getJavaText().indexOf("import java.lang.ref.Reference") > 0);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	public void testVariablesFromIncludedFragments() throws Exception {
-		String testName = "testVariablesFromIncludedFragments";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
-		synchronized (creationLock) {
-			if (!project.isAccessible()) {
-				// Create new project
-				project = BundleResourceUtil.createSimpleProject(testName, null, null);
-				assertTrue(project.exists());
-				BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-			}
-		}
-
-		IFile main = project.getFile("/WebContent/main.jsp");
-		assertTrue("sample test file not accessible", main.isAccessible());
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(main);
-			
-			ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-			
-			JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			IJSPTranslation translation = translationAdapter.getJSPTranslation();
-			assertNotNull("no Java translation found", translation);
-			assertTrue("String variableFromHeader1 not found", translation.getJavaText().indexOf("String variableFromHeader1") > 0);
-			assertTrue("header1 contents not included", translation.getJavaText().indexOf("String variableFromHeader1 = \"initialized in header 1\";") > 0);
-			assertTrue("header2 contents not included", translation.getJavaText().indexOf("variableFromHeader1 = \"reassigned in header 2\";") > 0);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
 }
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
index e22c507..9520642 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
@@ -126,15 +126,8 @@
 
 		helper.setURI(filePath);
 		validator.validate(helper, reporter);
-		
-		StringBuffer error = new StringBuffer("jsp action validator found errors when it should not have");
-		List messages = reporter.getMessages();
-		for (int i = 0; i < messages.size(); i++) {
-			error.append('\n');
-			error.append(((IMessage) messages.get(i)).getText());
-		}
 
-		assertTrue(error.toString(), reporter.getMessages().isEmpty());
+		assertTrue("jsp action validator found errors when it should not have", reporter.getMessages().isEmpty());
 	}
 
 	/**
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
index c4e0998..7f654ec 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
@@ -105,7 +105,7 @@
 		helper.setURIs(new String[]{filePath1, filePath2});
 
 		validator.validate(helper, reporter);
-		assertTrue("expected jsp errors were not found in both files: " + reporter.getMessages().size(), reporter.getMessages().size() >= 2);
+		assertTrue("jsp errors were not found in both files", reporter.getMessages().size() == 2);
 	}
 
 	public void testFragmentValidationPreferenceOnProject() throws Exception {
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java
deleted file mode 100644
index f60f432..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCoreMessages;
-import org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-import junit.framework.TestCase;
-
-public class JSPDirectiveValidatorTest extends TestCase {
-	
-	private String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "testvalidatejspdirectives";
-	private static final String FRAGMENT_NAME = "fragmentThatDoesntExist.jspf";
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
-			BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
-		}
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-	}
-	
-	public void testBug265710Expression() throws Exception {
-		JSPDirectiveValidator validator = new JSPDirectiveValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/bug265710expression.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-		
-		if (reporter.getMessages().size() > 0) {
-			Iterator it = reporter.getMessages().iterator();
-			while (it.hasNext()) {
-				IMessage message = (IMessage) it.next();
-				if (message.getLineNumber() == 14 && message.getSeverity() == IMessage.HIGH_SEVERITY) {
-					fail("JSP Directive Validator flagged a JSP expression in the import directive");
-				}
-			}
-		}
-	}
-	
-	public void testBug265710El() throws Exception {
-		JSPDirectiveValidator validator = new JSPDirectiveValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/bug265710el.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-		
-		if (reporter.getMessages().size() > 0) {
-			Iterator it = reporter.getMessages().iterator();
-			while (it.hasNext()) {
-				IMessage message = (IMessage) it.next();
-				if (message.getLineNumber() == 11 && message.getSeverity() == IMessage.HIGH_SEVERITY) {
-					fail("JSP Directive Validator flagged JSP EL in the import directive");
-				}
-			}
-		}
-	}
-	
-	public void testIncludeDirective() throws Exception {
-		JSPDirectiveValidator validator = new JSPDirectiveValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/testinclude.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-		
-		boolean foundMissingInclude = false;
-		boolean foundIncludeWithError = false;
-		if (reporter.getMessages().size() > 0) {
-			Iterator it = reporter.getMessages().iterator();
-			boolean foundError = false;
-			while (it.hasNext() && !foundError) {
-				IMessage message = (IMessage) it.next();
-				if (message.getLineNumber() == 11)
-					foundIncludeWithError = true;
-				else if (message.getLineNumber() == 12) {
-					String expectedMsg = NLS.bind(JSPCoreMessages.JSPDirectiveValidator_4, new String[] { FRAGMENT_NAME, "/" + PROJECT_NAME + "/WebContent/" + FRAGMENT_NAME });
-					if (!expectedMsg.equals(message.getText()))
-						fail("Error found on line 12, but was not a missing fragment error.");
-					foundMissingInclude = true;
-					break;
-				}
-			}
-		}
-		
-		assertFalse("JSP Directive Validator reported an error for a fragment that should be locatable.", foundIncludeWithError);
-		assertTrue("JSP Directive Validator did not report the missing fragment.", foundMissingInclude);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp
index d9b754c..8e971e7 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp
+++ b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp
@@ -1,13 +1,13 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"

-    pageEncoding="ISO-8859-1"%>

-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<title>Insert title here</title>

-</head>

-<body>

-

-</body>

+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.classpath
deleted file mode 100644
index 0d9154b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.classpath
+++ /dev/null
@@ -1,6 +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="output" path="web stuff/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.project
deleted file mode 100644
index 1d65c9b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testPreludeAndCodas</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/WEB-INF/web.xml
deleted file mode 100644
index 7e57380..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>testPreludeAndCodas</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<jsp-config>
-		<jsp-property-group>
-		<url-pattern>/prelude-user/*.jsp</url-pattern>
-		<include-prelude>/common/prelude0.jspf</include-prelude>
-		<include-prelude>/common/prelude1.jspf</include-prelude>
-		</jsp-property-group>
-
-		<jsp-property-group>
-		<url-pattern>/coda-user/*.jsp</url-pattern>
-		<include-coda>/common/coda0.jspf</include-coda>
-		<include-coda>/common/coda1.jspf</include-coda>
-		</jsp-property-group>
-
-		<jsp-property-group>
-		<url-pattern>/both/*.jsp</url-pattern>
-		<include-prelude>/common/prelude0.jspf</include-prelude>
-		<include-coda>/common/coda0.jspf</include-coda>
-		</jsp-property-group>
-
-		<jsp-property-group>
-		<description>JSP configuration of all the JSP's </description>
-		<url-pattern>*.jsp</url-pattern>
-		<include-prelude>/testFragment.jspf</include-prelude>
-		</jsp-property-group>
-	</jsp-config>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/both/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/both/test.jsp
deleted file mode 100644
index 14b695f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/both/test.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/coda-user/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/coda-user/test.jsp
deleted file mode 100644
index 14b695f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/coda-user/test.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda0.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda0.jspf
deleted file mode 100644
index 8e983ea..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda0.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% int coda0 = 0; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda1.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda1.jspf
deleted file mode 100644
index bac1d47..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda1.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% int coda1 = 0; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude0.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude0.jspf
deleted file mode 100644
index dd1a10a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude0.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% int prelude0 = 0; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude1.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude1.jspf
deleted file mode 100644
index b5be153..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude1.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% int prelude1 = 1; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/prelude-user/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/prelude-user/test.jsp
deleted file mode 100644
index 14b695f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/prelude-user/test.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/test.jsp
deleted file mode 100644
index 14b695f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/test.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/testFragment.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/testFragment.jspf
deleted file mode 100644
index 909af09..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/testFragment.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<%@page import="java.lang.ref.Reference" %>

diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.classpath
deleted file mode 100644
index bd9e429..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.project
deleted file mode 100644
index aacc716..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testVariablesFromIncludedFragments</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/main.jsp
deleted file mode 100644
index 8d045d0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/main.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">

-

-<%

-String variableFromMainJSP = "initialized in main";

-%>

-

-<%@ include file="test_header1.jspf" %>

-

-<%

-variableFromMainJSP = "reassigned in main";

-variableFromHeader1 = "reassigned in main";

-%>

-Value of variableFromMainJSP: "<%=variableFromMainJSP%>"

-<br>

-Value of variableFromHeader1: "<%=variableFromHeader1%>"

diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header1.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header1.jspf
deleted file mode 100644
index 8475454..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header1.jspf
+++ /dev/null
@@ -1,4 +0,0 @@
-<%

-String variableFromHeader1 = "initialized in header 1";

-%>

-<%@ include file="test_header2.jspf" %>

diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header2.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header2.jspf
deleted file mode 100644
index 68074bb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header2.jspf
+++ /dev/null
@@ -1,4 +0,0 @@
-<%

-variableFromMainJSP = "reassigned in header 2";

-variableFromHeader1 = "reassigned in header 2";

-%>

diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/.project
deleted file mode 100644
index 5f2075a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testvalidatejspactions</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>testvalidatejspactions</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710el.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710el.jsp
deleted file mode 100644
index acfff81..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710el.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<jsp:include page="${param.goto}"></jsp:include>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710expression.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710expression.jsp
deleted file mode 100644
index c259359..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710expression.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<%
-	String redirect = request.getParameter("goto");
-%>
-
-<jsp:include page="<%= redirect %>"></jsp:include>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/fragment.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/fragment.jspf
deleted file mode 100644
index c93e4ae..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/fragment.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<div id="content"></div>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/testinclude.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/testinclude.jsp
deleted file mode 100644
index efb7d74..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/testinclude.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<jsp:include page="fragment.jspf"></jsp:include>
-<jsp:include page="fragmentThatDoesntExist.jspf"></jsp:include>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
index 6f33712..d7925ce 100644
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: jspencodingtests.jar
 Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -13,8 +13,8 @@
  org.eclipse.core.runtime,
  org.eclipse.jst.jsp.core,
  org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.2,4.0.0)",
+ org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
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
index 00791d7..0c919a9 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 
 import java.io.IOException;
 import java.io.Reader;
-import java.util.StringTokenizer;
 import java.util.regex.Pattern;
 
 import junit.framework.TestCase;
@@ -21,7 +20,6 @@
 import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
 import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
 import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
 import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
 
@@ -140,51 +138,34 @@
 	 * @param contentType
 	 */
 	private void parseContentTypeValue(String contentType) {
-		/*
-		 * Based partially on
-		 * org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterImpl
-		 * .getMimeTypeFromContentTypeValue(String) , divides the full value
-		 * into segments according to ';', assumes the first specifies the
-		 * content type itself if it has no '=', and that the remainder are
-		 * parameters which may specify a charset
-		 */
-		
-		String cleanContentTypeValue = StringUtils.stripNonLetterDigits(contentType);
-		/* Break the mime header into the main value and its parameters, separated by ';' */
-		StringTokenizer tokenizer = new StringTokenizer(cleanContentTypeValue, ";"); //$NON-NLS-1$
-		int tLen = tokenizer.countTokens();
-		if (tLen == 0)
-			return;
-		String[] tokens = new String[tLen];
-		int j = 0;
-		while (tokenizer.hasMoreTokens()) {
-			tokens[j] = tokenizer.nextToken();
-			j++;
-		}
-		
-		int firstParameter = 0;
-		if (tokens[0].indexOf('=') == -1) {
-			/*
-			 * no equal sign in the first segment, so assume it indicates a
-			 * content type properly
-			 */
-			fContentType = tokens[0].trim();
-			firstParameter = 1;
-		}
-		/*
-		 * now handle parameters as name=value pairs, looking for "charset"
-		 * specifically
-		 */
-		Pattern equalPattern = Pattern.compile("\\s*=\\s*"); //$NON-NLS-1$
-		for (int i = firstParameter; i < tokens.length; i++) {
-			String[] pair = equalPattern.split(tokens[i]);
-			if (pair.length < 2)
-				continue;
-			if (pair[0].trim().equals("charset")) { //$NON-NLS-1$
-				fCharset = pair[1].trim();
+		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];
+					}
+				}
+			}
+			else {
+				fContentType = parts[0];
 			}
 		}
-
+		if (parts.length > 1) {
+			fCharset = parts[1];
+		}
 	}
 
 	/**
@@ -351,13 +332,12 @@
 		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
 		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
 		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
-	*/
 
 	public void testUTF16BOM() throws Exception {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=243735
-//		String filename = fileLocation + "utf16BOM.jsp";
-//		dotestfile(filename, "utf-16", null, null);
+		String filename = fileLocation + "utf16BOM.jsp";
+		doTestFile(filename, "UTF-16", null, null);
 	}
+	*/
 	
 	public void testUTF16leXmlStyle() throws Exception {
 		String filename = fileLocation + "utf16le_xmlStyle.jsp";
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
index 6ee242e..88e271a 100644
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
index e27fad0..ce73933 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/.classpath
+++ b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="text.tests"/>
-	<classpathentry kind="src" path="jface.text.tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
index c358323..010f258 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.203.qualifier
 Bundle-ClassPath: jspuitests.jar
 Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -43,7 +43,6 @@
  org.eclipse.wst.html.core,
  org.eclipse.wst.css.core,
  org.eclipse.ui.views,
- org.eclipse.ui.workbench,
  org.eclipse.core.runtime,
  org.eclipse.wst.xml.ui,
  com.ibm.icu,
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
index 9739698..874b2da 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
+# Copyright (c) 2004, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -16,11 +16,7 @@
                jspuitests.jar,\
                META-INF/,\
                about.html,\
-               plugin.properties,\
-               text.tests/,\
-               jface.text.tests/
+               plugin.properties
 jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/,\
-                        text.tests/,\
-                        jface.text.tests/
+source.jspuitests.jar = src/
 output.jspuitests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
deleted file mode 100644
index 1d6e394..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Christian Plesner Hansen (plesner@quenta.org) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextStore;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
- * Generic test of simple character pair matchers
- *
- * @since 3.3
- */
-public abstract class AbstractPairMatcherTest extends TestCase {
-
-	/**
-	 * Constructs a new character pair matcher.
-	 * 
-	 * @param chars the characters to match
-	 * @return the character pair matcher
-	 */
-	protected abstract ICharacterPairMatcher createMatcher(final String chars);
-
-	/**
-	 * Returns the partitioning treated by the matcher.
-	 * 
-	 * @return the partition
-	 */
-	protected abstract String getDocumentPartitioning();
-
-	public AbstractPairMatcherTest(String name) {
-		super(name);
-	}
-
-	public AbstractPairMatcherTest() {
-		super();
-	}
-
-	/* --- T e s t s --- */
-
-	/** Tests that the test case reader works */
-	public void testTestCaseReader() {
-		performReaderTest("#( )%", 3,  0,  "( )");
-		performReaderTest("%( )#", 0,  3,  "( )");
-		performReaderTest("( )%",  3,  -1, "( )");
-		performReaderTest("#%",    0,  0,  "");
-	}
-
-	/**
-	 * Very simple checks.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testSimpleMatchSameMatcher() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, "#(   )%");
-		performMatch(matcher, "#[   ]%");
-		performMatch(matcher, "#{   }%");
-		performMatch(matcher, "(%   )#");
-		performMatch(matcher, "[%   ]#");
-		performMatch(matcher, "{%   }#");
-		matcher.dispose();
-	}
-
-	/**
-	 * Very simple checks.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testSimpleMatchDifferentMatchers() throws BadLocationException {
-		performMatch("()[]{}", "#(   )%");
-		performMatch("()[]{}", "#[   ]%");
-		performMatch("()[]{}", "#{   }%");
-		performMatch("()[]{}", "(%   )#");
-		performMatch("()[]{}", "[%   ]#");
-		performMatch("()[]{}", "{%   }#");
-	}
-
-	/**
-	 * Close matches.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testCloseMatches() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, "#()%");
-		performMatch(matcher, "(%)#");
-		performMatch(matcher, "#(())%");
-		performMatch(matcher, "(%())#");
-		performMatch(matcher, "((%)#)");
-		performMatch(matcher, "(#()%)");
-		matcher.dispose();
-	}
-
-
-	/**
-	 * Checks of simple situations where no matches should be found.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testIncompleteMatch() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, "(% ");
-		performMatch(matcher, "%(  )");
-		performMatch(matcher, "( % )");
-		performMatch(matcher, "(  %)");
-		performMatch(matcher, "%");
-		matcher.dispose();
-	}
-
-	/**
-	 * Test that it doesn't match across different partitions.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testPartitioned() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, "(% |a a| )#");
-		performMatch(matcher, "#( |a a| )%");
-		performMatch(matcher, "|b #( )% b|");
-		performMatch(matcher, "( |b )% b|");
-		performMatch(matcher, "(% |b ) b|");
-		performMatch(matcher, "|a ( a| )%");
-		performMatch(matcher, "|a (% a| )");
-		performMatch(matcher, "|c #( c| ) ( |c )% c|");
-		performMatch(matcher, "|c (% c| ) ( |c )# c|");
-		performMatch(matcher, "(% |a ) a| |b ) b| |c ) c| )#");
-		matcher.dispose();
-	}
-
-	/**
-	 * Test that it works properly next to partition boundaries.
-	 * 
-	 * @throws BadLocationException
-	 */
-	public void testTightPartitioned() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, "(|b)%b|");
-		performMatch(matcher, "(%|b)b|");
-		performMatch(matcher, "|a(a|)%");
-		performMatch(matcher, "|a(%a|)");
-		performMatch(matcher, "|c#(c|)(|c)%c|");
-		performMatch(matcher, "|c(%c|)(|c)#c|");
-		performMatch(matcher, "(%|a)a||b)b||c)c|)#");
-		matcher.dispose();
-	}
-
-	/** Test that nesting works properly */
-	public void testNesting() {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		performMatch(matcher, " ( #( ( ( ) ) ( ) )% ) ");
-		performMatch(matcher, " ( (% ( ( ) ) ( ) )# ) ");
-		performMatch(matcher, " ( #( { ( ) } [ ] )% ) ");
-		performMatch(matcher, " ( (% { ( ) } [ ] )# ) ");
-		performMatch(matcher, " ( ( #{ ( ) }% [ ] ) ) ");
-		performMatch(matcher, " ( ( {% ( ) }# [ ] ) ) ");
-		performMatch(matcher, "a(b#(c(d(e)f)g(h)i)%j)k");
-		performMatch(matcher, "a(b(%c(d(e)f)g(h)i)#j)k");
-		performMatch(matcher, "a(b#(c{d(e)f}g[h]i)%j)k");
-		performMatch(matcher, "a(b(%c{d(e)f}g[h]i)#j)k");
-		performMatch(matcher, "a(b(c#{d(e)f}%g[h]i)j)k");
-		performMatch(matcher, "a(b(c{%d(e)f}#g[h]i)j)k");
-		matcher.dispose();
-	}
-
-	/**
-	 * Test a few boundary conditions.
-	 * 
-	 * * @throws BadLocationException
-	 */
-	public void testBoundaries() throws BadLocationException {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}");
-		final StringDocument doc= new StringDocument("abcdefghijkl");
-		assertNull(matcher.match(null, 0));
-		assertNull(matcher.match(doc, -1));
-		assertNull(matcher.match(doc, doc.getLength() + 1));
-		matcher.dispose();
-	}
-
-	public void testBug156426() {
-		final ICharacterPairMatcher matcher= createMatcher("()[]{}<>");
-		performMatch(matcher, " #( a < b )% ");
-		performMatch(matcher, " (% a < b )# ");
-		performMatch(matcher, " #( a > b )% ");
-		performMatch(matcher, " (% a > b )# ");
-		matcher.dispose();
-	}
-
-	/* --- U t i l i t i e s --- */
-
-	/**
-	 * Checks that the test case reader reads the test case as specified.
-	 * 
-	 * @param testString the string to test
-	 * @param expectedPos the expected position
-	 * @param expectedMatch the expected match
-	 * @param expectedString the expected string
-	 */
-	private void performReaderTest(String testString, int expectedPos, int expectedMatch, String expectedString) {
-		TestCase t0= createTestCase(testString);
-		assertEquals(expectedPos, t0.fPos);
-		assertEquals(expectedMatch, t0.fMatch);
-		assertEquals(expectedString, t0.fString);
-	}
-
-	/**
-	 * Checks that the given matcher matches the input as specified.
-	 * 
-	 * @param matcher the matcher
-	 * @param testCase the test string
-	 */
-	protected void performMatch(final ICharacterPairMatcher matcher, final String testCase) {
-		final TestCase test= createTestCase(testCase);
-		matcher.clear();
-		final IRegion region= matcher.match(test.getDocument(), test.fPos);
-		if (test.fMatch == -1) {
-			// if no match point has been specified there should be
-			// no match
-			if (region != null) System.out.println(region.getOffset());
-			assertNull(region);
-		} else {
-			assertNotNull(region);
-			final boolean isForward= test.fPos > test.fMatch;
-			assertEquals(isForward, matcher.getAnchor() == ICharacterPairMatcher.RIGHT);
-			// If the match is forward, the curser is one character
-			// after the start of the match, so we need to count one
-			// step backwards
-			final int offset= isForward ? test.getOffset() : test.getOffset() - 1;
-			final int length= isForward ? test.getLength() : test.getLength() + 1;
-			assertEquals(length, region.getLength());
-			assertEquals(offset, region.getOffset());
-		}
-	}
-
-	private void performMatch(final String delims, final String testCase) {
-		final ICharacterPairMatcher matcher= createMatcher(delims);
-		performMatch(matcher, testCase);
-		matcher.dispose();
-	}
-
-	/**
-	 * Creates a text case from a string. In the given string a '%' represents the position of the
-	 * cursor and a '#' represents the position of the expected matching character.
-	 * 
-	 * @param str the string for which to create the test case
-	 * @return the created test case
-	 */
-	public TestCase createTestCase(String str) {
-		int pos= str.indexOf("%");
-		assertFalse(pos == -1);
-		int match= str.indexOf("#");
-		// account for the length of the first position marker,
-		// if there is one
-		if (match != -1 && match < pos) pos -= 1;
-		if (pos < match) match -= 1;
-		final String stripped= str.replaceAll("%", "").replaceAll("#", "");
-		return new TestCase(stripped, pos, match);
-	}
-
-	private class TestCase {
-
-		public final String fString;
-		public final int fPos, fMatch;
-
-		public TestCase(String string, int pos, int match) {
-			fString= string;
-			fPos= pos;
-			fMatch= match;
-		}
-
-		public IDocument getDocument() {
-			return new StringDocument(fString);
-		}
-
-		public int getLength() {
-			return Math.abs(fPos - fMatch);
-		}
-
-		public int getOffset() {
-			if (fPos > fMatch) return fMatch;
-			return fPos;
-		}
-
-	}
-
-	private class StringDocument extends Document {
-
-		public StringDocument(String str) {
-			this.setTextStore(new StringTextStore(str));
-			this.set(str);
-			final IDocumentPartitioner part= createPartitioner();
-			this.setDocumentPartitioner(getDocumentPartitioning(), part);
-			part.connect(this);
-		}
-
-	}
-
-	private static class StringTextStore implements ITextStore {
-
-		private String fString;
-
-		public StringTextStore(final String str) {
-			fString= str;
-		}
-
-		public char get(int offset) {
-			return fString.charAt(offset);
-		}
-
-		public String get(int offset, int length) {
-			return fString.substring(offset, offset + length);
-		}
-
-		public int getLength() {
-			return fString.length();
-		}
-
-		public void replace(int offset, int length, String text) {
-			throw new UnsupportedOperationException();
-		}
-
-		public void set(String text) {
-			fString= text;
-		}
-
-	}
-
-	private static String DEFAULT_PARTITION= IDocument.DEFAULT_CONTENT_TYPE;
-
-	private static IDocumentPartitioner createPartitioner() {
-		final RuleBasedPartitionScanner scan= new RuleBasedPartitionScanner();
-		final List/*<IPredicateRule>*/ rules= new ArrayList/*<IPredicateRule>*/();
-		rules.add(new SingleLineRule("|a", "a|", new Token("a")));
-		rules.add(new SingleLineRule("|b", "b|", new Token("b")));
-		rules.add(new SingleLineRule("|c", "c|", new Token("c")));
-		scan.setPredicateRules((IPredicateRule[]) rules.toArray(new IPredicateRule[rules.size()]));
-		scan.setDefaultReturnToken(new Token(DEFAULT_PARTITION));
-		return new FastPartitioner(scan, new String[] { DEFAULT_PARTITION, "a", "b", "c" });
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java
deleted file mode 100644
index 361e701..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-/**
- * Tests for DefaultUndoManager. Changed from the JFace original to creates
- * and test against a structured document.
- */
-public abstract class AbstractUndoManagerTest extends TestCase {
-
-	/** The maximum undo level. */
-	private static final int MAX_UNDO_LEVEL= 256;
-
-	/** The shell. */
-	private Shell fShell;
-	/** The text viewer. */
-	private ITextViewer fTextViewer;
-	/** The undo manager. */
-	private IUndoManager fUndoManager;
-
-	private static final int LOOP_COUNT= 20;
-
-	//--- Static data sets for comparing scenarios - obtained from capturing random data ---
-	/** Original document */
-	private static final String INITIAL_DOCUMENT_CONTENT= "+7cyg:/F!T4KnW;0+au$t1G%(`Z|u'7'_!-k?<c\"2Y.]CwsO.r";
-	/** Replacement string */
-	private static final String [] REPLACEMENTS= { ">", "F", "M/r-*", "-", "bl", "", "}%/#", "", "k&", "f", "\\g", "c!x", "TLG-", "NPO", "Rp9u", "", "X", "W(", ")z", "oe", "", "h*", "t", "I", "X=N>", "2yt", "&Z", "2)W=", ":K", "P9S", "s8t8o", "", "", "5{7", "%", "", "v3", "Wz", "sH", "3c", "8", "ol", ",6$", "94[#", ".~", "n", ">", "9", "W", ",(FW", "Q", "^", "Bq", "$", "re", "", "9", "8[", "Mx", "4b", "$6", "F", "8s]", "o", "-", "E&6", "S\\", "/", "z.a", "4ai", "b", ")", "", "l", "VU", "7M+Ql", "xZ?x", "xx", "lc", "b", "A", "!", "4pSU", "", "{J", "H", "l>_", "n&9", "", "&`", ";igQxq", "", ">", ";\"", "k\\`]G", "o{?", "", "K", "_6", "="};
-	/** Position/offset pairs */
-	private static final int [] POSITIONS= { 18, 2, 43, 1, 3, 2, 28, 3, 35, 1, 23, 5, 32, 2, 30, 1, 22, 1, 37, 0, 23, 3, 43, 2, 46, 1, 17, 1, 36, 6, 17, 5, 30, 4, 25, 1, 2, 2, 30, 0, 37, 3, 28, 1, 30, 2, 20, 5, 33, 1, 29, 1, 15, 2, 21, 2, 24, 4, 38, 3, 8, 0, 33, 2, 15, 2, 25, 0, 8, 2, 20, 3, 43, 2, 44, 1, 44, 2, 32, 2, 40, 2, 32, 3, 12, 2, 38, 3, 33, 2, 46, 0, 13, 3, 45, 0, 16, 2, 3, 2, 44, 0, 48, 0, 18, 5, 7, 6, 7, 3, 40, 0, 9, 1, 16, 3, 28, 3, 36, 1, 35, 2, 0, 3, 6, 1, 10, 4, 14, 2, 15, 3, 33, 1, 36, 0, 37, 0, 4, 3, 31, 3, 33, 3, 11, 3, 20, 2, 25, 3, 4, 3, 7, 3, 17, 0, 3, 1, 31, 3, 34, 1, 21, 0, 33, 1, 17, 4, 9, 1, 26, 3, 2, 3, 12, 1, 26, 3, 9, 5, 5, 0, 31, 3, 0, 3, 12, 1, 1, 1, 3, 0, 39, 0, 9, 2, 2, 0, 28, 2};
-
-	private static final boolean DEBUG= false;
-
-
-	/*
-	 * @see TestCase#TestCase(String)
-	 */
-	public AbstractUndoManagerTest(final String name) {
-		super(name);
-	}
-
-	/*
-	 *  @see TestCase#setUp()
-	 */
-	protected void setUp() {
-		fShell= new Shell();
-		fUndoManager= createUndoManager(MAX_UNDO_LEVEL);
-		fTextViewer= new TextViewer(fShell, SWT.NONE);
-		fTextViewer.setUndoManager(fUndoManager);
-		fUndoManager.connect(fTextViewer);
-	}
-
-	abstract protected IUndoManager createUndoManager(int maxUndoLevel);
-
-	/*
-	 *  @see TestCase#tearDown()
-	 */
-	protected void tearDown() {
-		fUndoManager.disconnect();
-		fUndoManager= null;
-		fShell.dispose();
-		fShell= null;
-		fTextViewer= null;
-	}
-
-	/**
-	 * Test for line delimiter conversion.
-	 */
-	public void testConvertLineDelimiters() {
-		final String original= "a\r\nb\r\n";
-		final IDocument document= createDocument(original);
-		fTextViewer.setDocument(document);
-
-		try {
-			document.replace(1, 2, "\n");
-			document.replace(3, 2, "\n");
-		} catch (BadLocationException e) {
-			assertTrue(false);
-		}
-
-		assertTrue(fUndoManager.undoable());
-		fUndoManager.undo();
-		assertTrue(fUndoManager.undoable());
-		fUndoManager.undo();
-
-		final String reverted= document.get();
-
-		assertEquals(original, reverted);
-	}
-
-	/**
-	 * Randomly applies document changes.
-	 */
-	public void testRandomAccess() {
-		final int RANDOM_STRING_LENGTH= 50;
-		final int RANDOM_REPLACE_COUNT= 100;
-
-		assertTrue(RANDOM_REPLACE_COUNT >= 1);
-		assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
-		String original= createRandomString(RANDOM_STRING_LENGTH);
-		final IDocument document= createDocument(original);
-		fTextViewer.setDocument(document);
-
-		doChange(document, RANDOM_REPLACE_COUNT);
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-
-		final String reverted= document.get();
-		assertEquals(original, reverted);
-	}
-
-	private void doChange(IDocument document, int count) {
-		try {
-			String before= document.get();
-
-			if (DEBUG)
-				System.out.println(before);
-
-			Position [] positions= new Position[count];
-			String [] strings= new String[count];
-			for (int i= 0; i < count; i++) {
-				final Position position= createRandomPositionPoisson(document.getLength());
-				final String string= createRandomStringPoisson();
-				document.replace(position.getOffset(), position.getLength(), string);
-				positions[i]= position;
-				strings[i]= string;
-			}
-
-			if (DEBUG) {
-				System.out.print("{ ");
-				for (int i=0; i<count; i++) {
-					System.out.print(positions[i].getOffset());
-					System.out.print(", ");
-					System.out.print(positions[i].getLength());
-					System.out.print(", ");
-				}
-				System.out.println(" }");
-				System.out.print("{ ");
-				for (int i=0; i<count; i++) {
-					System.out.print("\"");
-					System.out.print(strings[i]);
-					System.out.print("\", ");
-				}
-				System.out.println(" }");
-			}
-		} catch (BadLocationException e) {
-			assertTrue(false);
-		}
-	}
-
-	// repeatable test case for comparing success/failure among different tests
-	private void doRepeatableChange(IDocument document) {
-		assertTrue(POSITIONS.length >= (2 * REPLACEMENTS.length));
-		try {
-			for (int i= 0; i < REPLACEMENTS.length; i++) {
-				int offset= POSITIONS[i*2];
-				int length= POSITIONS[i*2+1];
-				if (document.getLength() > offset + length)
-					document.replace(offset, length, REPLACEMENTS[i]);
-				else
-					document.replace(0,0, REPLACEMENTS[i]);
-			}
-		} catch (BadLocationException e) {
-			assertTrue(false);
-		}
-	}
-
-	public void testLoopRandomAccessAsCompound() {
-		int i= 0;
-		while (i < LOOP_COUNT) {
-			fUndoManager.reset();
-			testRandomAccessAsCompound();
-			i++;
-		}
-	}
-
-	public void testLoopRandomAccess() {
-		int i= 0;
-		while (i < LOOP_COUNT) {
-			fUndoManager.reset();
-			testRandomAccess();
-			i++;
-		}
-	}
-
-	public void testLoopRandomAccessAsUnclosedCompound() {
-		int i= 0;
-		while (i < LOOP_COUNT) {
-			fUndoManager.reset();
-			testRandomAccessAsUnclosedCompound();
-			i++;
-		}
-	}
-
-	public void testLoopConvertLineDelimiters() {
-		int i= 0;
-		while (i < LOOP_COUNT) {
-			fUndoManager.reset();
-			testConvertLineDelimiters();
-			i++;
-		}
-	}
-
-	public void testLoopRandomAccessWithMixedCompound() {
-		int i= 0;
-		while (i < LOOP_COUNT) {
-			fUndoManager.reset();
-			testRandomAccessWithMixedCompound();
-			i++;
-		}
-	}
-
-	public void testRandomAccessAsCompound() {
-		final int RANDOM_STRING_LENGTH= 50;
-		final int RANDOM_REPLACE_COUNT= 100;
-
-		assertTrue(RANDOM_REPLACE_COUNT >= 1);
-		assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
-		String original= createRandomString(RANDOM_STRING_LENGTH);
-		final IDocument document= createDocument(original);
-		fTextViewer.setDocument(document);
-
-		fUndoManager.beginCompoundChange();
-		doChange(document, RANDOM_REPLACE_COUNT);
-		fUndoManager.endCompoundChange();
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-		assertTrue(!fUndoManager.undoable());
-
-		final String reverted= document.get();
-
-		assertEquals(original, reverted);
-	}
-
-	/**
-	 * Test case for https://bugs.eclipse.org/bugs/show_bug.cgi?id=88172
-	 */
-	public void testRandomAccessAsUnclosedCompound() {
-
-		final int RANDOM_STRING_LENGTH= 50;
-		final int RANDOM_REPLACE_COUNT= 100;
-
-		assertTrue(RANDOM_REPLACE_COUNT >= 1);
-		assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
-		String original= createRandomString(RANDOM_STRING_LENGTH);
-		final IDocument document= createDocument(original);
-		fTextViewer.setDocument(document);
-
-		fUndoManager.beginCompoundChange();
-		doChange(document, RANDOM_REPLACE_COUNT);
-		// do not close the compound.
-		// fUndoManager.endCompoundChange();
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-		assertTrue(!fUndoManager.undoable());
-
-		final String reverted= document.get();
-
-		assertEquals(original, reverted);
-	}
-
-	public void testRandomAccessWithMixedCompound() {
-
-		final int RANDOM_STRING_LENGTH= 50;
-		final int RANDOM_REPLACE_COUNT= 10;
-		final int NUMBER_COMPOUNDS= 5;
-		final int NUMBER_ATOMIC_PER_COMPOUND= 3;
-
-		assertTrue(RANDOM_REPLACE_COUNT >= 1);
-		assertTrue(NUMBER_COMPOUNDS * (1 + NUMBER_ATOMIC_PER_COMPOUND) * RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
-		String original= createRandomString(RANDOM_STRING_LENGTH);
-		final IDocument document= createDocument(original);
-		fTextViewer.setDocument(document);
-
-		for (int i= 0; i < NUMBER_COMPOUNDS; i++) {
-			fUndoManager.beginCompoundChange();
-			doChange(document, RANDOM_REPLACE_COUNT);
-			fUndoManager.endCompoundChange();
-			assertTrue(fUndoManager.undoable());
-			for (int j= 0; j < NUMBER_ATOMIC_PER_COMPOUND; j++) {
-				doChange(document, RANDOM_REPLACE_COUNT);
-				assertTrue(fUndoManager.undoable());
-			}
-		}
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-		assertTrue(!fUndoManager.undoable());
-
-		final String reverted= document.get();
-
-		assertEquals(original, reverted);
-	}
-
-	public void testRepeatableAccess() {
-		assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
-		final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
-		fTextViewer.setDocument(document);
-
-		doRepeatableChange(document);
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-
-		final String reverted= document.get();
-
-		assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
-	}
-
-	public void testRepeatableAccessAsCompound() {
-		assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
-		final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
-		fTextViewer.setDocument(document);
-
-		fUndoManager.beginCompoundChange();
-		doRepeatableChange(document);
-		fUndoManager.endCompoundChange();
-
-		assertTrue(fUndoManager.undoable());
-		fUndoManager.undo();
-		// with a single compound, there should be only one undo
-		assertFalse(fUndoManager.undoable());
-
-		final String reverted= document.get();
-
-		assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
-	}
-
-	public void testRepeatableAccessAsUnclosedCompound() {
-		assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
-		final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
-		fTextViewer.setDocument(document);
-
-		fUndoManager.beginCompoundChange();
-		doRepeatableChange(document);
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-
-		final String reverted= document.get();
-
-		assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
-	}
-
-	public void testRepeatableAccessWithMixedAndEmptyCompound() {
-		assertTrue(REPLACEMENTS.length + 2 <= MAX_UNDO_LEVEL);
-
-		final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
-		fTextViewer.setDocument(document);
-
-		fUndoManager.beginCompoundChange();
-		doRepeatableChange(document);
-		fUndoManager.endCompoundChange();
-		assertTrue(fUndoManager.undoable());
-
-		// insert an empty compound
-		fUndoManager.beginCompoundChange();
-		fUndoManager.endCompoundChange();
-
-	    // insert the atomic changes
-		doRepeatableChange(document);
-
-		assertTrue(fUndoManager.undoable());
-		while (fUndoManager.undoable())
-			fUndoManager.undo();
-		assertTrue(!fUndoManager.undoable());
-
-		final String reverted= document.get();
-
-		assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
-	}
-
-	public void testDocumentStamp() {
-		final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
-		fTextViewer.setDocument(document);
-		long stamp= ((IDocumentExtension4)document).getModificationStamp();
-		doChange(document, 1);
-		fUndoManager.undo();
-		assertEquals(stamp, ((IDocumentExtension4)document).getModificationStamp());
-
-	}
-
-	// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=109104
-	public void testDocumentStamp2() throws BadLocationException {
-		final IDocument document= createDocument("");
-		final int stringLength= 13;
-		fTextViewer.setDocument(document);
-		document.replace(0, 0, createRandomString(stringLength));
-		long stamp= ((IDocumentExtension4)document).getModificationStamp();
-		fUndoManager.undo();
-		document.replace(0, 0, createRandomString(stringLength));
-		assertFalse(stamp == ((IDocumentExtension4)document).getModificationStamp());
-
-	}
-
-	private static String createRandomString(int length) {
-		final StringBuffer buffer= new StringBuffer();
-
-		for (int i= 0; i < length; i++)
-			buffer.append(getRandomCharacter());
-
-		return buffer.toString();
-	}
-
-	private static final char getRandomCharacter() {
-		// XXX should include \t
-		return (char) (32 + 95 * Math.random());
-	}
-
-	private static String createRandomStringPoisson() {
-		final int length= getRandomPoissonValue(2);
-		return createRandomString(length);
-	}
-	
-	private IDocument createDocument(String contents) {
-		IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.core.runtime.xml");
-		BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
-		document.set(contents);
-//		return new Document(contents);
-		return document;
-	}
-	
-	private static Position createRandomPositionPoisson(int documentLength) {
-
-		float random= (float) Math.random();
-		int offset= (int) (random * (documentLength + 1));
-
-		// Catch potential rounding issue
-		if (offset == documentLength + 1)
-			offset= documentLength;
-
-		int length= getRandomPoissonValue(2);
-		if (offset + length > documentLength)
-			length= documentLength - offset;
-
-		return new Position(offset, length);
-	}
-
-	private static int getRandomPoissonValue(int mean) {
-		final int MAX_VALUE= 10;
-
-		final float random= (float) Math.random();
-		float probability= 0;
-		int i= 0;
-		while (probability < 1 && i < MAX_VALUE) {
-			probability += getPoissonDistribution(mean, i);
-			if (random <= probability)
-				break;
-			i++;
-		}
-		return i;
-	}
-
-	private static float getPoissonDistribution(float lambda, int k) {
-		return (float) (Math.exp(-lambda) * Math.pow(lambda, k) / faculty(k));
-	}
-
-	/**
-	 * Returns the faculty of k.
-	 *
-	 * @param k the <code>int</code> for which to get the faculty
-	 * @return the faculty
-	 */
-	private static final int faculty(int k) {
-		return k == 0
-			? 1
-			: k * faculty(k - 1);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java
deleted file mode 100644
index deafc45..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Christian Plesner Hansen (plesner@quenta.org) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
- * Tests for the default pair matcher.
- *
- * @since 3.3
- */
-public class DefaultPairMatcherTest extends AbstractPairMatcherTest {
-
-	public static Test suite() {
-		return new TestSuite(DefaultPairMatcherTest.class);
-	}
-
-	protected ICharacterPairMatcher createMatcher(String chars) {
-		return new DefaultCharacterPairMatcher(chars.toCharArray(),
-				getDocumentPartitioning());
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.tests.AbstractPairMatcherTest#getDocumentPartitioning()
-	 * @since 3.3
-	 */
-	protected String getDocumentPartitioning() {
-		return IDocumentExtension3.DEFAULT_PARTITIONING;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java
deleted file mode 100644
index ada6b8c..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.DefaultUndoManager;
-import org.eclipse.jface.text.IUndoManager;
-
-/**
- * Tests for DefaultUndoManager.
- *
- * @since 3.2
- */
-public class DefaultUndoManagerTest extends AbstractUndoManagerTest {
-
-	public static Test suite() {
-		return new TestSuite(DefaultUndoManagerTest.class);
-	}
-
-	/*
-	 * @see TestCase#TestCase(String)
-	 */
-	public DefaultUndoManagerTest(final String name) {
-		super(name);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int)
-	 * @since 3.2
-	 */
-	protected IUndoManager createUndoManager(int maxUndoLevel) {
-		return new DefaultUndoManager(maxUndoLevel);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java
deleted file mode 100644
index 4fa4c4a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.internal.text.html.HTML2TextReader;
-
-
-public class HTML2TextReaderTester extends TestCase {
-
-	private static final boolean DEBUG= false;
-
-	private static final String LD= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	public HTML2TextReaderTester(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(HTML2TextReaderTester.class);
-	}
-
-	private void verify(String input, String expectedOutput) throws IOException{
-		Reader reader= new StringReader(input);
-		HTML2TextReader htmlReader= new HTML2TextReader(reader, null);
-		String result= htmlReader.getString();
-		if (DEBUG)
-			System.out.println("<"+ result +"/>");
-		assertEquals(expectedOutput, result);
-	}
-
-	public void test0() throws IOException{
-		String string= "<code>3<5<code>";
-		String expected= "3<5";
-		verify(string, expected);
-	}
-
-	public void test1() throws IOException{
-		String string= "<dl><dt>@author</dt><dd>Foo Bar</dd></dl>";
-		String expected= LD+ "@author"+LD+"\tFoo Bar"+LD;
-		verify(string, expected);
-	}
-
-	public void test2() throws IOException{
-		String string= "<code>3>5<code>";
-		String expected= "3>5";
-		verify(string, expected);
-	}
-
-	public void test3() throws IOException{
-		String string= "<a href= \"<p>this is only a string - not a tag<p>\">text</a>";
-		String expected= "text";
-		verify(string, expected);
-	}
-
-	public void test4() throws IOException{
-		String string= 	"<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1><h5>void p.Bb.fes()</h5><p><dl><dt>Parameters:</dt><dd><b>i</b> fred or <code>null</code></dd></dl></font></body></html>";
-		String expected= "void p.Bb.fes()"+ LD + LD + LD+ "Parameters:"+ LD + "\ti fred or null"+LD;
-		verify(string, expected);
-	}
-
-	public void test5() throws IOException{
-		String string= "<code>1<2<3<4</code>";
-		String expected= "1<2<3<4";
-		verify(string, expected);
-	}
-
-	public void test6() throws IOException{
-		//test for bug 19070
-		String string= "<p>Something.<p>Something more.";
-		String expected= LD + "Something." + LD + "Something more.";
-		verify(string, expected);
-	}
-
-	public void testComments() throws Exception {
-		String string= "<!-- begin-user-doc -->no comment<!-- end-user-doc -->";
-		String expected= "no comment";
-		verify(string,expected);
-	}
-
-}
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
deleted file mode 100644
index ddc984d..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test Suite for org.eclipse.jface.text.
- *
- * @since 3.0
- */
-public class JFaceTextTestSuite extends TestSuite {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jface.text Test Suite using JSP BasicStructuredDocument"); //$NON-NLS-1$
-//		suite.addTest(HTML2TextReaderTester.suite());
-//		suite.addTest(TextHoverPopupTest.suite());
-//		suite.addTest(TextPresentationTest.suite());
-		suite.addTest(DefaultUndoManagerTest.suite());
-		suite.addTest(TextViewerUndoManagerTest.suite());
-//		suite.addTest(RulesTestSuite.suite());
-//		suite.addTest(ReconcilerTestSuite.suite());
-//		suite.addTest(DefaultPairMatcherTest.suite());
-		return suite;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java
deleted file mode 100644
index 584d5bb..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jface.text.tests;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.TextEvent;
-
-
-public class TestTextEvent extends TextEvent {
-
-	TestTextEvent(DocumentEvent event, String replacedText) {
-		super(event.getOffset(), event.getLength(), event.getText(), replacedText, event, true);
-	}
-
-	TestTextEvent(String text) {
-		super(0, 0, text, (String) null, (DocumentEvent) null, true);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java
deleted file mode 100644
index 41859b3..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.IEventConsumer;
-import org.eclipse.jface.text.IFindReplaceTarget;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.IViewportListener;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-
-
-
-public class TestTextViewer implements ISourceViewer, IDocumentListener {
-
-
-	protected IDocument fDocument;
-	protected List fInputListeners= new ArrayList();
-	protected List fTextListeners= new ArrayList();
-	protected TextPresentation fTextPresentation;
-	protected Point fSelection= new Point(-1, -1);
-	protected String fDeletion;
-
-	/**
-	 * @see ITextViewer#setDocument(IDocument, int, int)
-	 */
-	public void setDocument(IDocument document, int p1, int p2) {
-		setDocument(document);
-	}
-
-	/**
-	 * @see ITextViewer#getDocument()
-	 */
-	public IDocument getDocument() {
-		return fDocument;
-	}
-
-	/**
-	 * @see ITextViewer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		IDocument oldDoc= fDocument;
-		fireTextInputChanged(oldDoc, document, true);
-
-		if (oldDoc != null)
-			oldDoc.removeDocumentListener(this);
-
-		fDocument= document;
-
-		if (fDocument != null) {
-			fireTextChanged(new TestTextEvent(fDocument.get()));
-			fDocument.addDocumentListener(this);
-		}
-
-		fireTextInputChanged(oldDoc, document, false);
-	}
-
-	/**
-	 * @see ITextViewer#removeTextInputListener(ITextInputListener)
-	 */
-	public void removeTextInputListener(ITextInputListener listener) {
-		fInputListeners.remove(listener);
-	}
-
-	/**
-	 * @see ITextViewer#addTextInputListener(ITextInputListener)
-	 */
-	public void addTextInputListener(ITextInputListener listener) {
-		if (!fInputListeners.contains(listener))
-			fInputListeners.add(listener);
-	}
-
-	protected void fireTextInputChanged(IDocument oldDoc, IDocument newDoc, boolean about) {
-		Iterator e= new ArrayList(fInputListeners).iterator();
-		while (e.hasNext()) {
-			ITextInputListener l= (ITextInputListener) e.next();
-			if (about)
-				l.inputDocumentAboutToBeChanged(oldDoc, newDoc);
-			else
-				l.inputDocumentChanged(oldDoc, newDoc);
-		}
-	}
-
-	/**
-	 * @see ITextViewer#changeTextPresentation(TextPresentation, boolean)
-	 */
-	public void changeTextPresentation(TextPresentation presentation, boolean p1) {
-		fTextPresentation= presentation;
-	}
-
-	/**
-	 * @see ITextViewer#invalidateTextPresentation()
-	 */
-	public void invalidateTextPresentation() {
-	}
-
-	public TextPresentation getTextPresentation() {
-		return fTextPresentation;
-	}
-
-	public void documentAboutToBeChanged(DocumentEvent event) {
-		try {
-			fDeletion= fDocument.get(event.getOffset(), event.getLength());
-		} catch (BadLocationException x) {
-		}
-	}
-
-	public void documentChanged(DocumentEvent event) {
-		fireTextChanged(new TestTextEvent(event, fDeletion));
-	}
-
-	/**
-	 * @see ITextViewer#getFindReplaceTarget()
-	 */
-	public IFindReplaceTarget getFindReplaceTarget() {
-		return null;
-	}
-
-	/**
-	 * @see ITextViewer#getTextOperationTarget()
-	 */
-	public ITextOperationTarget getTextOperationTarget() {
-		return null;
-	}
-
-	/**
-	 * @see ITextViewer#setTextColor(Color, int, int, boolean)
-	 */
-	public void setTextColor(Color p0, int p1, int p2, boolean p3) {
-	}
-
-	/**
-	 * @see ITextViewer#setTextColor(Color)
-	 */
-	public void setTextColor(Color p0) {
-	}
-
-	/**
-	 * @see ITextViewer#overlapsWithVisibleRegion(int, int)
-	 */
-	public boolean overlapsWithVisibleRegion(int p0, int p1) {
-		return false;
-	}
-
-	/**
-	 * @see ITextViewer#getVisibleRegion()
-	 */
-	public IRegion getVisibleRegion() {
-		return null;
-	}
-
-	/**
-	 * @see ITextViewer#resetVisibleRegion()
-	 */
-	public void resetVisibleRegion() {
-	}
-
-	/**
-	 * @see ITextViewer#setVisibleRegion(int, int)
-	 */
-	public void setVisibleRegion(int p0, int p1) {
-	}
-
-	/**
-	 * @see ITextViewer#setIndentPrefixes(String[], String)
-	 */
-	public void setIndentPrefixes(String[] p0, String p1) {
-	}
-
-	/**
-	 * @see ITextViewer#setDefaultPrefixes(String[], String)
-	 */
-	public void setDefaultPrefixes(String[] p0, String p1) {
-	}
-
-	/**
-	 * @see ITextViewer#setAutoIndentStrategy(IAutoIndentStrategy, String)
-	 */
-	public void setAutoIndentStrategy(IAutoIndentStrategy p0, String p1) {
-	}
-
-	/**
-	 * @see ITextViewer#setTextDoubleClickStrategy(ITextDoubleClickStrategy, String)
-	 */
-	public void setTextDoubleClickStrategy(ITextDoubleClickStrategy p0, String p1) {
-	}
-
-	/**
-	 * @see ITextViewer#setUndoManager(IUndoManager)
-	 */
-	public void setUndoManager(IUndoManager p0) {
-	}
-
-	/**
-	 * @see ITextViewer#getTextWidget()
-	 */
-	public StyledText getTextWidget() {
-		return null;
-	}
-
-	public void setTextHover(ITextHover p0, String p1) {
-	}
-
-	/**
-	 * @see ITextViewer#activatePlugins()
-	 */
-	public void activatePlugins() {
-	}
-
-	/**
-	 * @see ITextViewer#resetPlugins()
-	 */
-	public void resetPlugins() {
-	}
-
-	/**
-	 * @see ITextViewer#getTopInset()
-	 */
-	public int getTopInset() {
-		return 0;
-	}
-
-	/**
-	 * @see ITextViewer#getBottomIndexEndOffset()
-	 */
-	public int getBottomIndexEndOffset() {
-		return 0;
-	}
-
-	/**
-	 * @see ITextViewer#getBottomIndex()
-	 */
-	public int getBottomIndex() {
-		return 0;
-	}
-
-	/**
-	 * @see ITextViewer#getTopIndexStartOffset()
-	 */
-	public int getTopIndexStartOffset() {
-		return 0;
-	}
-
-	/**
-	 * @see ITextViewer#getTopIndex()
-	 */
-	public int getTopIndex() {
-		return 0;
-	}
-
-	/**
-	 * @see ITextViewer#setTopIndex(int)
-	 */
-	public void setTopIndex(int p0) {
-	}
-
-	/**
-	 * @see ITextViewer#revealRange(int, int)
-	 */
-	public void revealRange(int p0, int p1) {
-	}
-
-	/**
-	 * @see ITextViewer#getSelectedRange()
-	 */
-	public Point getSelectedRange() {
-		return fSelection;
-	}
-
-	/**
-	 * @see ITextViewer#setSelectedRange(int, int)
-	 */
-	public void setSelectedRange(int offset, int length) {
-		fSelection.x= offset;
-		fSelection.y= length;
-	}
-
-	/**
-	 * @see ITextViewer#isEditable()
-	 */
-	public boolean isEditable() {
-		return true;
-	}
-
-	/**
-	 * @see ITextViewer#setEditable(boolean)
-	 */
-	public void setEditable(boolean p0) {
-	}
-
-	/**
-	 * @see ITextViewer#setEventConsumer(IEventConsumer)
-	 */
-	public void setEventConsumer(IEventConsumer p0) {
-	}
-
-	/**
-	 * @see ITextViewer#removeTextListener(ITextListener)
-	 */
-	public void removeTextListener(ITextListener listener) {
-		fTextListeners.remove(listener);
-	}
-
-	protected void fireTextChanged(TextEvent event) {
-		Iterator e= new ArrayList(fTextListeners).iterator();
-		while (e.hasNext()) {
-			ITextListener l= (ITextListener) e.next();
-			l.textChanged(event);
-		}
-	}
-
-	/**
-	 * @see ITextViewer#addTextListener(ITextListener)
-	 */
-	public void addTextListener(ITextListener listener) {
-		if (!fTextListeners.contains(listener))
-			fTextListeners.add(listener);
-	}
-
-	/**
-	 * @see ITextViewer#removeViewportListener(IViewportListener)
-	 */
-	public void removeViewportListener(IViewportListener p0) {
-	}
-
-	/**
-	 * @see ITextViewer#addViewportListener(IViewportListener)
-	 */
-	public void addViewportListener(IViewportListener p0) {
-	}
-
-	/**
-	 * @see ISourceViewer#getSelectionProvider()
-	 */
-	public ISelectionProvider getSelectionProvider() {
-		return null;
-	}
-
-	/**
-	 * @see ISourceViewer#showAnnotations(boolean)
-	 */
-	public void showAnnotations(boolean p0) {
-	}
-
-	/**
-	 * @see ISourceViewer#removeRangeIndication()
-	 */
-	public void removeRangeIndication() {
-	}
-
-	/**
-	 * @see ISourceViewer#getRangeIndication()
-	 */
-	public IRegion getRangeIndication() {
-		return null;
-	}
-
-	/**
-	 * @see ISourceViewer#setRangeIndication(int, int, boolean)
-	 */
-	public void setRangeIndication(int p0, int p1, boolean p2) {
-	}
-
-	/**
-	 * @see ISourceViewer#setRangeIndicator(Annotation)
-	 */
-	public void setRangeIndicator(Annotation p0) {
-	}
-
-	/**
-	 * @see ISourceViewer#getAnnotationModel()
-	 */
-	public IAnnotationModel getAnnotationModel() {
-		return null;
-	}
-
-	/**
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int)
-	 */
-	public void setDocument(IDocument p0, IAnnotationModel p1, int p2, int p3) {
-	}
-
-	/**
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel)
-	 */
-	public void setDocument(IDocument p0, IAnnotationModel p1) {
-	}
-
-	/**
-	 * @see ISourceViewer#setAnnotationHover(IAnnotationHover)
-	 */
-	public void setAnnotationHover(IAnnotationHover p0) {
-	}
-
-	/**
-	 * @see ISourceViewer#configure(SourceViewerConfiguration)
-	 */
-	public void configure(SourceViewerConfiguration p0) {
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java
deleted file mode 100644
index abfa697..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class TextHoverPopupTest extends TestCase {
-
-
-	public TextHoverPopupTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() {
-	}
-
-	public static Test suite() {
-		return new TestSuite(TextHoverPopupTest.class);
-	}
-
-	protected void tearDown() {
-	}
-
-
-	protected int search(int[] array, int x) {
-		int low= 0;
-		int high= array.length -1;
-
-		while (high > low) {
-			int offset= (low + high) / 2;
-			int lookup= array[offset];
-			if (lookup > x)
-				high= offset - 1;
-			else if (lookup < x)
-				low= offset + 1;
-			else
-				low= high= offset;
-		}
-
-		return high;
-	}
-
-	public void testSearch() {
-		int[] values= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-		for (int i= 0; i < 10; i++) {
-			int result= search(values, i);
-			assertTrue(i == result);
-		}
-
-		int[] values2= { 0, 3, 6, 9, 12, 15, 18, 21, 24, 27 };
-		for (int i= 0; i < 10; i++) {
-			int result= search(values2, i * 3);
-			assertTrue(i == result);
-		}
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java
deleted file mode 100644
index 689e8dc..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextPresentation;
-
-public class TextPresentationTest extends TestCase {
-
-	private static final int NORMAL= SWT.NORMAL;
-	private static final int BOLD= SWT.BOLD;
-//	private static final int ITALIC= SWT.ITALIC;
-
-	private TextPresentation fTextPresentation;
-	private StyleRange[] fAllRanges;
-	private StyleRange[] fNonDefaultRanges;
-
-	public static Test suite() {
-		return new TestSuite(TextPresentationTest.class);
-	}
-
-	protected void setUp() {
-		setUpStyleRanges();
-		setUpTextPresentation();
-	}
-
-	private void setUpStyleRanges() {
-		fAllRanges= new StyleRange[] {
-			createStyleRange(  0,   4, NORMAL),
-			createStyleRange(  4,  20, BOLD),
-			createStyleRange( 20,  47, NORMAL),
-			createStyleRange( 47,  54, BOLD),
-			createStyleRange( 54,  96, NORMAL),
-			createStyleRange( 96, 102, BOLD),
-			createStyleRange(102, 140, NORMAL)
-		};
-
-		fNonDefaultRanges= new StyleRange[] {
-			createStyleRange(  4,  20, BOLD),
-			createStyleRange( 47,  54, BOLD),
-			createStyleRange( 96, 102, BOLD)
-		};
-	}
-
-	private void setUpTextPresentation() {
-		fTextPresentation= new TextPresentation();
-		fTextPresentation.setDefaultStyleRange(createStyleRange(0, 140, NORMAL));
-		for (int i= 0; i < fAllRanges.length; i++)
-			fTextPresentation.addStyleRange(fAllRanges[i]);
-	}
-
-	private StyleRange createStyleRange(int start, int end, int style) {
-		return createStyleRange(start, end, null, null, style);
-	}
-
-	private StyleRange createStyleRange(int start, int end, Color foreground, Color background, int style) {
-		return new StyleRange(start, end - start, foreground, background, style);
-	}
-
-	private StyleRange createStyleRange(int start, int end, int foreground, int background, int style) {
-		return createStyleRange(start, end, createColor(foreground, foreground, foreground), createColor(background, background, background), style);
-	}
-
-	private Display fDisplay= Display.getDefault();
-
-	/**
-	 * Creates a new color.
-	 * 
-	 * @param red the amount of red in the color
-	 * @param green the amount of green in the color
-	 * @param blue the amount of blue in the color
-	 * @return <code>null</code> if any of the parameters is smaller than 0 or greater than 255
-	 */
-	private Color createColor(int red, int green, int blue) {
-		if (red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255)
-			return null;
-		return new Color(fDisplay, red, green, blue);
-	}
-
-	private void checkRegions(StyleRange[] expectedAllRanges, StyleRange[] expectedNonDefaultRanges) {
-		Iterator e= fTextPresentation.getAllStyleRangeIterator();
-		for (int i= 0; i < expectedAllRanges.length; i++) {
-			assertTrue(e.hasNext());
-			assertEquals(expectedAllRanges[i], e.next());
-		}
-		assertTrue(!e.hasNext());
-
-		e= fTextPresentation.getNonDefaultStyleRangeIterator();
-		for (int i= 0; i < expectedNonDefaultRanges.length; i++) {
-			assertTrue(e.hasNext());
-			assertEquals(expectedNonDefaultRanges[i], e.next());
-		}
-		assertTrue(!e.hasNext());
-	}
-
-	public void testUnclippedRegions() {
-		checkRegions(fAllRanges, fNonDefaultRanges);
-	}
-
-	public void testClippedRegions1() {
-		fTextPresentation.setResultWindow(new Region(0, 140));
-		checkRegions(fAllRanges, fNonDefaultRanges);
-	}
-
-	public void testClippedRegions2() {
-
-		fTextPresentation.setResultWindow(new Region(30, 70));
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-			createStyleRange(  0, 17, NORMAL),
-			createStyleRange( 17, 24, BOLD),
-			createStyleRange( 24, 66, NORMAL),
-			createStyleRange( 66, 70, BOLD)
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-			createStyleRange( 17, 24, BOLD),
-			createStyleRange( 66, 70, BOLD)
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at start of first existing range.
-	 */
-	public void testMergeStyleRange1() {
-		StyleRange range= createStyleRange(0, 2, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(0, 2, 1, -1, NORMAL),
-				createStyleRange(  2,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(0, 2, 1, -1, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at end of last existing range.
-	 */
-	public void testMergeStyleRange2() {
-		StyleRange range= createStyleRange(138, 140, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 138, NORMAL),
-				createStyleRange(138, 140, 1, -1, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(138, 140, 1, -1, NORMAL),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at start of existing default range.
-	 */
-	public void testMergeStyleRange3() {
-		StyleRange range= createStyleRange(20, 22, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 22, 1, -1, NORMAL),
-				createStyleRange( 22,  47, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 22, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range within existing default range.
-	 */
-	public void testMergeStyleRange4() {
-		StyleRange range= createStyleRange(22, 24, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  22, NORMAL),
-				createStyleRange(22, 24, 1, -1, NORMAL),
-				createStyleRange( 24,  47, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(22, 24, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at end of existing default range.
-	 */
-	public void testMergeStyleRange5() {
-		StyleRange range= createStyleRange(45, 47, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  45, NORMAL),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at start of existing non-default range.
-	 */
-	public void testMergeStyleRange6() {
-		StyleRange range= createStyleRange(47, 49, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range within existing non-default range.
-	 */
-	public void testMergeStyleRange7() {
-		StyleRange range= createStyleRange(49, 51, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  49, BOLD),
-				createStyleRange(49, 51, 1, -1, BOLD),
-				createStyleRange( 51,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  49, BOLD),
-				createStyleRange(49, 51, 1, -1, BOLD),
-				createStyleRange( 51,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range at end of existing non-default range.
-	 */
-	public void testMergeStyleRange8() {
-		StyleRange range= createStyleRange(52, 54, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range from existing default to non-default range.
-	 */
-	public void testMergeStyleRange9() {
-		StyleRange range= createStyleRange(45, 49, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  45, NORMAL),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range from existing non-default to default range.
-	 */
-	public void testMergeStyleRange10() {
-		StyleRange range= createStyleRange(52, 56, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange(54, 56, 1, -1, NORMAL),
-				createStyleRange( 56,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange(54, 56, 1, -1, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range from existing default over non-default to default range.
-	 */
-	public void testMergeStyleRange11() {
-		StyleRange range= createStyleRange(45, 56, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  45, NORMAL),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 54, 1, -1, BOLD),
-				createStyleRange(54, 56, 1, -1, NORMAL),
-				createStyleRange( 56,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 54, 1, -1, BOLD),
-				createStyleRange(54, 56, 1, -1, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range from existing non-default over default to non-default range.
-	 */
-	public void testMergeStyleRange12() {
-		StyleRange range= createStyleRange(52, 98, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange(54, 96, 1, -1, NORMAL),
-				createStyleRange(96, 98, 1, -1, BOLD),
-				createStyleRange( 98, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 47,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange(54, 96, 1, -1, NORMAL),
-				createStyleRange(96, 98, 1, -1, BOLD),
-				createStyleRange( 98, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range over existing default range.
-	 */
-	public void testMergeStyleRange13() {
-		StyleRange range= createStyleRange(20, 47, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 47, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 47, 1, -1, NORMAL),
-				createStyleRange( 47,  54, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	/**
-	 * Merge range over existing non-default range.
-	 */
-	public void testMergeStyleRange14() {
-		StyleRange range= createStyleRange(47, 54, 1, -1, NORMAL);
-		fTextPresentation.mergeStyleRange(range);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(  0,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange( 20,  47, NORMAL),
-				createStyleRange(47, 54, 1, -1, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 140, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(47, 54, 1, -1, BOLD),
-				createStyleRange( 96, 102, BOLD),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-	public void testMergeStyleRanges1() {
-		StyleRange[] ranges= new StyleRange[] {
-				createStyleRange(0, 2, 1, -1, NORMAL), // at start of first existing
-				createStyleRange(20, 22, 1, -1, NORMAL), // at start of existing default
-				createStyleRange(24, 26, 1, -1, NORMAL), // within existing default
-				createStyleRange(45, 47, 1, -1, NORMAL), // at end of existing default
-				createStyleRange(47, 49, 1, -1, NORMAL), // at start of existing non-default
-				createStyleRange(50, 51, 1, -1, NORMAL), // within existing non-default
-				createStyleRange(52, 54, 1, -1, NORMAL), // at end of existing non-default
-				createStyleRange(138, 140, 1, -1, NORMAL), // at end of last existing
-		};
-		fTextPresentation.mergeStyleRanges(ranges);
-
-		StyleRange[] expectedAllRanges= new StyleRange[] {
-				createStyleRange(0, 2, 1, -1, NORMAL),
-				createStyleRange(  2,   4, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 22, 1, -1, NORMAL),
-				createStyleRange( 22,  24, NORMAL),
-				createStyleRange(24, 26, 1, -1, NORMAL),
-				createStyleRange( 26,  45, NORMAL),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  50, BOLD),
-				createStyleRange(50, 51, 1, -1, BOLD),
-				createStyleRange( 51,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange( 54,  96, NORMAL),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(102, 138, NORMAL),
-				createStyleRange(138, 140, 1, -1, NORMAL),
-		};
-
-		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-				createStyleRange(0, 2, 1, -1, NORMAL),
-				createStyleRange(  4,  20, BOLD),
-				createStyleRange(20, 22, 1, -1, NORMAL),
-				createStyleRange(24, 26, 1, -1, NORMAL),
-				createStyleRange(45, 47, 1, -1, NORMAL),
-				createStyleRange(47, 49, 1, -1, BOLD),
-				createStyleRange( 49,  50, BOLD),
-				createStyleRange(50, 51, 1, -1, BOLD),
-				createStyleRange( 51,  52, BOLD),
-				createStyleRange(52, 54, 1, -1, BOLD),
-				createStyleRange( 96, 102, BOLD),
-				createStyleRange(138, 140, 1, -1, NORMAL),
-		};
-
-		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-	}
-
-// Template
-//
-//	public void testMergeStyleRange0() {
-////		StyleRange range= createStyleRange(0, 2, 1, -1, NORMAL);
-////		fTextPresentation.mergeStyleRange(range);
-//
-////		StyleRange[] ranges= new StyleRange[] {
-////				createStyleRange(0, 2, 1, -1, NORMAL),
-////		};
-////		fTextPresentation.mergeStyleRanges(ranges);
-//
-//		StyleRange[] expectedAllRanges= new StyleRange[] {
-//				createStyleRange(  0,   4, NORMAL),
-//				createStyleRange(  4,  20, BOLD),
-//				createStyleRange( 20,  47, NORMAL),
-//				createStyleRange( 47,  54, BOLD),
-//				createStyleRange( 54,  96, NORMAL),
-//				createStyleRange( 96, 102, BOLD),
-//				createStyleRange(102, 140, NORMAL),
-//		};
-//
-//		StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-//				createStyleRange(  4,  20, BOLD),
-//				createStyleRange( 47,  54, BOLD),
-//				createStyleRange( 96, 102, BOLD),
-//		};
-//
-//		checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-//	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java
deleted file mode 100644
index effd287..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.text.undo.DocumentUndoEvent;
-import org.eclipse.text.undo.DocumentUndoManager;
-import org.eclipse.text.undo.IDocumentUndoListener;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.TextViewerUndoManager;
-
-/**
- * Tests for TextViewerUndoManager.
- *
- * @since 3.2
- */
-public class TextViewerUndoManagerTest extends AbstractUndoManagerTest {
-
-	public static Test suite() {
-		return new TestSuite(TextViewerUndoManagerTest.class);
-	}
-
-	/*
-	 * @see TestCase#TestCase(String)
-	 */
-	public TextViewerUndoManagerTest(final String name) {
-		super(name);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int)
-	 * @since 3.2
-	 */
-	protected IUndoManager createUndoManager(int maxUndoLevel) {
-		return new TextViewerUndoManager(maxUndoLevel);
-	}
-
-	//--- DocumentUndoManager only ---
-
-	public void internalTestTransferNonTextOp(final boolean isUndoable) throws Exception {
-		Object context= new Object();
-		DocumentUndoManager tempUndoManager= new DocumentUndoManager(new Document());
-		tempUndoManager.connect(context);
-
-		IUndoableOperation operation= new AbstractOperation("") {
-			public boolean canUndo() {
-				return isUndoable;
-			}
-			public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				return Status.OK_STATUS;
-			}
-			public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				return Status.OK_STATUS;
-			}
-			public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				return Status.OK_STATUS;
-			}
-		};
-		operation.addContext(tempUndoManager.getUndoContext());
-		OperationHistoryFactory.getOperationHistory().add(operation);
-
-		assertEquals(isUndoable, tempUndoManager.undoable());
-
-		final DocumentUndoManager undoManager= new DocumentUndoManager(new Document());
-		Object newContext= new Object();
-		undoManager.connect(newContext);
-
-		undoManager.addDocumentUndoListener(new IDocumentUndoListener() {
-			public void documentUndoNotification(DocumentUndoEvent event) {
-				fail();
-			}
-		});
-
-		undoManager.transferUndoHistory(tempUndoManager);
-		tempUndoManager.disconnect(context);
-
-		assertEquals(isUndoable, undoManager.undoable());
-		undoManager.undo();
-		assertEquals(false, undoManager.undoable());
-
-		undoManager.disconnect(newContext);
-	}
-
-	public void testTransferNonUndoableNonTextOp() throws Exception {
-		internalTestTransferNonTextOp(false);
-	}
-
-	public void testTransferUndoableNonTextOp() throws Exception {
-		internalTestTransferNonTextOp(true);
-	}
-
-	public void testCanUndo() throws Exception {
-		IDocument doc= new Document();
-		final DocumentUndoManager undoManager= new DocumentUndoManager(doc);
-		Object context= new Object();
-		undoManager.connect(context);
-
-		undoManager.addDocumentUndoListener(new IDocumentUndoListener() {
-
-			public void documentUndoNotification(DocumentUndoEvent event) {
-				if (event.getEventType() == DocumentUndoEvent.ABOUT_TO_UNDO)
-					assertEquals(true, undoManager.undoable());
-				else if (event.getEventType() == DocumentUndoEvent.UNDONE)
-					assertEquals(false, undoManager.undoable());
-			}
-		});
-
-		doc.set("foo");
-
-		assertEquals(true, undoManager.undoable());
-		undoManager.undo();
-		assertEquals(false, undoManager.undoable());
-
-		undoManager.disconnect(context);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
deleted file mode 100644
index a20fbaf..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.reconciler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.text.tests.Accessor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.reconciler.AbstractReconciler;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.tests.TestTextViewer;
-
-
-/**
- * Reconciler tests. Uses barrier synchronization and a call log to assert
- * correct order of reconciling events.
- *
- * TODO test reconciler arguments (delay > 0 etc.)
- * TODO incremental reconciler tests
- *
- * @since 3.1
- */
-public class AbstractReconcilerTest extends TestCase {
-
-	/**
-	 * Modified barrier: there are two threads: the main (testing) thread
-	 * creating the barrier, and the reconciler thread. When both threads have
-	 * met at the barrier, the main thread is released and can perform
-	 * assertions while being sure that the reconciler is dormant. After the
-	 * tests have been performed, the main thread must call <code>wakeAll</code>
-	 * to release the reconciler thread.
-	 */
-	static class Barrier {
-		private final Object fMutex= new Object();
-		private final int fParticipants;
-		private final Thread fMainThread;
-
-		private int fWaiting= 0;
-		private boolean fMainThreadArrived= false;
-		private boolean fIsInactive= false;
-
-		Barrier() {
-			fParticipants= 2;
-			fMainThread= Thread.currentThread();
-		}
-
-		public void await() {
-			synchronized (fMutex) {
-				if (fIsInactive)
-					return;
-
-				fWaiting++;
-
-				boolean isMainThread= Thread.currentThread() == fMainThread;
-				if (isMainThread)
-					fMainThreadArrived= true;
-
-				if (allArrived()) {
-					if (!fMainThreadArrived) {
-						fWaiting--;
-						throw new RuntimeException(getClass() + " can't join barrier if only the main thread is missing!");
-					}
-
-					if (!isMainThread)
-						notifyMainThread();
-				}
-				if (!allArrived() || !isMainThread) {
-					try {
-						if (!isMainThread)
-							fMutex.wait();
-						else {
-							fMutex.wait(5000); // don't wait forever for bad reconcilers
-							if (!allArrived())
-								fail("reconciler never ran in 5 seconds");
-						}
-					} catch (InterruptedException e) {
-						// threads must not be interrupted
-						throw new Error();
-					}
-				}
-			}
-		}
-
-		private boolean allArrived() {
-			return fWaiting == fParticipants;
-		}
-
-		private void notifyMainThread() {
-			fMutex.notify();
-		}
-
-		public void wakeAll() {
-			synchronized (fMutex) {
-				fWaiting= 0;
-				fMainThreadArrived= false;
-				fMutex.notifyAll();
-			}
-		}
-
-		public void shutdown() {
-			synchronized (fMutex) {
-				fIsInactive= true;
-				fMutex.notifyAll();
-			}
-		}
-	}
-
-	private Accessor fAccessor;
-	private Barrier fBarrier;
-	private List fCallLog;
-	private ITextViewer fViewer;
-	protected AbstractReconciler fReconciler;
-	private Document fDocument;
-
-	protected void setUp() {
-		fBarrier= new Barrier();
-		fCallLog= Collections.synchronizedList(new ArrayList());
-		fReconciler= new AbstractReconciler() {
-					protected void initialProcess() {
-						fCallLog.add("initialProcess");
-						fBarrier.await();
-					}
-					protected void process(DirtyRegion dirtyRegion) {
-						fCallLog.add("process");
-						fBarrier.await();
-					}
-					protected void reconcilerDocumentChanged(IDocument newDocument) {
-						fCallLog.add("reconcilerDocumentChanged");
-					}
-					protected void aboutToBeReconciled() {
-						fCallLog.add("aboutToBeReconciled");
-					}
-					protected void reconcilerReset() {
-						fCallLog.add("reconcilerReset");
-					}
-					public IReconcilingStrategy getReconcilingStrategy(String contentType) {
-						return null;
-					}
-				};
-		fReconciler.setIsIncrementalReconciler(false);
-		fReconciler.setDelay(50); // make tests run faster
-
-		fViewer= new TestTextViewer();
-		fReconciler.install(fViewer);
-
-		fAccessor= new Accessor(fReconciler, AbstractReconciler.class);
-		Object object= fAccessor.get("fThread");
-		fAccessor= new Accessor(object, object.getClass());
-	}
-
-
-	protected void tearDown() throws Exception {
-		fBarrier.shutdown();
-		fReconciler.uninstall();
-	}
-
-	public void testInitialReconcile() throws InterruptedException {
-		// initially the reconciler is neither active nor dirty
-		// XXX shouldn't it be dirty?
-		assertFalse(isActive());
-		assertFalse(isDirty());
-
-		// set up initial document
-		fDocument= new Document("foo");
-		fViewer.setDocument(fDocument);
-		assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
-		assertEquals("aboutToBeReconciled", fCallLog.remove(0));
-
-		fBarrier.await();
-		assertEquals("initialProcess", fCallLog.remove(0));
-		// XXX shouldn't it be dirty and active during initialProcess?
-		assertFalse(isActive());
-		assertFalse(isDirty());
-		fBarrier.wakeAll();
-
-		// wait until clean
-		pollUntilClean();
-		assertFalse(isActive());
-		assertFalse(isDirty());
-	}
-
-	public void testDirtyingWhenClean() throws BadLocationException, InterruptedException {
-		installDocument();
-
-		dirty();
-		assertEquals("aboutToBeReconciled", fCallLog.remove(0));
-		assertEquals("reconcilerReset", fCallLog.remove(0));
-
-		fBarrier.await();
-		assertEquals("process", fCallLog.remove(0));
-		assertTrue(isActive());
-		assertTrue(isDirty());
-		fBarrier.wakeAll();
-
-		// wait until clean
-		pollUntilClean();
-		assertFalse(isActive());
-		assertFalse(isDirty());
-	}
-
-
-	private void dirty() throws BadLocationException {
-		fDocument.replace(0,0,"bar");
-	}
-
-
-	public void testDirtyingWhenRunning() throws InterruptedException, BadLocationException {
-		installDocument();
-
-		dirty();
-		fBarrier.await();
-		assertTrue(isActive());
-		assertTrue(isDirty());
-		fCallLog.clear();
-		dirty();
-		// no aboutToBeReconciled since the reconciler is still running
-		// when the second edition comes in
-		assertEquals("reconcilerReset", fCallLog.remove(0));
-		fBarrier.wakeAll();
-
-		fBarrier.await();
-		assertEquals("process", fCallLog.remove(0));
-		fBarrier.wakeAll();
-		pollUntilClean();
-		assertFalse(isActive());
-		assertFalse(isDirty());
-	}
-
-	public void testCancellingWhenClean() throws InterruptedException, BadLocationException {
-		installDocument();
-
-		// dirty again
-		dirty();
-		fBarrier.await();
-		fBarrier.wakeAll();
-
-		// cancel
-		fCallLog.clear();
-		fReconciler.uninstall();
-		pollUntilInactive();
-		assertTrue(fCallLog.isEmpty());
-		assertFalse(isActive());
-		// XXX fails since AbstractReconciler does not update state before leaving
-//		assertFalse(isDirty()); // fails
-	}
-
-	public void testCancellingWhenRunning() throws InterruptedException, BadLocationException {
-		installDocument();
-
-		// dirty and cancel
-		dirty();
-		fBarrier.await();
-		fCallLog.clear();
-		fReconciler.uninstall();
-		fBarrier.wakeAll();
-		pollUntilInactive();
-		assertTrue(fCallLog.isEmpty());
-		assertFalse(isActive());
-		// XXX fails since AbstractReconciler does not update state before leaving
-//		assertFalse(isDirty());
-	}
-
-	public void testReplacingDocumentWhenClean() throws InterruptedException {
-		installDocument();
-
-		// replace
-		fCallLog.clear();
-		fViewer.setDocument(new Document("bar"));
-		assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
-		assertEquals("aboutToBeReconciled", fCallLog.remove(0));
-		assertEquals("reconcilerReset", fCallLog.remove(0));
-		fBarrier.await();
-		assertEquals("process", fCallLog.remove(0));
-		fBarrier.wakeAll();
-
-		pollUntilClean();
-		assertFalse(isActive());
-		assertFalse(isDirty());
-	}
-
-	public void testReplacingDocumentWhenRunning() throws InterruptedException, BadLocationException {
-		installDocument();
-
-		// dirty and replace
-		dirty();
-		fBarrier.await();
-		fCallLog.clear();
-		fViewer.setDocument(new Document("bar"));
-		assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
-		assertEquals("reconcilerReset", fCallLog.remove(0));
-		assertTrue(fCallLog.isEmpty());
-		fBarrier.wakeAll();
-
-		// XXX this fails, which is a bug - replacing the document should
-		// cancel the progress monitor
-//		fBarrier.await();
-//		assertEquals("process", fCallLog.remove(0));
-//		fBarrier.wakeAll();
-	}
-
-	void installDocument() throws InterruptedException {
-		fDocument= new Document("foo");
-		fViewer.setDocument(fDocument);
-
-		// initial process
-		fBarrier.await();
-		fBarrier.wakeAll();
-
-		pollUntilClean();
-		fCallLog.clear();
-	}
-
-	void pollUntilClean() throws InterruptedException {
-		// wait for reconciler to become clean
-		long start= System.currentTimeMillis();
-		while (isDirty()) {
-			long current= System.currentTimeMillis();
-			if (current > start + 5000)
-				fail("waited > 5s for reconciler to complete");
-			synchronized (this) {
-				wait(50);
-			}
-		}
-	}
-
-	void pollUntilInactive() throws InterruptedException {
-		// wait for reconciler to become clean
-		long start= System.currentTimeMillis();
-		while (isActive()) {
-			long current= System.currentTimeMillis();
-			if (current > start + 5000)
-				fail("waited > 5s for reconciler to complete");
-			synchronized (this) {
-				wait(50);
-			}
-		}
-	}
-
-	boolean isActive() {
-		Object bool= fAccessor.invoke("isActive", null);
-		return ((Boolean) bool).booleanValue();
-	}
-
-	boolean isDirty() {
-		Object bool= fAccessor.invoke("isDirty", null);
-		return ((Boolean) bool).booleanValue();
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java
deleted file mode 100644
index 32dfe18..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.tests.reconciler;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- * @since 3.0
- */
-public class ReconcilerTestSuite {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("Test Suite org.eclipse.jface.text.tests.reconciler");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(AbstractReconcilerTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java
deleted file mode 100644
index 4dc114b..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-
-public class DefaultPartitionerTest extends FastPartitionerTest {
-	protected IDocumentPartitioner createPartitioner(IPartitionTokenScanner scanner) {
-		return new DefaultPartitioner(scanner, new String[] { DEFAULT, COMMENT });
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.tests.rules.FastPartitionerTest#testPR130900()
-	 */
-	public void testPR130900() throws Exception {
-		System.out.println("Bug130900 not fixed in DefaultPartitioner");
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java
deleted file mode 100644
index 9e1792a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.Token;
-
-
-/**
- * @since 3.0
- */
-public class DefaultPartitionerZeroLengthTest extends TestCase {
-
-	private static final String COMMENT= "comment";
-	private static final String DEFAULT= IDocument.DEFAULT_CONTENT_TYPE;
-
-	private IDocument fDoc;
-	private FastPartitioner fPartitioner;
-
-	public void setUp() {
-		fDoc= new Document();
-		IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
-			{
-				IToken comment= new Token(COMMENT);
-				IPredicateRule[] rules= new IPredicateRule[] { new MultiLineRule("/*", "*/", comment) };
-				setPredicateRules(rules);
-
-			}
-		};
-		fPartitioner= new FastPartitioner(scanner, new String[] { DEFAULT, COMMENT });
-		fDoc.setDocumentPartitioner(fPartitioner);
-		fPartitioner.connect(fDoc);
-	}
-
-	public void testGetZeroLengthPartition() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetZeroLengthPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthPartitionEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertGetZeroLengthPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthPartitionEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertGetZeroLengthPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthPartitionEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetZeroLengthPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthContentType() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetZeroLengthContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthContentTypeEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertGetZeroLengthContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthContentTypeEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertGetZeroLengthContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetZeroLengthContentTypeEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetZeroLengthContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testComputeZeroLengthPartitioning() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputeZeroLengthPartitioningEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputeZeroLengthPartitioningEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputeZeroLengthPartitioningEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioningSubrangeBeforeBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(12, 38, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeOnBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(13, 39, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeOnBoundaries2() {
-		fDoc.set("/* comment *//* comment *//* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(13, 26, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeAfterBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 26, 26, 39 };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(14, 40, offsets, COMMENT);
-	}
-
-	public void testComputePartitioningSubrangeInBoundaries1() {
-		fDoc.set("/* comment */");
-
-		int[] offsets= new int[] { };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(1, 12, offsets, COMMENT);
-	}
-
-	public void testComputePartitioningSubrangeInBoundaries2() {
-		fDoc.set("docu     ment");
-
-		int[] offsets= new int[] { };
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(1, 12, offsets, DEFAULT);
-	}
-
-	private void assertComputeZeroLengthPartitioning_InterleavingPartitions(int[] offsets) {
-		assertComputeZeroLengthPartitioning_InterleavingPartitions(0, fDoc.getLength(), offsets, DEFAULT);
-	}
-
-	private void assertComputeZeroLengthPartitioning_InterleavingPartitions(int startOffset, int endOffset, int[] offsets, String startType) {
-		ITypedRegion[] regions= fPartitioner.computePartitioning(startOffset, endOffset - startOffset, true);
-
-		String type= startType;
-		int previousOffset= startOffset;
-
-		assertEquals(offsets.length + 1, regions.length);
-		for (int i= 0; i <= offsets.length; i++) {
-			int currentOffset= (i == offsets.length) ? endOffset : offsets[i];
-			ITypedRegion region= regions[i];
-
-			assertTypedRegion(region, previousOffset, currentOffset, type);
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= currentOffset;
-		}
-	}
-
-	private void assertGetZeroLengthContentType_InterleavingPartitions(int[] offsets) {
-		String type= DEFAULT;
-		int previousOffset= 0;
-		for (int i= 0; i <= offsets.length; i++) {
-			int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
-			assertEqualPartitionType(previousOffset, offset, type);
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= offset;
-		}
-	}
-
-	private void assertGetZeroLengthPartition_InterleavingPartitions(int[] offsets) {
-		String type= DEFAULT;
-		int previousOffset= 0;
-		for (int i= 0; i <= offsets.length; i++) {
-			int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
-			assertEqualPartition(previousOffset, offset, type);
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= offset;
-		}
-	}
-
-	private boolean isOpenType(String type) {
-		return type.equals(DEFAULT);
-	}
-
-	private void assertEqualPartition(int offset, int inclusiveEnd, String type) {
-		int from= isOpenType(type) ? offset : offset + 1;
-		int to= isOpenType(type) ? inclusiveEnd : inclusiveEnd - 1;
-		for (int i= from; i <= to; i++) {
-			ITypedRegion region= fPartitioner.getPartition(i, true);
-			assertTypedRegion(region, offset, inclusiveEnd, type);
-		}
-	}
-
-	private void assertTypedRegion(ITypedRegion region, int offset, int inclusiveEnd, String type) {
-		assertEquals(offset, region.getOffset());
-		assertEquals(inclusiveEnd - offset, region.getLength());
-		assertEquals(type, region.getType());
-	}
-
-	private void assertEqualPartitionType(int offset, int inclusiveEnd, String type) {
-		int from= isOpenType(type) ? offset : offset + 1;
-		int to= isOpenType(type) ? inclusiveEnd : inclusiveEnd - 1;
-		for (int i= from; i <= to; i++) {
-			assertEquals(type, fPartitioner.getContentType(i, true));
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java
deleted file mode 100644
index f670161..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-
-
-/**
- * @since 3.0
- */
-public class FastPartitionerTest extends TestCase {
-
-	protected static final String COMMENT= "comment";
-	protected static final String DEFAULT= IDocument.DEFAULT_CONTENT_TYPE;
-
-	private IDocument fDoc;
-	private IDocumentPartitioner fPartitioner;
-
-	public void setUp() {
-		fDoc= new Document();
-		IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
-			{
-				IToken comment= new Token(COMMENT);
-				IPredicateRule[] rules= new IPredicateRule[] { new MultiLineRule("/*", "*/", comment) };
-				setPredicateRules(rules);
-
-			}
-		};
-		fPartitioner= createPartitioner(scanner);
-		fDoc.setDocumentPartitioner(fPartitioner);
-		fPartitioner.connect(fDoc);
-	}
-
-	protected IDocumentPartitioner createPartitioner(IPartitionTokenScanner scanner) {
-		return new FastPartitioner(scanner, new String[] { DEFAULT, COMMENT });
-	}
-
-	public void testGetPartition() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetPartitionEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertGetPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetPartitionEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertGetPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetPartitionEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetPartition_InterleavingPartitions(offsets);
-	}
-
-	public void testGetContentType() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetContentTypeEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertGetContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetContentTypeEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertGetContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testGetContentTypeEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertGetContentType_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioning() {
-		fDoc.set("docu     ment/* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputePartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioningEmptyMiddle() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertComputePartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioningEmptyStart() {
-		fDoc.set("/* comment */docu     ment");
-
-		int[] offsets= new int[] { 0, 13 };
-		assertComputePartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioningEmptyEnd() {
-		fDoc.set("docu     ment/* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputePartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testComputePartitioningSubrangeBeforeBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26 };
-		assertComputePartitioning_InterleavingPartitions(12, 38, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeOnBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 13, 26, 26, 39 };
-		assertComputePartitioning_InterleavingPartitions(13, 39, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeOnBoundaries2() {
-		fDoc.set("/* comment *//* comment *//* comment */");
-
-		int[] offsets= new int[] { 13, 26 };
-		assertComputePartitioning_InterleavingPartitions(13, 26, offsets, DEFAULT);
-	}
-
-	public void testComputePartitioningSubrangeAfterBoundaries() {
-		fDoc.set("docu     ment/* comment *//* comment */docu     ment");
-
-		int[] offsets= new int[] { 26, 26, 39 };
-		assertComputePartitioning_InterleavingPartitions(14, 40, offsets, COMMENT);
-	}
-
-	public void testComputePartitioningSubrangeInBoundaries1() {
-		fDoc.set("/* comment */");
-
-		int[] offsets= new int[] { };
-		assertComputePartitioning_InterleavingPartitions(1, 12, offsets, COMMENT);
-	}
-
-	public void testComputePartitioningSubrangeInBoundaries2() {
-		fDoc.set("docu     ment");
-
-		int[] offsets= new int[] { };
-		assertComputePartitioning_InterleavingPartitions(1, 12, offsets, DEFAULT);
-	}
-
-	public void testPR101014() throws BadLocationException {
-		fDoc.set(
-				"package pr101014;\n" +
-				"\n" +
-				"class X {\n" +
-				"String s= \n" +
-				"	/*foo*/;\n" +
-				"}\n");
-
-		int[] offsets= {41, 48};
-		assertComputePartitioning_InterleavingPartitions(offsets);
-
-		fDoc.replace(40, 8, "	/*foo*/");
-		assertComputePartitioning_InterleavingPartitions(offsets);
-	}
-
-	public void testPR130900() throws Exception {
-		fPartitioner.disconnect();
-		IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
-			{
-				IToken comment= new Token(COMMENT);
-				IPredicateRule[] rules= new IPredicateRule[] { new SingleLineRule("#", null, comment, (char) 0, true, false) };
-				setPredicateRules(rules);
-			}
-		};
-		fPartitioner= createPartitioner(scanner);
-		fDoc.setDocumentPartitioner(fPartitioner);
-		fPartitioner.connect(fDoc);
-
-		fDoc.set("#");
-		int[] offsets= new int[] { 0, 1 };
-		assertComputePartitioning_InterleavingPartitions(offsets);
-
-    }
-
-	private void assertComputePartitioning_InterleavingPartitions(int[] offsets) {
-		assertComputePartitioning_InterleavingPartitions(0, fDoc.getLength(), offsets, DEFAULT);
-	}
-
-	private void assertComputePartitioning_InterleavingPartitions(int startOffset, int endOffset, int[] offsets, String startType) {
-		ITypedRegion[] regions= fPartitioner.computePartitioning(startOffset, endOffset - startOffset);
-
-		String type= startType;
-		int previousOffset= startOffset;
-
-		int j= 0;
-		for (int i= 0; i <= offsets.length; i++) {
-			int currentOffset= (i == offsets.length) ? endOffset : offsets[i];
-			if (currentOffset - previousOffset != 0) { // don't do empty partitions
-				ITypedRegion region= regions[j++];
-
-				assertTypedRegion(region, previousOffset, currentOffset, type);
-			}
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= currentOffset;
-		}
-	}
-
-	private void assertGetContentType_InterleavingPartitions(int[] offsets) {
-		String type= DEFAULT;
-		int previousOffset= 0;
-		for (int i= 0; i <= offsets.length; i++) {
-			int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
-			assertEqualPartitionType(previousOffset, offset, type);
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= offset;
-		}
-	}
-
-	private void assertGetPartition_InterleavingPartitions(int[] offsets) {
-		String type= DEFAULT;
-		int previousOffset= 0;
-		for (int i= 0; i <= offsets.length; i++) {
-			int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
-			assertEqualPartition(previousOffset, offset, type);
-
-			// advance
-			if (type == DEFAULT)
-				type= COMMENT;
-			else
-				type= DEFAULT;
-			previousOffset= offset;
-		}
-	}
-
-	private void assertEqualPartition(int offset, int end, String type) {
-		int from= offset;
-		int to= end - 1;
-		for (int i= from; i <= to; i++) {
-			ITypedRegion region= fPartitioner.getPartition(i);
-			assertTypedRegion(region, offset, end, type);
-		}
-	}
-
-	private void assertTypedRegion(ITypedRegion region, int offset, int end, String type) {
-		assertEquals(offset, region.getOffset());
-		assertEquals(end - offset, region.getLength());
-		assertEquals(type, region.getType());
-	}
-
-	private void assertEqualPartitionType(int offset, int end, String type) {
-		int from= offset;
-		int to= end - 1;
-		for (int i= from; i <= to; i++) {
-			assertEquals(type, fPartitioner.getContentType(i));
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java
deleted file mode 100644
index 48deb6d..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @since 3.0
- */
-public class RulesTestSuite {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(
-				"Test Suite org.eclipse.jface.text.tests.rules");
-		// $JUnit-BEGIN$
-		suite.addTestSuite(FastPartitionerTest.class);
-		suite.addTestSuite(DefaultPartitionerTest.class);
-		suite.addTestSuite(DefaultPartitionerZeroLengthTest.class);
-		suite.addTestSuite(WordRuleTest.class);
-		suite.addTestSuite(ScannerColumnTest.class);
-		// $JUnit-END$
-		return suite;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java
deleted file mode 100644
index 1b0c8b6..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-
-
-/**
- * @since 3.4
- */
-public class ScannerColumnTest extends TestCase {
-
-	private IDocument fDocument;
-
-	protected void setUp() throws Exception {
-		fDocument= new Document("scanner test");
-	}
-
-	protected void tearDown() throws Exception {
-		fDocument= null;
-	}
-
-	public void testRuleBasedScannerColumnRead() {
-		_testScannerColumnRead(new RuleBasedScanner());
-	}
-
-	public void testRuleBasedScannerColumnUnread() {
-		_testScannerColumnUnread(new RuleBasedScanner());
-	}
-
-	public void testBufferedRuleBasedScannerColumnRead() {
-		_testScannerColumnRead(new BufferedRuleBasedScanner(100));
-	}
-
-	public void testBufferedRuleBasedScannerColumnUnread() {
-		_testScannerColumnUnread(new BufferedRuleBasedScanner(100));
-	}
-
-	private void _testScannerColumnRead(RuleBasedScanner scanner) {
-		scanner.setRange(fDocument, 0, 10);
-		assertEquals(0, scanner.getColumn());
-		assertEquals('s', scanner.read());
-		assertEquals(1, scanner.getColumn());
-		scanner.unread();
-		assertEquals(0, scanner.getColumn());
-	}
-
-	private void _testScannerColumnUnread(RuleBasedScanner scanner) {
-		scanner.setRange(fDocument, 0, 10);
-		assertEquals(0, scanner.getColumn());
-		assertEquals('s', scanner.read());
-		assertEquals(1, scanner.getColumn());
-		scanner.unread();
-		assertEquals(0, scanner.getColumn());
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java
deleted file mode 100644
index 6f5ecfd..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWordDetector;
-import org.eclipse.jface.text.rules.PatternRule;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WordRule;
-
-/**
- * @since 3.3
- */
-public class WordRuleTest extends TestCase {
-
-
-	private static class SimpleWordDetector implements IWordDetector {
-		public boolean isWordStart(char c) {
-			return !Character.isWhitespace(c);
-		}
-
-		public boolean isWordPart(char c) {
-			return !Character.isWhitespace(c);
-		}
-	}
-
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=163116
-	 */
-	public void testBug163116() throws Exception {
-		IWordDetector detector= new IWordDetector() {
-
-			public boolean isWordPart(char c) {
-				return true;
-			}
-
-			public boolean isWordStart(char c) {
-				return true;
-			}
-
-		};
-
-		WordRule rule= new WordRule(detector, new Token(this));
-
-		RuleBasedScanner scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] { rule });
-		scanner.setRange(new Document(), 0, 0);
-
-		IToken token= null;
-		int i= 0;
-		while (token != Token.EOF && i++ < 1000)
-			token= scanner.nextToken();
-
-		assertTrue(i < 1000);
-
-	}
-
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=144355
-	 */
-	public void testBug144355() throws Exception {
-		IWordDetector detector= new SimpleWordDetector();
-
-		String defaultTokenString= "defaultToken";
-		Token defaultToken= new Token(defaultTokenString);
-
-		String testTokenStringNormal= "TestTokenString";
-		String testTokenStringDifferentCapitalization= "TestTOKENString";
-		String testTokenStringCompletelyDifferent= "XXX";
-		Token normalToken= new Token(testTokenStringNormal);
-
-		WordRule rule= new WordRule(detector, defaultToken, true);
-		rule.addWord(testTokenStringNormal, normalToken);
-
-		// scenario 1
-		// pre: pass in a normal string ("TestTokenString")
-		// post: expect the normal token to be returned
-		RuleBasedScanner scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] {rule});
-		scanner.setRange(new Document(testTokenStringNormal), 0, testTokenStringNormal.length());
-		assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
-		// scenario 2
-		// pre: pass in a normal string but different capitalization ("TestTOKENString")
-		// post: expect the normal token to be returned
-		scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] {rule});
-		scanner.setRange(new Document(testTokenStringDifferentCapitalization), 0, testTokenStringDifferentCapitalization.length());
-		assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
-		// scenario 3
-		// pre: pass in a completely different string ("XXX")
-		// post: expect the default token to be returned because the string can't be matched
-		scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] {rule});
-		scanner.setRange(new Document(testTokenStringCompletelyDifferent), 0, testTokenStringCompletelyDifferent.length());
-		assertTrue(scanner.nextToken().getData().equals(defaultTokenString));
-
-		WordRule ruleWithoutIgnoreCase= new WordRule(detector, defaultToken);
-		ruleWithoutIgnoreCase.addWord(testTokenStringNormal, normalToken);
-
-		// scenario 4
-		// pre: pass in a normal string ("TestTokenString")
-		// post: expect the normal token to be returned
-		scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] {ruleWithoutIgnoreCase});
-		scanner.setRange(new Document(testTokenStringNormal), 0, testTokenStringNormal.length());
-		assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
-		// scenario 5
-		// pre: pass in a normal string but different capitalization ("TestTOKENString")
-		// post: expect the default token to be returned
-		scanner= new RuleBasedScanner();
-		scanner.setRules(new IRule[] {ruleWithoutIgnoreCase});
-		scanner.setRange(new Document(testTokenStringDifferentCapitalization), 0, testTokenStringDifferentCapitalization.length());
-		assertTrue(scanner.nextToken().getData().equals(defaultTokenString));
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=175712
-	public void testBug175712_1() throws Exception {
-		IRule[] rules= new IRule[2];
-
-		IToken stepToken= new Token(new TextAttribute(null, null, SWT.BOLD));
-		PatternRule stepRule= new PatternRule("(((", ")", stepToken, (char) 0,false);
-		stepRule.setColumnConstraint(-1);
-		rules[1]= stepRule;
-
-		IToken titleToken= new Token(new TextAttribute(null, null, SWT.BOLD));
-		WordRule wordRule= new WordRule(new SimpleWordDetector());
-		wordRule.addWord("((", titleToken);
-		rules[0]= wordRule;
-
-		IDocument document= new Document("((( \n((\n- Cheese\n- Wine");
-		RuleBasedScanner scanner= new RuleBasedScanner();
-		scanner.setRules(rules);
-		scanner.setRange(document, 0, document.getLength());
-
-		IToken defaultToken= new Token(this);
-		scanner.setDefaultReturnToken(defaultToken);
-
-		IToken token= scanner.nextToken();
-		assertSame(defaultToken, token);
-
-		token= scanner.nextToken();
-		assertSame(defaultToken, token);
-
-		token= scanner.nextToken();
-		assertSame(defaultToken, token);
-
-		token= scanner.nextToken();
-		assertSame(titleToken, token);
-
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=175712
-	public void testBug175712_2() throws Exception {
-		IRule[] rules= new IRule[2];
-
-		IToken stepToken= new Token(new TextAttribute(null, null, SWT.BOLD));
-		PatternRule stepRule= new PatternRule("(((", ")", stepToken, (char) 0,false);
-		stepRule.setColumnConstraint(-1);
-		rules[1]= stepRule;
-
-		IToken titleToken= new Token(new TextAttribute(null, null, SWT.BOLD));
-		WordRule wordRule= new WordRule(new SimpleWordDetector());
-		wordRule.addWord("((", titleToken);
-		rules[0]= wordRule;
-
-		IDocument document= new Document("((\n((\n- Cheese\n- Wine");
-		RuleBasedScanner scanner= new RuleBasedScanner();
-		scanner.setRules(rules);
-		scanner.setRange(document, 0, document.getLength());
-
-		IToken defaultToken= new Token(this);
-		scanner.setDefaultReturnToken(defaultToken);
-
-		IToken token= scanner.nextToken();
-		assertSame(titleToken, token);
-
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
index 0f09e23..be2912a 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
+++ b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -13,4 +13,4 @@
 Bundle-Name.0 = Structured Source Editor for JSP Tests
 view.name.0 = Embedded JSP Structured Text Viewer
 taglibview.name.0=TaglibIndex Delta Trace View
-_UI_SHOW_TRANSLATION=Show Java Translation
\ No newline at end of file
+_UI_SHOW_TRANSLATION=Show Translation
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip
deleted file mode 100644
index 44eac28..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
index a053637..d0f7382 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
@@ -129,7 +129,7 @@
 	 * @see org.eclipse.ui.IEditorInput#getName()
 	 */
 	public String getName() {
-		return fStorage.getName();
+		return new Path(fModel.getBaseLocation()).lastSegment() + ".java";
 	}
 
 	/*
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
index 4ec6fec..b18d497 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
@@ -111,11 +111,4 @@
 		// attempt to restore original preference value
 		store.setValue(prefKey, originalValue);
 	}
-	
-	public void testJavaSeverityPageIDsMatch() {
-		// used when linking from our JSP severity preference page to the Java severity preference page
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PREF_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PREFERENCE_PAGE);
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PROP_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PROPERTY_PAGE);
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage.DATA_NO_LINK, org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.DATA_NO_LINK);
-	}
 }
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
index 4022eec..0dcd911 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
@@ -13,9 +13,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.jface.text.tests.JFaceTextTestSuite;
 import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPELContentAssistTest;
 import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
 import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
 import org.eclipse.jst.jsp.ui.tests.contentdescription.TestContentDescription;
@@ -28,8 +26,8 @@
 import org.eclipse.jst.jsp.ui.tests.partitioning.TestStructuredPartitionerJSP;
 import org.eclipse.jst.jsp.ui.tests.registry.AdapterFactoryRegistryTest;
 import org.eclipse.jst.jsp.ui.tests.validation.JSPHTMLValidatorTest;
+import org.eclipse.jst.jsp.ui.tests.validation.TestJSPMarkupValidator;
 import org.eclipse.jst.jsp.ui.tests.viewer.TestViewerConfigurationJSP;
-import org.eclipse.text.tests.EclipseTextTestSuite;
 
 
 
@@ -40,36 +38,33 @@
 	}
 
 	public JSPUITestSuite() {
-		super("JSP UI Test Suite");
+		super("SSE JSP UI Test Suite");
 		
 		addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
 		addTest(new TestSuite(UnitTests.class, "UnitTests"));
 		addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
 		addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
-		addTest(new TestSuite(JSPJavaTranslatorTest.class, "Mixed JavaScript Translator Tests"));
+		addTest(new TestSuite(JSPJavaTranslatorTest.class, "JSPJavaTranslatorTest"));
 		addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
-		addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfo Provider Test"));
-		addTest(new TestSuite(JSPTranslationTest.class, "Translator Tests"));
-		addTest(new TestSuite(JSPELContentAssistTest.class, "JSP EL Content Assist Tests"));
-		addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistry Tests"));
-		addTest(new TestSuite(JSPUIPreferencesTest.class, "Preference Tests"));
-		addTest(new TestSuite(TestViewerConfigurationJSP.class, "Source Viewer Configuration Tests"));
-		addTest(new TestSuite(TestEditorConfigurationJSP.class, "Editor Configuration Tests"));
+		addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfoProviderTest"));
+		addTest(new TestSuite(JSPTranslationTest.class, "JSPTranslationTest"));
+		addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistryText"));
+		addTest(new TestSuite(JSPUIPreferencesTest.class));
+		addTest(new TestSuite(TestViewerConfigurationJSP.class));
+		addTest(new TestSuite(TestEditorConfigurationJSP.class));
 		
 		// moved from jsp core tests because they require UI
-		addTest(new TestSuite(TestPageDirective.class, "Page Directive Tests"));
-		addTest(new TestSuite(FileBufferDocumentTester.class, "FileBuffer Document Tests"));
-		addTest(new TestSuite(TestModelClone.class, "Model Clone Tests"));
+		addTest(new TestSuite(TestPageDirective.class));
+		addTest(new TestSuite(FileBufferDocumentTester.class));
+		addTest(new TestSuite(TestModelClone.class));
 		
-		addTest(new TestSuite(TestModelsFromFiles.class, "Test Models From Files"));
-		addTest(new TestSuite(TestModelEmbeddedContentType.class, "Test Model Embedded ContentType"));
+		addTest(new TestSuite(TestModelsFromFiles.class, "TestModelsFromFiles"));
+		addTest(new TestSuite(TestModelEmbeddedContentType.class, "TestModelEmbeddedContentType"));
 
 		addTest(new TestSuite(TestContentDescription.class, "Content Description Tests"));
-		addTest(new TestSuite(JSPHTMLValidatorTest.class, "JSP HTML Validator Test"));
+		addTest(new TestSuite(JSPHTMLValidatorTest.class, "JSPHTMLValidatorTest"));
+		addTest(new TestSuite(TestJSPMarkupValidator.class, "TestJSPMarkupValidator"));
 		// pa_TODO fix this test
 		//addTest(new TestSuite(JSPSearchTests.class));
-
-		addTest(JFaceTextTestSuite.suite());
-		addTest(EclipseTextTestSuite.suite());
 	}
 }
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
index c621169..29405ed 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
@@ -16,18 +16,13 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.EvaluationContext;
 import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jst.jsp.core.internal.java.IJSPProblem;
 import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
@@ -37,9 +32,7 @@
 import org.eclipse.ui.IStorageEditorInput;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.progress.UIJob;
 import org.eclipse.ui.texteditor.AnnotationTypeLookup;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -70,63 +63,57 @@
 	 * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands
 	 * .ExecutionEvent)
 	 */
-	public Object execute(final ExecutionEvent event) throws ExecutionException {
+	public Object execute(ExecutionEvent event) throws ExecutionException {
 		// IDE.openEditor(event.getApplicationContext(), createEditorInput(),
 		// JavaUI.ID_CU_EDITOR, true);
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if (selection instanceof IStructuredSelection) {
-			List list = ((IStructuredSelection) selection).toList();
-			if (!list.isEmpty()) {
-				if (list.get(0) instanceof IDOMNode) {
-					final IDOMModel model = ((IDOMNode) list.get(0)).getModel();
-					INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
-					if (adapter != null) {
-						Job opener = new UIJob("Opening JSP Java Translation") {
-							public IStatus runInUIThread(IProgressMonitor monitor) {
-								JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-								final JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
-
-								// create an IEditorInput for the Java editor
-								final IStorageEditorInput input = new JSPTranslationEditorInput(model);
-								try {
-									IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaUI.ID_CU_EDITOR, true);
-									// Now add the problems we found
-									if (editor instanceof ITextEditor) {
-										IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
-										translation.reconcileCompilationUnit();
-										List problemsList = translation.getProblems();
-										IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
-										AnnotationTypeLookup lookup = new AnnotationTypeLookup();
-										for (int i = 0; i < problems.length; i++) {
-											if (problems[i] instanceof IJSPProblem)
-												continue;
-											int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
-											Position position = new Position(problems[i].getSourceStart(), length);
-											Annotation annotation = null;
-											String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
-											if (problems[i].isError()) {
-												type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
-											}
-											else if (problems[i].isWarning()) {
-												type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
-											}
-											annotation = new Annotation(type, false, problems[i].getMessage());
-											if (annotation != null) {
-												annotationModel.addAnnotation(annotation, position);
-											}
+		EvaluationContext evaluationContext = (EvaluationContext) event.getApplicationContext();
+		if (evaluationContext != null) {
+			Object selection = evaluationContext.getDefaultVariable();
+			if (selection instanceof List) {
+				List list = (List) selection;
+				if (!list.isEmpty()) {
+					if (list.get(0) instanceof IDOMNode) {
+						IDOMModel model = ((IDOMNode) list.get(0)).getModel();
+						INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
+						if (adapter != null) {
+							// create an IEditorInput for the Java editor
+							IStorageEditorInput input = new JSPTranslationEditorInput(model);
+							try {
+								IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaUI.ID_CU_EDITOR, true);
+								// Now add the problems we found
+								if (editor instanceof ITextEditor) {
+									IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
+									JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
+									JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
+									translation.reconcileCompilationUnit();
+									List problemsList = translation.getProblems();
+									IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
+									AnnotationTypeLookup lookup = new AnnotationTypeLookup();
+									for (int i = 0; i < problems.length; i++) {
+										if (problems[i] instanceof IJSPProblem)
+											continue;
+										int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
+										Position position = new Position(problems[i].getSourceStart(), length);
+										Annotation annotation = null;
+										String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
+										if (problems[i].isError()) {
+											type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
+										}
+										else if (problems[i].isWarning()) {
+											type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
+										}
+										annotation = new Annotation(type, false, problems[i].getMessage());
+										if (annotation != null) {
+											annotationModel.addAnnotation(annotation, position);
 										}
 									}
 								}
-								catch (PartInitException e) {
-									e.printStackTrace();
-									Display.getCurrent().beep();
-								}
-								return Status.OK_STATUS;
 							}
-						};
-						opener.setSystem(false);
-						opener.setUser(true);
-						opener.schedule();
+							catch (PartInitException e) {
+								e.printStackTrace();
+								Display.getCurrent().beep();
+							}
+						}
 					}
 				}
 			}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java
deleted file mode 100644
index 82a0710..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsp.ui.internal.contentassist.JSPELContentAssistProcessor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class JSPELContentAssistTest extends TestCase {
-	private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
-	private String previousWTPAutoTestNonINteractivePropValue = null;
-	
-	private static final String TEST_PROJECT_NAME = "testJSPELContentAssist";
-	private static final String CONTENT_DIR = "WebContent";
-	
-	private static final String STRUCTURED_EDITOR_TYPE = "org.eclipse.wst.sse.ui.StructuredTextEditor";
-	
-	private static final String FILE_0_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test0.jsp";
-	private static final String FILE_1_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test1.jsp";
-	private static final String FILE_2_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test2.jsp";
-	
-	private static final String[] TEST_0_EXPECTED_PROPS = {
-		"errorData", "exception", "expressionEvaluator", "out", "page", "request", "response",
-		"servletConfig", "servletContext", "session", "variableResolver"};
-	private static final String[] TEST_1_EXPECTED_PROPS = {"request", "response"};
-	private static final String[] TEST_2_EXPECTED_PROPS = {"request"};
-	
-	private static final int TEST_0_DOC_LOC = 371;
-	private static final int TEST_1_DOC_LOC = 372;
-	private static final int TEST_2_DOC_LOC = 374;
-	
-	private IProject project;
-	private IWorkbenchPage page;
-	
-	public JSPELContentAssistTest() {
-		super("JSP EL Content Assist Tests");
-	}
-	
-	public JSPELContentAssistTest(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Do set up, ignore all pop ups during test
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		initializeResource();
-		String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-		
-		if (noninteractive != null) {
-			previousWTPAutoTestNonINteractivePropValue = noninteractive;
-		} else {
-			previousWTPAutoTestNonINteractivePropValue = "false";
-		}
-		System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (previousWTPAutoTestNonINteractivePropValue != null) {
-			System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonINteractivePropValue);
-		}
-		
-		try {
-			this.project.delete(true, null);
-		} catch (Exception e ) {
-			//ignore, this is not part of the test, just useful cleanup
-		}
-	}
-	
-	/**
-	 * Set up the project and workbench
-	 * 
-	 * @throws Exception
-	 */
-	private void initializeResource() throws Exception {
-		ProjectUnzipUtility fProjUtil = new ProjectUnzipUtility();
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-		// platform location may be null -- depends on "mode" of platform
-		if (platformLocation != null) {
-			File zipFile = FileUtil.makeFileFor(
-				ProjectUnzipUtility.PROJECT_ZIPS_FOLDER,
-				TEST_PROJECT_NAME + ProjectUnzipUtility.ZIP_EXTENSION,
-				ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-			fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
-			fProjUtil.initJavaProject(TEST_PROJECT_NAME);
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			this.project = root.getProject(TEST_PROJECT_NAME);
-			
-			IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			this.page = workbenchWindow.getActivePage();
-		}
-	}
-	
-	public void testELProposals_0() throws Exception {		
-		ICompletionProposal[] props = getCompletionProposals(FILE_0_PATH, TEST_0_DOC_LOC);
-		verifyProposals(props, TEST_0_EXPECTED_PROPS);
-	}
-	
-	public void testELProposals_1() throws Exception {		
-		ICompletionProposal[] props = getCompletionProposals(FILE_1_PATH, TEST_1_DOC_LOC);
-		verifyProposals(props, TEST_1_EXPECTED_PROPS);
-	}
-	
-	public void testELProposals_2() throws Exception {		
-		ICompletionProposal[] props = getCompletionProposals(FILE_2_PATH, TEST_2_DOC_LOC);
-		verifyProposals(props, TEST_2_EXPECTED_PROPS);
-	}
-	
-	public void testELChosenProposalCompletion() throws Exception {
-		IFile file = getFile(FILE_1_PATH);
-		ICompletionProposal[] props = getCompletionProposals(file, TEST_1_DOC_LOC);
-		verifyProposals(props, TEST_1_EXPECTED_PROPS);
-		
-		StructuredTextEditor editor = getEditor(file);
-		StructuredTextViewer viewer = editor.getTextViewer();
-		IDocument document = viewer.getDocument();
-		props[0].apply(document);
-		
-		String inserted = document.get(TEST_1_DOC_LOC-1, TEST_1_EXPECTED_PROPS[0].length());
-		assertEquals(
-			"The completed proposal " + inserted + " does not match the expected completion " + TEST_1_EXPECTED_PROPS[0],
-			TEST_1_EXPECTED_PROPS[0], inserted);
-		
-		editor.doSave(null);
-	}
-	
-	/**
-	 * Get a file contained in the project
-	 * 
-	 * @param filePath
-	 * @return
-	 */
-	private IFile getFile(String filePath) {
-		IFile retFile = this.project.getFile(filePath);
-		
-		assertTrue(retFile + " testing file does not exist.", retFile.exists());
-		
-		return retFile;
-	}
-	
-	/**
-	 * use a viewer and document location to generate completion proposals for that location in the viewer
-	 * 
-	 * @param filePath
-	 * @param documentLocation
-	 * @return
-	 * @throws PartInitException
-	 */
-	private ICompletionProposal[] getCompletionProposals(String filePath, int documentLocation) throws PartInitException {
-		IFile file = getFile(filePath);
-		StructuredTextEditor editor = getEditor(file);
-		StructuredTextViewer viewer = editor.getTextViewer();
-		return getCompletionProposals(viewer, documentLocation);
-	}
-	
-	
-	/**
-	 * use a viewer and document location to generate completion proposals for that location in the viewer
-	 * 
-	 * @param file
-	 * @param documentLocation
-	 * @return
-	 * @throws PartInitException
-	 */
-	private ICompletionProposal[] getCompletionProposals(IFile file, int documentLocation) throws PartInitException {
-		StructuredTextEditor editor = getEditor(file);
-		StructuredTextViewer viewer = editor.getTextViewer();
-		return getCompletionProposals(viewer, documentLocation);
-	}
-	
-	/**
-	 * use a viewer and document location to generate completion proposals for that location in the viewer
-	 * 
-	 * @param viewer
-	 * @param documentLocation
-	 * @return
-	 * @throws PartInitException
-	 */
-	private ICompletionProposal[] getCompletionProposals(StructuredTextViewer viewer, int documentLocation) throws PartInitException {
-		JSPELContentAssistProcessor processor = new JSPELContentAssistProcessor();
-		ICompletionProposal[] props = processor.computeCompletionProposals(viewer, documentLocation);
-		
-		return props;
-	}
-	
-	/**
-	 * Given a file returns a viewer for that file
-	 * 
-	 * @param file
-	 * @return
-	 * @throws PartInitException
-	 */
-	private StructuredTextEditor getEditor(IFile file) throws PartInitException {
-		IEditorInput input = new FileEditorInput(file);
-		IEditorPart part = this.page.openEditor(input, STRUCTURED_EDITOR_TYPE, true);
-		
-		assertTrue("Unable to open structured text editor", part instanceof StructuredTextEditor);
-		
-		return (StructuredTextEditor) part;
-	}
-	
-	/**
-	 * Given generated proposals be sure that all of the epxted proposals are contained in the generated ones
-	 * @param props
-	 * @param expectedProps
-	 */
-	private void verifyProposals(ICompletionProposal[] props, String[] expectedProps) {
-		for(int i = 0; i < expectedProps.length; ++i) {
-			assertTrue("The expected proposal \"" + expectedProps[i] + "\" was not given",
-				findPropsoal(props, expectedProps[i]));
-		}
-	}
-	
-	/**
-	 * Given an expected proposal string check to be sure it exists in the given proposals
-	 * 
-	 * @param props
-	 * @param expectedProp
-	 * @return
-	 */
-	private boolean findPropsoal(ICompletionProposal[] props, String expectedProp) {
-		boolean found = false;
-		
-		for(int i = 0; i < props.length && !found; ++i) {
-			found = props[i].getDisplayString().startsWith(expectedProp);
-		}
-		
-		return found;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
index b9f0cfb..15c4963 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
@@ -1091,7 +1091,8 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		String resultString = fModel.getText();
 
-		assertEquals("part 1: text update", expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+		assertTrue("part 1: text update", result);
 		assertTrue("part 1: event type", eventResult);
 
 		// step 2
@@ -1107,7 +1108,8 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		resultString = fModel.getText();
 
-		assertEquals("part 2: text update", expectedString, resultString);
+		result = (expectedString.equals(resultString));
+		assertTrue("part 2: text update", result);
 		assertTrue("part 2: event type", eventResult);
 
 		eventCase = 29;
@@ -1120,7 +1122,8 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		resultString = fModel.getText();
 
-		assertEquals("part 3: text update", expectedString, resultString);
+		result = (expectedString.equals(resultString));
+		assertTrue("part 3: text update", result);
 		assertTrue("part 3: event type", eventResult);
 
 		eventCase = 30;
@@ -1133,7 +1136,8 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		resultString = fModel.getText();
 
-		assertEquals("part 4: text update", expectedString, resultString);
+		result = (expectedString.equals(resultString));
+		assertTrue("part 4: text update", result);
 		assertTrue("part 4: event type", eventResult);
 	}
 
@@ -1264,7 +1268,9 @@
 		fModel.replaceText(null, 9, 9, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1284,7 +1290,9 @@
 		fModel.replaceText(null, 5, 9, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1304,7 +1312,9 @@
 		fModel.replaceText(null, 14, 9, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1324,7 +1334,9 @@
 		fModel.replaceText(null, 5, 5, "<JKL>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1344,7 +1356,9 @@
 		fModel.replaceText(null, 4, 3, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1364,7 +1378,9 @@
 		fModel.replaceText(null, 5, 0, " ");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1384,7 +1400,9 @@
 		fModel.replaceText(null, 6, 0, "z");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1404,7 +1422,9 @@
 		fModel.replaceText(null, 6, 1, "z=\"t\"");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1424,7 +1444,9 @@
 		fModel.replaceText(null, 4, 3, "c z");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1443,7 +1465,9 @@
 		fModel.replaceText(null, 20, 0, "Q");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 
 	}
@@ -1465,7 +1489,9 @@
 		fModel.replaceText(null, 28, 1, "\rBODY {\r\r}");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1486,7 +1512,9 @@
 		fModel.replaceText(null, 343, 1, "\rBODY {\r\r}");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1506,7 +1534,9 @@
 		fModel.replaceText(null, 0, 9, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1534,7 +1564,9 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1554,7 +1586,9 @@
 		fModel.replaceText(null, 0, 15, "<ABC><JKL><GHI>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1573,7 +1607,9 @@
 		fModel.replaceText(null, 10, 0, "");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1593,7 +1629,9 @@
 		fModel.replaceText(null, 0, 15, "<ABC><DEF><GHI>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1613,7 +1651,9 @@
 		fModel.replaceText(null, 3, 0, "<B></B>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1633,7 +1673,9 @@
 		fModel.replaceText(null, 6, 0, "<B></B>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1653,7 +1695,9 @@
 		fModel.replaceText(null, 10, 0, "<P>");
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 	}
 
@@ -1680,7 +1724,10 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		//  ?	assertTrue(result); // && eventResult);
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 
 	}
@@ -1702,7 +1749,10 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		//	assertTrue(result); // && eventResult);
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 
 	}
@@ -1724,7 +1774,10 @@
 		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
 		String resultString = fModel.getText();
 
-		assertEquals(expectedString, resultString);
+		boolean result = (expectedString.equals(resultString));
+
+		//	assertTrue(result); // && eventResult);
+		assertTrue("text update", result);
 		assertTrue("event type", eventResult);
 
 	}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
index 43ff062..760ff87 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
@@ -47,19 +47,19 @@
 	public void testJSP1() throws IOException, BadLocationException { // DW 05/01/2003 I modified this test, after creating test6, 
 		// and changing partioner to pick up end *> as part of page directive
 		// partition (for highlighting to work right).
-		int expectedPartitions = 10;
+		int expectedPartitions = 8;
 		int nPartitions = doComputePartitioningTest("testfiles/jsp/example01.jsp");
 		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
 		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_DEFAULT, IHTMLPartitions.HTML_DEFAULT});
+		verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
 	}
 
 	public void testJSP2() throws IOException, BadLocationException {
-		int expectedPartitions = 13;
+		int expectedPartitions = 11;
 		int nPartitions = doComputePartitioningTest("testfiles/jsp/example02.jsp");
 		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
 		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_DEFAULT, IHTMLPartitions.HTML_DEFAULT});
+		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
 	}
 
 	public void testJSP3() throws IOException, BadLocationException {
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
index e636109..85d48c9 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
@@ -48,8 +48,6 @@
  * @author pavery
  */
 public class ProjectUnzipUtility {
-	public static final String ZIP_EXTENSION = ".zip";
-	
 	class WorkspaceProgressMonitor implements IProgressMonitor {
 		private boolean finished = false;
 
@@ -143,7 +141,7 @@
 	// specify buffer size for extraction
 	static final int BUFFER = 2048;
 
-	public void unzipAndImport(File inFile, String destinationDirectory) throws Exception {
+	public void unzipAndImport(File inFile, String destinationDirectory) {
 		try {
 			// Specify file to decompress
 			// (nsd) redundant?
@@ -218,8 +216,13 @@
 			// fixes workspace metadata for the project
 			// for clean startup next run
 			if (currentProject != null) {
-				Path projectLocation = new Path(Platform.getLocation().toOSString());
-				createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
+				try {
+					Path projectLocation = new Path(Platform.getLocation().toOSString());
+					createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
+				}
+				catch (CoreException cex) {
+					cex.printStackTrace();
+				}
 			}
 		}
 		catch (IOException ioe) {
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/TestJSPMarkupValidator.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/TestJSPMarkupValidator.java
new file mode 100644
index 0000000..614fa2a
--- /dev/null
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/TestJSPMarkupValidator.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.jsp.ui.tests.validation;
+
+import junit.framework.TestCase;
+
+import org.eclipse.jface.text.Region;
+import org.eclipse.jst.jsp.ui.internal.validation.JSPMarkupValidator;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.xml.ui.internal.validation.MarkupValidator;
+
+public class TestJSPMarkupValidator extends TestCase {
+	private MarkupValidator fValidator;
+	private IReporter fReporter;
+	private IStructuredDocument fDocument;
+
+	/**
+	 * Validates document
+	 * 
+	 * @param contents
+	 *            contents to set in document
+	 * @return true if there was a validation error false otherwise
+	 */
+	private boolean validateError(String contents) {
+		fDocument.set(contents);
+		fValidator.validate(new Region(0, fDocument.getLength()), null, fReporter);
+		return fReporter.getMessages().isEmpty();
+	}
+
+	protected void setUp() throws Exception {
+		// just create once
+		if (fValidator == null)
+			fValidator = new JSPMarkupValidator();
+		if (fReporter == null)
+			fReporter = new IncrementalReporter(null);
+		if (fDocument == null)
+			fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor("onfire.xml", "", null);
+
+		fValidator.connect(fDocument);
+	}
+
+	protected void tearDown() throws Exception {
+		fValidator.disconnect(fDocument);
+	}
+
+	public void testAttributesInEndTag() {
+		// test for error
+		assertTrue("Should get attributes in end tag error", !validateError("<stop></stop drop=\"roll\">"));
+
+		// test for no error
+		assertTrue("Should not get attributes in end tag error", validateError("<stop></stop>"));
+	}
+
+	public void testClosingBracket() {
+		// test for error
+		assertTrue("Should get closing bracket error", !validateError("<stop </stop>"));
+
+		// test for no error
+		assertTrue("Should not get closing bracket error", validateError("<stop></stop>"));
+	}
+
+	public void testEmptyTag() {
+		// test for error
+		assertTrue("Should get empty tag error", !validateError("<>"));
+
+		// test for no error
+		assertTrue("Should not get empty tag error", validateError("<stop></stop>"));
+	}
+
+	public void testAttributeValue() {
+		// test for error
+		assertTrue("Should get attribute missing value error", !validateError("<stop drop=></stop>"));
+
+		// test for no error
+		assertTrue("Should not get attribute has no value error", validateError("<stop drop></stop>"));
+		assertTrue("Should not get attribute missing value error", validateError("<stop drop=\"roll\"></stop>"));
+	}
+
+	public void testSpaceBeforeName() {
+		// test for error
+		assertTrue("Should get tag has space before name error", !validateError("<    stop></stop>"));
+
+		// test for no error
+		assertTrue("Should not get tag has space before name error", validateError("<stop></stop>"));
+	}
+
+	public void testQuotesForAttributeValues() {
+		// test for error
+		assertTrue("Should get missing end quote error", !validateError("<stop drop=\"></stop>"));
+		assertTrue("Should get missing end quote error", !validateError("<stop drop=\"roll></stop>"));
+		assertTrue("Should get missing end quote error", !validateError("<stop drop=\'></stop>"));
+
+		// test for no error
+		assertTrue("Should not get missing quotes error", validateError("<stop drop=roll></stop>"));
+		assertTrue("Should not get missing end quote error", validateError("<stop drop=\"\"></stop>"));
+		assertTrue("Should not get missing end quote error", validateError("<stop drop=\"roll\"></stop>"));
+		assertTrue("Should not get missing end quote error", validateError("<stop drop=\'\'></stop>"));
+		assertTrue("Should not get missing quotes error", validateError("<stop drop=\'roll\'></stop>"));
+	}
+}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java b/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java
deleted file mode 100644
index 41e8647..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package org.eclipse.text.tests;
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.Assert;
-
-
-/**
- * Helper class for accessing classes and members which cannot
- * be accessed using standard Java access control like private
- * or package visible elements.
- *
- * @since 3.1
- */
-public class Accessor {
-
-	/** The class to access. */
-	private Class fClass;
-	/** The instance to access. */
-	private Object fInstance;
-
-	/**
-	 * Creates an accessor for the given <code>instance</code> and
-	 * <code>class</code>. Only non-inherited members that particular
-	 * <code>class</code> can be accessed.
-	 *
-	 * @param instance the instance
-	 * @param clazz the class
-	 */
-	public Accessor(Object instance, Class clazz) {
-		org.eclipse.core.runtime.Assert.isNotNull(instance);
-		Assert.isNotNull(clazz);
-		fInstance= instance;
-		fClass= clazz;
-	}
-
-	/**
-	 * Creates an accessor for the given <code>instance</code> and
-	 * <code>class</code>. Only non-inherited members that particular
-	 * <code>class</code> can be accessed.
-	 *
-	 * @param instance the instance
-	 * @param className the name of the class
-	 * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
-	 */
-	public Accessor(Object instance, String className, ClassLoader classLoader) {
-		Assert.isNotNull(instance);
-		Assert.isNotNull(className);
-		Assert.isNotNull(classLoader);
-		fInstance= instance;
-		try {
-			fClass= Class.forName(className, true, classLoader);
-		} catch (ClassNotFoundException e) {
-			fail();
-		} catch (ExceptionInInitializerError e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Creates an accessor for the given class.
-	 * <p>
-	 * In order to get the type information from the given
-	 * arguments they must all be instanceof Object. Use
-	 * {@link #Accessor(String, ClassLoader, Class[], Object[])} if this
-	 * is not the case.</p>
-	 *
-	 * @param className the name of the class
-	 * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
-	 * @param constructorArgs the constructor arguments which must all be instance of Object
-	 */
-	public Accessor(String className, ClassLoader classLoader, Object[] constructorArgs) {
-		this(className, classLoader, getTypes(constructorArgs), constructorArgs);
-	}
-
-	/**
-	 * Creates an accessor for the given class.
-	 *
-	 * @param className the name of the class
-	 * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
-	 * @param constructorTypes the types of the constructor arguments
-	 * @param constructorArgs the constructor arguments
-	 */
-	public Accessor(String className, ClassLoader classLoader, Class[] constructorTypes, Object[] constructorArgs) {
-		try {
-			fClass= Class.forName(className, true, classLoader);
-		} catch (ClassNotFoundException e) {
-			fail();
-		} catch (ExceptionInInitializerError e) {
-			fail();
-		}
-		Constructor constructor= null;
-		try {
-			constructor= fClass.getDeclaredConstructor(constructorTypes);
-		} catch (SecurityException e2) {
-			fail();
-		} catch (NoSuchMethodException e2) {
-			fail();
-		}
-		Assert.isNotNull(constructor);
-		constructor.setAccessible(true);
-		try {
-			fInstance= constructor.newInstance(constructorArgs);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (InvocationTargetException e) {
-			fail();
-		} catch (InstantiationException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Creates an accessor for the given class.
-	 * <p>
-	 * This constructor is used to access static stuff.
-	 * </p>
-	 *
-	 * @param className the name of the class
-	 * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
-	 */
-	public Accessor(String className, ClassLoader classLoader) {
-		try {
-			fClass= Class.forName(className, true, classLoader);
-		} catch (ClassNotFoundException e) {
-			fail();
-		} catch (ExceptionInInitializerError e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Invokes the method with the given method name and arguments.
-	 * <p>
-	 * In order to get the type information from the given
-	 * arguments all those arguments must be instance of Object. Use
-	 * {@link #invoke(String, Class[], Object[])} if this
-	 * is not the case.</p>
-	 *
-	 * @param methodName the method name
-	 * @param arguments the method arguments which must all be instance of Object
-	 * @return the method return value
-	 */
-	public Object invoke(String methodName, Object[] arguments) {
-		return invoke(methodName, getTypes(arguments), arguments);
-	}
-
-	/**
-	 * Invokes the method with the given method name and arguments.
-	 *
-	 * @param methodName the method name
-	 * @param types the argument types
-	 * @param arguments the method arguments
-	 * @return the method return value
-	 */
-	public Object invoke(String methodName, Class[] types, Object[] arguments) {
-		Method method= null;
-		try {
-			method= fClass.getDeclaredMethod(methodName, types);
-		} catch (SecurityException e) {
-			fail();
-		} catch (NoSuchMethodException ex) {
-			fail();
-		}
-		Assert.isNotNull(method);
-		method.setAccessible(true);
-		try {
-			return method.invoke(fInstance, arguments);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (InvocationTargetException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-		return null;
-	}
-
-	/**
-	 * Assigns the given value to the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @param value the value to assign to the field
-	 */
-	public void set(String fieldName, Object value) {
-		Field field= getField(fieldName);
-		try {
-			field.set(fInstance, value);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Assigns the given value to the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @param value the value to assign to the field
-	 */
-	public void set(String fieldName, boolean value) {
-		Field field= getField(fieldName);
-		try {
-			field.setBoolean(fInstance, value);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Assigns the given value to the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @param value the value to assign to the field
-	 */
-	public void set(String fieldName, int value) {
-		Field field= getField(fieldName);
-		try {
-			field.setInt(fInstance, value);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-	}
-
-	/**
-	 * Returns the value of the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @return the value of the field
-	 */
-	public Object get(String fieldName) {
-		Field field= getField(fieldName);
-		try {
-			return field.get(fInstance);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-		// Unreachable code
-		return null;
-	}
-
-	/**
-	 * Returns the value of the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @return the value of the field
-	 */
-	public boolean getBoolean(String fieldName) {
-		Field field= getField(fieldName);
-		try {
-			return field.getBoolean(fInstance);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-		// Unreachable code
-		return false;
-	}
-
-	/**
-	 * Returns the value of the field with the given name.
-	 *
-	 * @param fieldName the field name
-	 * @return the value of the field
-	 */
-	public int getInt(String fieldName) {
-		Field field= getField(fieldName);
-		try {
-			return field.getInt(fInstance);
-		} catch (IllegalArgumentException e) {
-			fail();
-		} catch (IllegalAccessException e) {
-			fail();
-		}
-		// Unreachable code
-		return 0;
-	}
-
-	private Field getField(String fieldName) {
-		Field field= null;
-		try {
-			field= fClass.getDeclaredField(fieldName);
-		} catch (SecurityException e) {
-			fail();
-		} catch (NoSuchFieldException e) {
-			fail();
-		}
-		field.setAccessible(true);
-		return field;
-	}
-
-	private static Class[] getTypes(Object[] objects) {
-		if (objects == null)
-			return null;
-
-		int length= objects.length;
-		Class[] classes= new Class[length];
-		for (int i= 0; i < length; i++) {
-			Assert.isNotNull(objects[i]);
-			classes[i]= objects[i].getClass();
-		}
-		return classes;
-	}
-
-	private void fail() {
-		Assert.isTrue(false);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java
deleted file mode 100644
index 23915b0..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test Suite for org.eclipse.text.
- *
- * @since 3.0
- */
-public class EclipseTextTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("org.eclipse.text Test Suite using JSP BasicStructuredDocument"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-//		suite.addTest(LineTrackerTest4.suite());
-//		suite.addTest(DocumentExtensionTest.suite());
-//		suite.addTest(LineTrackerTest3.suite());
-//		suite.addTest(DocumentTest.suite());
-//		suite.addTest(FindReplaceDocumentAdapterTest.suite());
-		suite.addTest(PositionUpdatingCornerCasesTest.suite());
-		suite.addTest(ExclusivePositionUpdaterTest.suite());
-//		suite.addTest(TextEditTests.suite());
-//		suite.addTest(GapTextTest.suite());
-//		suite.addTest(AdaptiveGapTextTest.suite());
-//		suite.addTest(GapTextStoreTest.suite());
-//		suite.addTest(ChildDocumentTest.suite());
-//		suite.addTest(ProjectionTestSuite.suite());
-//		suite.addTest(LinkTestSuite.suite());
-//		suite.addTest(CopyOnWriteTextStoreTest.suite());
-//		suite.addTest(TextUtilitiesTest.suite());
-//		suite.addTest(AnnotationModelStressTest.suite());
-//		suite.addTest(AnnotationModelExtension2Test.suite());
-//		suite.addTest(TemplatesTestSuite.suite());
-		//$JUnit-END$
-
-		return suite;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java b/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
deleted file mode 100644
index af11fab..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-/**
- * @since 3.3
- */
-public class ExclusivePositionUpdaterTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(ExclusivePositionUpdaterTest.class);
-	}
-
-	private IPositionUpdater fUpdater;
-	private static final String CATEGORY= "testcategory";
-	private Position fPos;
-	private IDocument fDoc;
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		fUpdater= new DefaultPositionUpdater(CATEGORY);
-//		fDoc = new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
-		fDoc= createDocument("ccccccccccccccccccccccccccccccccccccccccccccc");
-		fPos= new Position(5, 5);
-		fDoc.addPositionUpdater(fUpdater);
-		fDoc.addPositionCategory(CATEGORY);
-		fDoc.addPosition(CATEGORY, fPos);
-	}
-
-	private IDocument createDocument(String contents) {
-		IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.jst.jsp.jspsource");
-		BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
-		document.set(contents);
-		return document;
-	}
-
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fDoc.removePositionUpdater(fUpdater);
-		fDoc.removePositionCategory(CATEGORY);
-	}
-
-	public void testDeleteAfter() throws BadLocationException {
-		fDoc.replace(20, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddAfter() throws BadLocationException {
-		fDoc.replace(20, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteBefore() throws BadLocationException {
-		fDoc.replace(2, 2, "");
-		Assert.assertEquals(3, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddBefore() throws BadLocationException {
-		fDoc.replace(2, 0, "yy");
-		Assert.assertEquals(7, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddRightBefore() throws BadLocationException {
-		fDoc.replace(5, 0, "yy");
-		Assert.assertEquals(7, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteAtOffset() throws BadLocationException {
-		fDoc.replace(5, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(3, fPos.length);
-	}
-
-	public void testDeleteRightBefore() throws BadLocationException {
-		fDoc.replace(3, 2, "");
-		Assert.assertEquals(3, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddRightAfter() throws BadLocationException {
-		fDoc.replace(10, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteRightAfter() throws BadLocationException {
-		fDoc.replace(10, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddWithin() throws BadLocationException {
-		fDoc.replace(6, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(7, fPos.length);
-	}
-
-	public void testDeleteWithin() throws BadLocationException {
-		fDoc.replace(6, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(3, fPos.length);
-	}
-
-	public void testReplaceLeftBorder() throws BadLocationException {
-		fDoc.replace(4, 2, "yy");
-		Assert.assertEquals(6, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testReplaceRightBorder() throws BadLocationException {
-		fDoc.replace(9, 2, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testDeleteOverRightBorder() throws BadLocationException {
-		fDoc.replace(9, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testDeleted() throws BadLocationException {
-		fDoc.replace(4, 7, "");
-		Assert.assertTrue(fPos.isDeleted);
-	}
-
-	public void testReplaced() throws BadLocationException {
-		fDoc.replace(4, 7, "yyyyyyy");
-		Assert.assertTrue(fPos.isDeleted);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
deleted file mode 100644
index 47d1193..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-
-public class PositionUpdatingCornerCasesTest extends TestCase {
-	private IDocument fDocument;
-
-	public PositionUpdatingCornerCasesTest(String name) {
-		super(name);
-	}
-
-	protected void checkPositions(Position[] expected) throws BadPositionCategoryException {
-		Position[] actual= fDocument.getPositions(IDocument.DEFAULT_CATEGORY);
-		assertTrue("invalid number of positions", actual.length == expected.length);
-
-		for (int i= 0; i < expected.length; i++) {
-			assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
-		}
-	}
-
-	protected String print(Position p) {
-		return "[" + p.getOffset() + "," + p.getLength() + "]";
-	}
-
-	protected void setUp() throws Exception {
-//		fDocument= new Document("x-x-x-x-x-x-x-x-x-x-x");
-		fDocument= createDocument("x-x-x-x-x-x-x-x-x-x-x");
-		fDocument.addPosition(new Position(0, 0));
-		fDocument.addPosition(new Position(0, 1));
-		fDocument.addPosition(new Position(5, 0));
-		fDocument.addPosition(new Position(5, 3));
-	}
-
-	private IDocument createDocument(String contents) {
-		IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.jst.jsp.jspsource");
-		BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
-		document.set(contents);
-		return document;
-	}
-
-	public static Test suite() {
-		return new TestSuite(PositionUpdatingCornerCasesTest.class);
-	}
-
-	protected void tearDown() {
-		fDocument= null;
-	}
-
-	public void testInsert() throws Exception {
-		fDocument.replace(0, 0, "yy");
-
-		Position[] positions= new Position[] {
-				new Position( 2, 1),
-				new Position( 2, 0),
-				new Position( 7, 3),
-				new Position( 7, 0)
-		};
-
-		checkPositions(positions);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
index c9ae65f..73bcbe5 100644
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: csscoretests.jar
 Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
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
index fac03d0..0a762ff 100644
--- 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
@@ -25,7 +25,6 @@
 import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
 import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
 import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-import org.eclipse.wst.css.core.tests.testfiles.CSSModelLoadTest;
 
 
 public class CSSAllTests extends TestSuite {
@@ -57,6 +56,5 @@
 		suite.addTestSuite(TestFormatProcessorCSS.class);
 		suite.addTestSuite(TestCleanupProcessorCSS.class);
 		suite.addTestSuite(TestCSSDecl.class);
-		suite.addTestSuite(CSSModelLoadTest.class);
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
index f83f8da..112fdf6 100644
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
+++ b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -153,12 +153,4 @@
 	public void testBUG110539multipleClassFormat() throws UnsupportedEncodingException, IOException, CoreException {
 		formatAndAssertEquals("testfiles/bug110539-multipleclass.css", "testfiles/bug110539-multipleclass-formatted.css");
 	}
-	
-	public void testBUG248465combinedPseudoClass() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/bug248465-combined-pseudo-classes.css", "testfiles/bug248465-combined-pseudo-classes-fmt.css");
-	}
-	
-	public void testBUG196476selectorPseudoclassesFormat() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/bug196476-selector-pseudo-classes.css", "testfiles/bug196476-selector-pseudo-classes-fmt.css");
-	}
 }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css
deleted file mode 100644
index d745f61..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css
+++ /dev/null
@@ -1,23 +0,0 @@
-#block:after {
-	content: ".";
-}
-
-div.content #block:after {
-	content: ".";
-}
-
-#block::after {
-	content: ".";
-}
-
-div span.fix.clear {
-	clear: both;
-}
-
-div span.fix.clear:after {
-	content: both;
-}
-
-div:after {
-	content: ".";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css
deleted file mode 100644
index a83df3f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css
+++ /dev/null
@@ -1,6 +0,0 @@
-#block:after { content: "."; }
-div.content #block:after { content: "."; }
-#block::after {content: "."; }
-div span.fix.clear { clear: both; }
-div span.fix.clear:after { content: both; }
-div:after { content: "."; }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css
deleted file mode 100644
index 336e6f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css
+++ /dev/null
@@ -1,7 +0,0 @@
-a:focus:hover,div:focus:hover {

-	background: white;

-}

-

-div a:focus:hover {

-	background: blue;

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css
deleted file mode 100644
index 401e096..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css
+++ /dev/null
@@ -1,7 +0,0 @@
-a:focus:hover,div:focus:hover {

-background: white;

-}

-

-div a:focus:hover {

-background: blue;

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
deleted file mode 100644
index 24d3006..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.wst.css.core.tests.testfiles;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.UnsupportedEncodingException;

-

-import junit.framework.TestCase;

-

-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;

-import org.eclipse.wst.sse.core.StructuredModelManager;

-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

-

-public class CSSModelLoadTest extends TestCase {

-	private static final String HTML4_CSS = "html4.css";

-

-	public CSSModelLoadTest() {

-		super("CSS Model Loading Suite");

-	}

-

-	public void testLoadCSSfromStream() throws UnsupportedEncodingException, IOException {

-		InputStream input = null;

-

-		input = CSSModelLoadTest.class.getResourceAsStream(HTML4_CSS);

-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(HTML4_CSS, input, null);

-		assertNotNull(model);

-		assertTrue("IStructuredModel was not a ICSSModel", model instanceof ICSSModel);

-		assertTrue("contents are incomplete", model.getStructuredDocument().get().indexOf("Basic HTML style information") > 4);

-		model.releaseFromEdit();

-	}

-}

diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
deleted file mode 100644
index c84d84f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Basic HTML style information.

- */

-html,

-address,

-blockquote,listing,

-body, dd, div,

-dl, dt, fieldset, legend,form,

-frame, frameset,

-h1, h2, h3, h4,

-h5, h6, noframes,noscript,

-ol, p, ul, center,

-dir, hr, menu, pre, plaintext, xmp  { display: block }

-

-ol				{counter-reset: _anonymous; list-style-type: decimal}

-ul,dir,menu  	{counter-reset: _anonymous; list-style-type: disc}

-li           	{display: list-item}

-li				{counter-increment: _anonymous}

-

-head            { display: none }

-table           { display: table }

-tr              { display: table-row }

-thead           { display: table-header-group }

-tbody           { display: table-row-group }

-tfoot           { display: table-footer-group }

-col             { display: table-column }

-colgroup        { display: table-column-group }

-td, th          { display: table-cell; }

-caption         { display: table-caption }

-th              { font-weight: bolder;}

-caption         { text-align: center;horizontal-align:top }

-button, textarea,

-input, object, 

-select, img { display:inline-block; }

-pre,plaintext, xmp   { white-space: pre }

-h1, h2, h3, h4,

-h5, h6, b,

-strong          { font-weight: bold }

-i, cite, em,dfn,

-var, address    { font-style: italic }

-pre, tt, code,plaintext, xmp,

-kbd, samp       { font-family: monospace }

-ol              { list-style-type: decimal }

-br:before       { content: "\A" }

-center          { text-align: center }

-sub             { vertical-align: sub }

-sup             { vertical-align: super }

-u, ins          { text-decoration: underline }

-input			{ text-decoration: none }

-button			{ white-space: nowrap }

-a[href]			{ text-decoration: underline }

-

-/*

- * styles that may be different for different user agent.

- * This part may need to move out and put into different css files.

- */

-body            { line-height: 1.12em }

-h1              { font-size: 2em; margin: .67em 0 }

-h2              { font-size: 1.5em; margin: .75em 0 }

-h3              { font-size: 1.17em; margin: .83em 0 }

-h4, p,ul,

-fieldset, form,

-ol, dl, dir,

-menu            { margin: 1.12em 0 }

-blockquote      { margin: 1em 40px }

-h5              { font-size: .83em; margin: 1.5em 0 }

-h6              { font-size: .75em; margin: 1.67em 0 }

-blockquote      { margin-left: 40px; margin-right: 40px }

-big             { font-size: larger }

-small, sub, sup { font-size: smaller }

-s, strike, del  { text-decoration: line-through }

-hr              { border: 1px inset }

-ol, ul, dir,

-menu, dd        { margin-left: 40px;border:0px }

-ol ul, ul ol,

-ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }

-abbr, acronym   { font-variant: small-caps; letter-spacing: 0.1em }

-a[href]         { color:blue;}

-select			{background-color: window;font-family:sans-serif;font-size:13px;font-weight: normal;}

-textarea		{border: 2px inset;font-size:13px;font-family:monospace}

-textarea,

-input 			{background-color: window}

-input,

-input[type=text],

-input[type=password] {border: 2px inset;font-size:13px;font-family:sans-serif;font-weight: normal;}

-/* following upcased TYPE is for workaround the WTP M2 bug of not setting default content type */

-input[TYPE=submit],input[TYPE=reset],input[TYPE=button],input[TYPE=cancel],

-button,

-input[type=button],

-input[type=reset],

-input[type=cancel],

-input[type=submit] {background-color: ButtonFace; border: 2px outset; font-size:13px;

-					font-family:sans-serif;text-align: center;font-weight: normal;}

-input[type=image],

-input[type=checkbox],

-input[type=radio]  {border: none }

-input[type=hidden]  {border: none }

-img				{border: 0px none}

-listing         {font-family:monospace;font-size: medium;white-space: pre; margin: 1em 0;}

-tbody,thead,tfoot     {vertical-align: middle;}

-blink 			{text-decoration: blink;}

-

-hr 		{margin: 0.5em auto 0.5em auto;}

-caption  {border: 0px none;margin: 0px; padding:0px 0px 4px 0px;}

-td, th,

-table    {border: 4px none;}

-button   {padding: 3px 5px;text-align: center;vertical-align: middle;}

-button,textarea,input   {vertical-align: text-bottom;color:black;font-style:none;}

-select {vertical-align: text-bottom;}

-input[type=image]  {vertical-align: baseline;}

-li   {min-height:1.2em}

-button {min-height:1.8em}

-div,tr,form {min-height:1.2em}

-table,td {min-width:1.2em;min-height:1.2em}

-

-/* nested lists have no top/bottom margins */

-ul ul,   ul ol,   ul dir,   ul menu,   ul dl,

-ol ul,   ol ol,   ol dir,   ol menu,   ol dl,

-dir ul,  dir ol,  dir dir,  dir menu,  dir dl,

-menu ul, menu ol, menu dir, menu menu, menu dl,

-dl ul,   dl ol,   dl dir,   dl menu,   dl dl 	{margin-top: 0; margin-bottom: 0;}

-

-/* 2 deep unordered lists use a circle */

-ol ul,   ul ul,   menu ul,   dir ul,

-ol menu, ul menu, menu menu, dir menu,

-ol dir,  ul dir,  menu dir,  dir dir 	{list-style-type: circle;}

-

-/* 3 deep (or more) unordered lists use a square */

-ol ol ul,     ol ul ul,     ol menu ul,     ol dir ul,

-ol ol menu,   ol ul menu,   ol menu menu,   ol dir menu,

-ol ol dir,    ol ul dir,    ol menu dir,    ol dir dir,

-ul ol ul,     ul ul ul,     ul menu ul,     ul dir ul,

-ul ol menu,   ul ul menu,   ul menu menu,   ul dir menu,

-ul ol dir,    ul ul dir,    ul menu dir,    ul dir dir,

-menu ol ul,   menu ul ul,   menu menu ul,   menu dir ul,

-menu ol menu, menu ul menu, menu menu menu, menu dir menu,

-menu ol dir,  menu ul dir,  menu menu dir,  menu dir dir,

-dir ol ul,    dir ul ul,    dir menu ul,    dir dir ul,

-dir ol menu,  dir ul menu,  dir menu menu,  dir dir menu,

-dir ol dir,   dir ul dir,   dir menu dir,   dir dir dir { list-style-type: square;}

-

-/**

- * We do not write codes to support some elements. This part defines properties for them 

- * to improve the look of these elements.

- */

-applet {border: 1px solid;}

-fieldset {border: 2px groove;}

-applet,iframe {display:inline-block; border:3px inset; }

-object {display:inline-block;border:0px none;}

-

-

-/* 

- * Sets right margin to have gap between widgets.

- */

-input,textarea,button	 { margin-right: 2px;}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
index 6777f48..6bca3e3 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.301.qualifier
 Bundle-ClassPath: cssencodingtests.jar
 Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -15,5 +15,5 @@
  org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
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
index 4aff6a6..d63f624 100644
--- 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
@@ -195,11 +195,10 @@
 		at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:52)
 		at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:31)
 		at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.testUTF16BOM(CSSHeadTokenizerTester.java:186)
-	*/
 
 	public void testUTF16BOM() throws IOException {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=243735
-//		String filename = fileLocation + "utf16BOM.css";
-//		doTestFile(filename, "UTF-16");
+		String filename = fileLocation + "utf16BOM.css";
+		doTestFile(filename, "UTF-16");
 	}
+	*/
 }
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
index 0ba3389..724db8b 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
+++ b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
Binary files differ
diff --git a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
index 47a257f..55c1497 100644
--- a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.ui.tests
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.wst.css.ui.tests.CSSUITestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -21,4 +21,3 @@
 Eclipse-LazyStart: true
 Bundle-ClassPath: cssuitests.jar
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Import-Package: org.eclipse.core.resources
diff --git a/tests/org.eclipse.wst.css.ui.tests/build.properties b/tests/org.eclipse.wst.css.ui.tests/build.properties
index b759e1f..a997770 100644
--- a/tests/org.eclipse.wst.css.ui.tests/build.properties
+++ b/tests/org.eclipse.wst.css.ui.tests/build.properties
@@ -3,7 +3,6 @@
                about.html,\
                src/,\
                test.xml,\
-               testresources/,\
                plugin.properties
 jars.compile.order = cssuitests.jar
 source.cssuitests.jar = src/
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
index e1cce0d..e1bef5c 100644
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
+++ b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
@@ -3,7 +3,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.css.ui.tests.viewer.TestCSSContentAssist;
 import org.eclipse.wst.css.ui.tests.viewer.TestViewerConfigurationCSS;
 
 public class CSSUITestSuite extends TestSuite {
@@ -16,6 +15,5 @@
 		addTest(new TestSuite(ExistenceTest.class, "CSS UI Existence Test"));
 		addTest(new TestSuite(TestViewerConfigurationCSS.class));
 		addTest(new TestSuite(TestEditorConfigurationCSS.class));
-		addTest(new TestSuite(TestCSSContentAssist.class));
 	}
 }	
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java
deleted file mode 100644
index d655fd1..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-public class ProjectUtil {
-	static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
-		Enumeration entries = CSSUITestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
-		while (entries != null && entries.hasMoreElements()) {
-			String entryPath = entries.nextElement().toString();
-			String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
-			if (entryPath.endsWith("/")) {
-				IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
-				if (!folder.exists()) {
-					folder.create(true, true, new NullProgressMonitor());
-				}
-				_copyBundleEntriesIntoWorkspace(entryPath, targetPath);
-			}
-			else {
-				_copyBundleEntryIntoWorkspace(entryPath, targetPath);
-			}
-			// System.out.println(entryPath + " -> " + targetPath);
-		}
-	}
-
-	static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
-		IFile file = null;
-		URL entry = CSSUITestsPlugin.getDefault().getBundle().getEntry(entryname);
-		if (entry != null) {
-			try {
-				byte[] b = new byte[2048];
-				InputStream input = entry.openStream();
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				int i = -1;
-				while ((i = input.read(b)) > -1) {
-					output.write(b, 0, i);
-				}
-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
-				if (file != null) {
-					if (!file.exists()) {
-						file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
-					}
-					else {
-						file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
-					}
-				}
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return file;
-	}
-
-	/**
-	 * @param rootEntry - avoid trailing separators
-	 * @param fullTargetPath
-	 */
-	public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				_copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		try {
-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 
-	 * @param entryname
-	 *            path relative to TEST plugin starting w/ a "/" (eg.
-	 *            "/testfiles/bugnumber/struts-logic.tld")
-	 * @param fullPath
-	 *            path relative to junit test workpace (eg.
-	 *            "/myruntimeproj/struts-logic.tld")
-	 * @return
-	 */
-	public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
-		final IFile file[] = new IFile[1];
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		try {
-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return file[0];
-	}
-
-	public static IProject createProject(String name, IPath location, String[] natureIds) {
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
-		if (location != null) {
-			description.setLocation(location);
-		}
-		if (natureIds != null) {
-			description.setNatureIds(natureIds);
-		}
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return project;
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java
deleted file mode 100644
index 6b9904e..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests.viewer;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-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.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor;
-import org.eclipse.wst.css.ui.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class TestCSSContentAssist extends TestCase {
-
-	protected String projectName = null;
-	protected String fileName = null;
-	protected String resourcesFolder = null;
-	private StructuredTextViewer sourceViewer = null;
-	protected IStructuredDocument document = null;
-	private IStructuredModel model;
-	protected IFile file = null;
-
-	public TestCSSContentAssist() {
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		projectName = "CSSContentAssistForMedia";
-		fileName = "mediaexample.css";
-		resourcesFolder = "/testresources";
-
-		String filePath = setupProject();
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(filePath));
-
-		if (file != null && !file.exists()) {
-			Assert.fail("Unable to locate " + file + ".");
-		}
-
-		loadFile();
-
-		initializeSourceViewer();
-	}
-
-	private void initializeSourceViewer() {
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			} else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			sourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		} else {
-			Assert.fail("Unable to run the test as a display must be available.");
-		}
-
-		configureSourceViewer();
-	}
-
-	protected void configureSourceViewer() {
-		sourceViewer.configure(new StructuredTextViewerConfigurationCSS());
-
-		sourceViewer.setDocument(document);
-	}
-
-	protected void loadFile() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		model = modelManager.getModelForEdit(file);
-		document = model.getStructuredDocument();
-	}
-
-	protected String setupProject() throws Exception{
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		} catch (CoreException e) {
-
-		}
-		String filePath = project.getFullPath().addTrailingSeparator().append(fileName).toString();
-
-		ProjectUtil.copyBundleEntriesIntoWorkspace(resourcesFolder, project.getFullPath().toString());
-
-		return filePath;
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testContentAssistInsideMedia() throws Exception {
-
-		try {
-			CSSContentAssistProcessor processor = new CSSContentAssistProcessor();
-			ICompletionProposal[] proposals = processor.computeCompletionProposals(sourceViewer, 24);
-			assertTrue("No proposals at offset.", proposals.length > 0);
-			ICompletionProposal proposal = proposals[0];
-			assertEquals("Wrong proposal returned for ACRONYM.", "azimuth", proposal.getDisplayString()); 
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css b/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css
deleted file mode 100644
index 1ec4b8c..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@MEDIA {
-	ACRONYM {
-		
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
index e362b12..837fad1 100644
--- a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.dtd.core.tests;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: dtdcoretests.jar
 Bundle-Activator: org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
index 73eb490..6d7a202 100644
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
+++ b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
@@ -19,8 +19,6 @@
 		super("DTD Core TestSuite");
 		addTest(new TestSuite(VerifyPlugin.class));
 		addTest(new TestSuite(DTDParserTest.class));
-		addTestSuite(DTDFileTest.class);
-		addTestSuite(DTDModelTests.class);
 	}
 	public static Test suite() {
 		return new DTDCoreTestSuite();
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java
deleted file mode 100644
index be05238..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver (STAR) - bug 245216 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-import junit.framework.TestCase;
-
-public class DTDFileTest extends TestCase {
-
-	public DTDFileTest() {
-	}
-
-	public DTDFileTest(String name) {
-		super(name);
-	}
-	
-	public void testGetTopLevelNodeAt() throws Exception {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		DTDModelImpl model = (DTDModelImpl)modelManager.createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		String dtdText = "<!ELEMENT NewElement3 (#PCDATA)><!ENTITY % NewEntity SYSTEM \"\" >";
-		IStructuredDocument document = model.getStructuredDocument();
-		document.set(dtdText);
-		
-		model.setStructuredDocument(document);
-		DTDFile dtdFile = model.getDTDFile();
-		
-		DTDNode dtdNode = dtdFile.getTopLevelNodeAt(32);
-		assertNotNull("Node is null", dtdNode);
-		assertEquals("Unexpected Node Type.",  "NewEntity", dtdNode.getName());
-	}
-
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java
deleted file mode 100644
index 589e68f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver (STAR) - bug 245216 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-import junit.framework.TestCase;
-
-public class DTDModelTests  extends TestCase {
-
-	public void testcreateUnmanagedDTDModel() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		assertTrue("Did not get DTD Model", model instanceof DTDModelImpl );
-	}
-	
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.classpath b/tests/org.eclipse.wst.dtd.ui.tests/.classpath
index 23e61fd..e2bdc16 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/.classpath
+++ b/tests/org.eclipse.wst.dtd.ui.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 51342e0..5f7bac7 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Apr 21 19:01:52 EDT 2009
+#Sat Aug 19 16:31:43 EDT 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -7,24 +7,24 @@
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=200
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
@@ -75,6 +75,6 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.incompatibleJDKLevel=warning
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
index 9dbe810..feeb98b 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.dtd.ui.tests
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-ClassPath: dtduitests.jar
 Bundle-Activator: org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -25,5 +25,4 @@
  org.junit;bundle-version="[3.8.0,4.0.0)",
  com.ibm.icu
 Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
index 3170f7f..e330ee8 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
+++ b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
@@ -23,14 +23,14 @@
  * The purpose of this test is to verify the validity of the HTML Source
  * editor preferences. Tests include setting/getting preferences.
  * 
- * NOTE: This test should be performed on a clean workspace. If performed on
+ * NOTE: This test should be preformed on a clean workspace. If performed on
  * an existing workspace, this test will manipulate preferences in the
  * workspace, though attempts will be made to restore original values after
  * testing.
  */
 public class DTDUIPreferencesTest extends TestCase {
 	/**
-	 * Tests existence of preference values when getting preference values
+	 * Tests existance of preference values when getting preference values
 	 * through Platform.getPreferencesService()
 	 */
 	public void testBundleGetPreferences() {
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
index b6c29a2..7710a54 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
+++ b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.dtd.ui.tests.plugin.TestPluginXMLRequirements;
 import org.eclipse.wst.dtd.ui.tests.viewer.TestViewerConfigurationDTD;
 
 
@@ -29,6 +28,5 @@
 		addTest(new TestSuite(DTDUIPreferencesTest.class));
 		addTest(new TestSuite(TestViewerConfigurationDTD.class));
 		addTest(new TestSuite(TestEditorConfigurationDTD.class));
-		addTestSuite(TestPluginXMLRequirements.class);
 	}
 }
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/plugin/TestPluginXMLRequirements.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/plugin/TestPluginXMLRequirements.java
deleted file mode 100644
index 7cd243e..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/plugin/TestPluginXMLRequirements.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 Standard for Technology in Automotive Retail and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     David Carver (STAR) - bug 271784 - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.dtd.ui.tests.plugin;

-

-import java.io.IOException;

-import java.net.URL;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.xpath.XPath;

-import javax.xml.xpath.XPathConstants;

-import javax.xml.xpath.XPathExpression;

-import javax.xml.xpath.XPathFactory;

-

-import junit.framework.TestCase;

-

-import org.eclipse.core.runtime.FileLocator;

-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-

-public class TestPluginXMLRequirements extends TestCase{

-

-	private static final String PLUGIN_XML = "plugin.xml";

-	

-	Document pluginDoc = null;

-	XPath xpath = null;

-

-	public TestPluginXMLRequirements() {

-		super();

-	}

-	

-	protected void setUp() throws Exception {

-		super.setUp();

-		

-		loadPluginXML();

-		initXPath();

-	}

-	

-	protected void tearDown() throws Exception {

-		super.tearDown();

-		pluginDoc = null;

-		xpath = null;

-	}

-

-	private void initXPath() {

-		XPathFactory xpathFactory = XPathFactory.newInstance();

-		xpath = xpathFactory.newXPath();

-	}

-

-	private void loadPluginXML() throws Exception {

-		URL url = getTestFile(PLUGIN_XML);

-		url.openStream();

-		DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();

-		DocumentBuilder domBuilder = domFactory.newDocumentBuilder();

-		pluginDoc = domBuilder.parse(url.openStream());

-	}

-	

-	protected URL getInstallLocation(String path) {

-		URL installLocation = DTDUIPlugin.getDefault().getBundle().getEntry(path);

-		URL resolvedLocation = null;

-		try {

-			resolvedLocation = FileLocator.resolve(installLocation);

-		}

-		catch (IOException e) {

-			// impossible

-			throw new Error(e);

-		}

-		return resolvedLocation;

-	}

-

-	protected URL getTestFile(String filepath) {

-		URL installURL = getInstallLocation("/" + filepath);

-		return installURL;

-	}

-	

-	

-	public void testDTDToolTipExists() throws Exception {

-		String xpathString = "//menuContribution[@locationURI = 'toolbar:org.eclipse.wst.xml.ui.perspective.NewFileToolBar']/command[@id = 'org.eclipse.wst.dtd.ui.newDTDFile']";

-		XPathExpression xpathExpr = xpath.compile(xpathString);

-		Element element = (Element) xpathExpr.evaluate(pluginDoc.getDocumentElement(), XPathConstants.NODE);

-		String toolTip = element.getAttribute("tooltip");

-		assertEquals("Unexpected value for DTD tooltip", "%DTD_New_context_type_Extension_Element.name", toolTip);

-	}

-

-}

diff --git a/tests/org.eclipse.wst.html.core.tests/.cvsignore b/tests/org.eclipse.wst.html.core.tests/.cvsignore
index 3a74feb..8fde234 100644
--- a/tests/org.eclipse.wst.html.core.tests/.cvsignore
+++ b/tests/org.eclipse.wst.html.core.tests/.cvsignore
@@ -5,4 +5,3 @@
 htmlcoretests.jar
 temp.folder
 javaCompiler.htmlcoretests.jar.args
-ParserResults2008*
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
index cbfa966..5434ec5 100644
--- a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.core.tests;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-ClassPath: htmlcoretests.jar
 Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -27,4 +27,3 @@
  org.eclipse.core.resources
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.html.core.tests/build.properties b/tests/org.eclipse.wst.html.core.tests/build.properties
index dd404c1..a013d49 100644
--- a/tests/org.eclipse.wst.html.core.tests/build.properties
+++ b/tests/org.eclipse.wst.html.core.tests/build.properties
@@ -11,6 +11,7 @@
 source.htmlcoretests.jar = src/
 output.htmlcoretests.jar = bin/
 bin.includes = htmlcoretests.jar,\
+               plugin.xml,\
                test.xml,\
                ParserResults2004-12-10-22-23-47/,\
                META-INF/,\
diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.xml b/tests/org.eclipse.wst.html.core.tests/plugin.xml
new file mode 100644
index 0000000..dc6aef0
--- /dev/null
+++ b/tests/org.eclipse.wst.html.core.tests/plugin.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+	<!-- leave this empty plugin.xml here for now, 
+		because we do a funky thing 
+		to find it during the tests -->
+
+</plugin>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
index 77b974f..7b245a2 100644
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
+++ b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
@@ -62,11 +62,15 @@
 		if (previousResultsDirectory == null && notTriedYet) {
 			Bundle bundle = Platform.getBundle(PLUGIN_ID);
 			URL url = bundle.getEntry("/"); //$NON-NLS-1$
-
-			URL finalurl = FileLocator.toFileURL(url);
-			String finalFile = finalurl.getPath();
-
-			File pluginHomeDir = new File(finalFile);
+			//String installPath = url.getPath();
+			// add known file so URL method below can be used
+			// (doesn't seem to work for directory?)
+			URL totalURL = new URL(url, "plugin.xml");
+			URL finalurl = FileLocator.toFileURL(totalURL);
+			String finalFile = finalurl.getFile();
+			File file = new File(finalFile);
+			String finalPath = file.getParent();
+			File pluginHomeDir = new File(finalPath);
 			FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
 			File[] allDirs = pluginHomeDir.listFiles(dirFilter);
 
diff --git a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
index 6d74c85..9e38abb 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: htmlencodingtests.jar
 Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -16,5 +16,5 @@
  org.eclipse.wst.xml.core,
  org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.sse.core
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
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
index aca58a5..18963f2 100644
--- 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
@@ -302,11 +302,10 @@
 		at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:57)
 		at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:37)
 		at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.testUTF16BOM(HTMLHeadTokenizerTester.java:293)
-	*/
 
 	public void testUTF16BOM() throws IOException {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=243735
-//		String filename = this.fileLocation + "utf16BOM.html";
-//		doTestFile(filename, "UTF-16");
+		String filename = this.fileLocation + "utf16BOM.html";
+		doTestFile(filename, "UTF-16");
 	}
+	*/
 }
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
index 71915f4..d8d62de 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
+++ b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
Binary files differ
diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
index 2898b48..7978f88 100644
--- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-ClassPath: htmluitests.jar
 Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -25,4 +25,3 @@
  com.ibm.icu
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
index c017c91..8e8fb02 100644
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
+++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
@@ -29,27 +29,27 @@
 		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
 		assertNotNull("no source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
 		// check for over-qualified subclasses
-		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, StructuredTextViewerConfigurationHTML.class, o.getClass());
+		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), StructuredTextViewerConfigurationHTML.class);
 	}
 
 	public void testGetContentOutlineViewerConfiguration() {
 		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
 		assertNotNull("no content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
 		// check for over-qualified subclasses
-		assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, HTMLContentOutlineConfiguration.class, o.getClass());
+		assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), HTMLContentOutlineConfiguration.class);
 	}
 
 	public void testGetPropertySheetConfiguration() {
 		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
 		assertNotNull("no property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
 		// check for over-qualified subclasses
-		assertEquals("unexpected property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, XMLPropertySheetConfiguration.class, o.getClass());
+		assertEquals("unexpected property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), XMLPropertySheetConfiguration.class);
 	}
 	
 	public void testGetDocumentationTextHover() {
 		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IHTMLPartitions.HTML_DEFAULT);
 		assertNotNull("no documentation text hover for " + IHTMLPartitions.HTML_DEFAULT, o);
 		// check for over-qualified subclasses
-		assertEquals("unexpected documentation text hover for " + IHTMLPartitions.HTML_DEFAULT, HTMLTagInfoHoverProcessor.class, o.getClass());
+		assertEquals("unexpected documentation text hover for " + IHTMLPartitions.HTML_DEFAULT, o.getClass(), HTMLTagInfoHoverProcessor.class);
 	}
 }
diff --git a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
index fa6c76e..49812d7 100644
--- a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.sse.core.tests
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: ssemodeltests.jar
 Bundle-Activator: org.eclipse.wst.sse.core.tests.SSEModelTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -19,5 +19,5 @@
  org.eclipse.wst.sse.core,
  org.eclipse.core.runtime,
  com.ibm.icu
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.sse.core.tests/build.properties b/tests/org.eclipse.wst.sse.core.tests/build.properties
index 885af09..a43b159 100644
--- a/tests/org.eclipse.wst.sse.core.tests/build.properties
+++ b/tests/org.eclipse.wst.sse.core.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
+# Copyright (c) 2004, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
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
index ea729a4..b9400f7 100644
--- 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
@@ -13,7 +13,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.sse.core.tests.document.TestObjects;
 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;
@@ -46,7 +45,7 @@
 	// TestDocumentReader.class, TestCharSequenceReader.class,
 	// TestRegionMatches.class};
 
-	private static Class[] classes = new Class[]{ExistenceTest.class, TestObjects.class, TestNewDocumentContentEvent.class, TestAboutToBeChangedEvent.class, TestNewDocumentEvent.class, TestNoChangeEvent.class, TestRegionChangedEvent.class,TestRegionsReplacedEvent.class,TestStructuredDocumentRegionsReplacedEvent.class, TestJarUtilities.class, TestUnsupportedContentType.class};
+	private static Class[] classes = new Class[]{ExistenceTest.class, TestNewDocumentContentEvent.class, TestAboutToBeChangedEvent.class, TestNewDocumentEvent.class, TestNoChangeEvent.class, TestRegionChangedEvent.class,TestRegionsReplacedEvent.class,TestStructuredDocumentRegionsReplacedEvent.class, TestJarUtilities.class};
 
 	public SSEModelTestSuite() {
 		super("SSE Model Basic Test Suite");
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestUnsupportedContentType.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestUnsupportedContentType.java
deleted file mode 100644
index 0426a8a..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestUnsupportedContentType.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.sse.core.tests;

-

-import java.io.ByteArrayInputStream;

-import java.io.IOException;

-import java.io.PrintWriter;

-import java.io.StringWriter;

-

-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.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.wst.sse.core.StructuredModelManager;

-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

-

-public class TestUnsupportedContentType extends TestCase {

-	/**

-	 * Creates a simple project.

-	 * 

-	 * @param name

-	 *            - the name of the project

-	 * @return

-	 */

-	static IProject createSimpleProject(String name) {

-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);

-		try {

-			if (!project.exists())

-				project.create(description, new NullProgressMonitor());

-			if (!project.isAccessible())

-				project.open(new NullProgressMonitor());

-		}

-		catch (CoreException e) {

-			e.printStackTrace();

-		}

-		return project;

-	}

-

-

-	/**

-	 * Verify that attempting to load a model for an unsupported content type

-	 * simply returns null without Exceptions or assertion failures.

-	 * 

-	 * @throws CoreException

-	 * @throws IOException

-	 */

-	public void testGetForReadWithUnsupported() throws CoreException {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getName());

-		if (!project.isAccessible()) {

-			project = createSimpleProject(getName());

-		}

-

-		IFile file = project.getFile("testReadFile.js");

-		file.create(new ByteArrayInputStream("var n = 0;".getBytes()), true, null);

-		assertTrue("test file not created", file.isAccessible());

-		try {

-			IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(file);

-			assertNull("model returned even though expected to silently get null", model);

-			if (model != null)

-				model.releaseFromRead();

-		}

-		catch (Exception e) {

-			StringWriter out = new StringWriter();

-			e.printStackTrace(new PrintWriter(out));

-			fail(out.toString());

-		}

-		project.delete(true, null);

-	}

-

-	/**

-	 * Verify that attempting to load a model for an unsupported content type

-	 * simply returns null without Exceptions or assertion failures.

-	 * 

-	 * @throws CoreException

-	 * @throws IOException

-	 */

-	public void testGetForEditWithUnsupported() throws CoreException {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getName());

-		if (!project.isAccessible()) {

-			project = createSimpleProject(getName());

-		}

-

-		IFile file = project.getFile("testEditFile.js");

-		file.create(new ByteArrayInputStream("var n = 0;".getBytes()), true, null);

-		assertTrue("test file not created", file.isAccessible());

-		try {

-			IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(file);

-			assertNull("model returned even though expected to silently get null", model);

-			if (model != null)

-				model.releaseFromRead();

-		}

-		catch (Exception e) {

-			StringWriter out = new StringWriter();

-			e.printStackTrace(new PrintWriter(out));

-			fail(out.toString());

-		}

-		project.delete(true, null);

-	}

-}

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestObjects.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestObjects.java
deleted file mode 100644
index b593c6f..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestObjects.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.sse.core.tests.document;

-

-import junit.framework.TestCase;

-

-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;

-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion;

-

-public class TestObjects extends TestCase {

-

-	/**

-	 *  

-	 */

-	public TestObjects() {

-		super();

-

-	}

-

-	/**

-	 * @param name

-	 */

-	public TestObjects(String name) {

-		super(name);

-

-	}

-

-	public void testEndedFlag() {

-		BasicStructuredDocumentRegion region = new BasicStructuredDocumentRegion();

-		region.setParentDocument(new BasicStructuredDocument());

-		boolean deleted = region.isDeleted();

-		boolean ended = region.isEnded();

-		region.setEnded(!ended);

-		assertEquals(!ended, region.isEnded());

-		assertEquals(deleted, region.isDeleted());

-	}

-

-	public void testDeletedFlag() {

-		BasicStructuredDocumentRegion region = new BasicStructuredDocumentRegion();

-		region.setParentDocument(new BasicStructuredDocument());

-		boolean deleted = region.isDeleted();

-		boolean ended = region.isEnded();

-		region.setDeleted(!deleted);

-		assertEquals(!deleted, region.isDeleted());

-		assertEquals(ended, region.isEnded());

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/util/TestJarUtilities.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/util/TestJarUtilities.java
index e42cd83..ae8219e 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/util/TestJarUtilities.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/util/TestJarUtilities.java
@@ -266,5 +266,11 @@
 		assertTrue("not enough contents read", contents.length() > 40);
 		assertTrue("contents not as expected" + contents.substring(0, 40), contents.startsWith("##########################################################"));
 	}
+	
+	public void testSanity() {
+		IFile testJar = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(TEST_JAR_UTILITIES_TESTFILE_JAR));
+		assertTrue("test jar resource is not in workspace", testJar.exists());
+		assertTrue("test jar resource not accessible from workspace", testJar.isAccessible());
+	}
 
 }
diff --git a/tests/org.eclipse.wst.sse.core.tests/test.xml b/tests/org.eclipse.wst.sse.core.tests/test.xml
index 5ba3e50..4344774 100644
--- a/tests/org.eclipse.wst.sse.core.tests/test.xml
+++ b/tests/org.eclipse.wst.sse.core.tests/test.xml
@@ -48,13 +48,13 @@
          There are some properties that must be provided by caller. 
     -->
     <fail
-        message="Error: missing property. eclipse-home must be provided"
+        message="Error: missing property. eclipse-home must be proved"
         unless="eclipse-home" />
     <fail
-        message="Error: missing property. buildDirectory must be provided"
+        message="Error: missing property. buildDirectory must be proved"
         unless="buildDirectory" />
     <fail
-        message="Error: missing property. buildLabel must be provided"
+        message="Error: missing property. buildLabel must be proved"
         unless="buildLabel" />
     <echo
         message="basedir: ${basedir}" />
diff --git a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
index a6ef6a4..d0f755b 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.sse.ui.tests; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: sseeditortests.jar
 Bundle-Activator: org.eclipse.wst.sse.ui.tests.SSETestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.sse.ui.tests/build.properties b/tests/org.eclipse.wst.sse.ui.tests/build.properties
index 0136caa..37d41d0 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/build.properties
+++ b/tests/org.eclipse.wst.sse.ui.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
+# Copyright (c) 2004, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
 ###############################################################################
 source.sseeditortests.jar = src/,\
                             jface.text.tests/,\
-                            text.tests
+                            text.tests/
 output.sseeditortests.jar = bin/
 bin.includes = plugin.xml,\
                sseeditortests.jar,\
@@ -19,4 +19,5 @@
                about.html,\
                plugin.properties
 src.includes = src/,\
-               jface.text.tests/
+               jface.text.tests/,\
+               text.tests/
diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
index f09657c..1d63ebd 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
@@ -9,7 +9,6 @@
 			icon="$nl$/icons/sourceEditor.gif"
 			class="org.eclipse.wst.sse.ui.StructuredTextEditor"
 			contributorClass="org.eclipse.wst.sse.ui.internal.actions.ActionContributor"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
 			id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
 		</editor>
 	</extension>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
index 57695c9..af41539 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
@@ -15,9 +15,11 @@
 import junit.framework.TestSuite;
 
 import org.eclipse.jface.text.tests.JFaceTextTestSuite;
-import org.eclipse.text.tests.EclipseTextTestSuite;
 import org.eclipse.wst.sse.ui.tests.viewer.TestViewerConfiguration;
 
+/**
+ * @author pavery
+ */
 public class SSEUITestSuite extends TestSuite {
 	public static Test suite() {
 		return new SSEUITestSuite();
@@ -30,6 +32,5 @@
 		addTest(new TestSuite(TestViewerConfiguration.class));
 		addTest(new TestSuite(TestStructuredTextEditor.class));
 		addTest(JFaceTextTestSuite.suite());
-		addTest(EclipseTextTestSuite.suite());
 	}
 }
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
index 23def5f..e46cdb8 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
@@ -15,37 +15,25 @@
 
 import junit.framework.TestCase;
 
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.IShowInTargetList;
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 
 public class TestStructuredTextEditor extends TestCase {
@@ -57,7 +45,7 @@
 	private static boolean fIsSetup = false;
 
 	public TestStructuredTextEditor() {
-		super("TestStructuredTextEditor");
+		super("TestStructredTextEditor");
 	}
 
 	protected void setUp() throws Exception {
@@ -189,119 +177,4 @@
 		fEditor.update();
 		assertTrue("Unable to update editor", true);
 	}
-	
-	public void testSingleNonUIThreadUpdatesToEditorDocument() throws Exception {
-		IFile file = getOrCreateFile(PROJECT_NAME + "/" + "testBackgroundChanges.xml");
-		ITextFileBufferManager textFileBufferManager = FileBuffers.getTextFileBufferManager();
-		textFileBufferManager.connect(file.getFullPath(), LocationKind.IFILE, new NullProgressMonitor());
-
-		ITextFileBuffer textFileBuffer = textFileBufferManager.getTextFileBuffer(file.getFullPath(), LocationKind.IFILE);
-		final IDocument document = textFileBuffer.getDocument();
-		document.replace(0, 0, "<?xml encoding=\"UTF-8\" version=\"1.0\"?>\n");
-		textFileBuffer.commit(new NullProgressMonitor(), true);
-
-		String testText = document.get() + "<c/><b/><a/>";
-		final int end = document.getLength();
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorPart openedEditor = IDE.openEditor(activePage, file);
-
-		final boolean state[] = new boolean[]{false};
-		Job changer = new Job("text changer") {
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					document.replace(end, 0, "<a/>");
-					document.replace(end, 0, "<b/>");
-					document.replace(end, 0, "<c/>");
-				}
-				catch (Exception e) {
-					return new Status(IStatus.ERROR, SSEUIPlugin.ID, e.getMessage());
-				}
-				finally {
-					state[0] = true;
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		changer.setUser(true);
-		changer.setSystem(false);
-		changer.schedule();
-
-		while (!state[0]) {
-			openedEditor.getSite().getShell().getDisplay().readAndDispatch();
-		}
-
-		String finalText = document.get();
-		textFileBuffer.commit(new NullProgressMonitor(), true);
-		textFileBufferManager.disconnect(file.getFullPath(), LocationKind.IFILE, new NullProgressMonitor());
-		activePage.closeEditor(openedEditor, false);
-		assertEquals("Non-UI changes did not apply", testText, finalText);
-	}
-
-	
-	/**
-	 * Note: This test takes a while to run, but it's testing scalability after all.
-	 * @throws Exception
-	 */
-	public void testManyNonUIThreadsUpdatingEditorDocument() throws Exception {
-		final int numberOfJobs = 30;
-		/**
-		 * 16 minute timeout before we stop waiting for the change jobs to
-		 * complete
-		 */
-		long timeout = 960000;
-
-		long startTime = System.currentTimeMillis();
-		IFile file = getOrCreateFile(PROJECT_NAME + "/" + "testManyBackgroundChanges.xml");
-		ITextFileBufferManager textFileBufferManager = FileBuffers.getTextFileBufferManager();
-		textFileBufferManager.connect(file.getFullPath(), LocationKind.IFILE, new NullProgressMonitor());
-
-		ITextFileBuffer textFileBuffer = textFileBufferManager.getTextFileBuffer(file.getFullPath(), LocationKind.IFILE);
-		final IDocument document = textFileBuffer.getDocument();
-		document.replace(0, 0, "<?xml encoding=\"UTF-8\" version=\"1.0\"?>\n");
-		textFileBuffer.commit(new NullProgressMonitor(), true);
-
-		final int insertionPoint = document.getLength();
-		// numberOfJobs Jobs, inserting 26 tags, each 4 characters long
-		int testLength = insertionPoint + numberOfJobs * 4 * 26;
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		activePage.showView(IPageLayout.ID_PROGRESS_VIEW);
-		IEditorPart openedEditor = IDE.openEditor(activePage, file);
-
-		final int finished[] = new int[]{numberOfJobs};
-		Job changers[] = new Job[numberOfJobs];
-		for (int i = 0; i < changers.length; i++) {
-			changers[i] = new Job("Text Changer " + Integer.toString(i)) {
-				protected IStatus run(IProgressMonitor monitor) {
-					try {
-						char names[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
-						for (int j = 0; j < names.length; j++) {
-							document.replace(insertionPoint + 4 * j, 0, "<" + names[j] + "/>");
-						}
-					}
-					catch (Exception e) {
-						return new Status(IStatus.ERROR, SSEUIPlugin.ID, e.getMessage());
-					}
-					finally {
-						finished[0]--;
-					}
-					return Status.OK_STATUS;
-				}
-			};
-			changers[i].setUser(true);
-			changers[i].setSystem(false);
-			changers[i].schedule();
-		}
-
-		long runtime = 0;
-		while (finished[0] > 0 && (runtime = System.currentTimeMillis()) - startTime < timeout) {
-			openedEditor.getSite().getShell().getDisplay().readAndDispatch();
-		}
-		assertTrue("Test timed out", runtime - startTime < timeout);
-
-		int finalLength = document.getLength();
-		textFileBuffer.commit(new NullProgressMonitor(), true);
-		textFileBufferManager.disconnect(file.getFullPath(), LocationKind.IFILE, new NullProgressMonitor());
-		activePage.closeEditor(openedEditor, false);
-		assertEquals("Some non-UI changes did not apply", testLength, finalLength);
-	}
 }
diff --git a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java
deleted file mode 100644
index 03b4828..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test Suite for org.eclipse.text.
- *
- * @since 3.0
- */
-public class EclipseTextTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("org.eclipse.text Test Suite using BasicStructuredDocument"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-//		suite.addTest(LineTrackerTest4.suite());
-//		suite.addTest(DocumentExtensionTest.suite());
-//		suite.addTest(LineTrackerTest3.suite());
-//		suite.addTest(DocumentTest.suite());
-//		suite.addTest(FindReplaceDocumentAdapterTest.suite());
-		suite.addTest(PositionUpdatingCornerCasesTest.suite());
-		suite.addTest(ExclusivePositionUpdaterTest.suite());
-//		suite.addTest(TextEditTests.suite());
-//		suite.addTest(GapTextTest.suite());
-//		suite.addTest(AdaptiveGapTextTest.suite());
-//		suite.addTest(GapTextStoreTest.suite());
-//		suite.addTest(ChildDocumentTest.suite());
-//		suite.addTest(ProjectionTestSuite.suite());
-//		suite.addTest(LinkTestSuite.suite());
-//		suite.addTest(CopyOnWriteTextStoreTest.suite());
-//		suite.addTest(TextUtilitiesTest.suite());
-//		suite.addTest(AnnotationModelStressTest.suite());
-//		suite.addTest(AnnotationModelExtension2Test.suite());
-//		suite.addTest(TemplatesTestSuite.suite());
-		//$JUnit-END$
-
-		return suite;
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java b/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
deleted file mode 100644
index 740cc0c..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-/**
- * @since 3.3
- */
-public class ExclusivePositionUpdaterTest extends TestCase {
-	public static Test suite() {
-		return new TestSuite(ExclusivePositionUpdaterTest.class);
-	}
-
-	private IPositionUpdater fUpdater;
-	private static final String CATEGORY= "testcategory";
-	private Position fPos;
-	private IDocument fDoc;
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		fUpdater= new DefaultPositionUpdater(CATEGORY);
-//		fDoc = new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
-		fDoc= createDocument("ccccccccccccccccccccccccccccccccccccccccccccc");
-		fPos= new Position(5, 5);
-		fDoc.addPositionUpdater(fUpdater);
-		fDoc.addPositionCategory(CATEGORY);
-		fDoc.addPosition(CATEGORY, fPos);
-	}
-
-	private IDocument createDocument(String contents) {
-		IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.core.runtime.xml");
-		BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
-		document.set(contents);
-		return document;
-	}
-
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fDoc.removePositionUpdater(fUpdater);
-		fDoc.removePositionCategory(CATEGORY);
-	}
-
-	public void testDeleteAfter() throws BadLocationException {
-		fDoc.replace(20, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddAfter() throws BadLocationException {
-		fDoc.replace(20, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteBefore() throws BadLocationException {
-		fDoc.replace(2, 2, "");
-		Assert.assertEquals(3, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddBefore() throws BadLocationException {
-		fDoc.replace(2, 0, "yy");
-		Assert.assertEquals(7, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddRightBefore() throws BadLocationException {
-		fDoc.replace(5, 0, "yy");
-		Assert.assertEquals(7, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteAtOffset() throws BadLocationException {
-		fDoc.replace(5, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(3, fPos.length);
-	}
-
-	public void testDeleteRightBefore() throws BadLocationException {
-		fDoc.replace(3, 2, "");
-		Assert.assertEquals(3, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddRightAfter() throws BadLocationException {
-		fDoc.replace(10, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testDeleteRightAfter() throws BadLocationException {
-		fDoc.replace(10, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(5, fPos.length);
-	}
-
-	public void testAddWithin() throws BadLocationException {
-		fDoc.replace(6, 0, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(7, fPos.length);
-	}
-
-	public void testDeleteWithin() throws BadLocationException {
-		fDoc.replace(6, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(3, fPos.length);
-	}
-
-	public void testReplaceLeftBorder() throws BadLocationException {
-		fDoc.replace(4, 2, "yy");
-		Assert.assertEquals(6, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testReplaceRightBorder() throws BadLocationException {
-		fDoc.replace(9, 2, "yy");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testDeleteOverRightBorder() throws BadLocationException {
-		fDoc.replace(9, 2, "");
-		Assert.assertEquals(5, fPos.offset);
-		Assert.assertEquals(4, fPos.length);
-	}
-
-	public void testDeleted() throws BadLocationException {
-		fDoc.replace(4, 7, "");
-		Assert.assertTrue(fPos.isDeleted);
-	}
-
-	public void testReplaced() throws BadLocationException {
-		fDoc.replace(4, 7, "yyyyyyy");
-		Assert.assertTrue(fPos.isDeleted);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java b/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
deleted file mode 100644
index 189db11..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-
-public class PositionUpdatingCornerCasesTest extends TestCase {
-	private IDocument fDocument;
-
-	public PositionUpdatingCornerCasesTest(String name) {
-		super(name);
-	}
-
-	protected void checkPositions(Position[] expected) throws BadPositionCategoryException {
-		Position[] actual= fDocument.getPositions(IDocument.DEFAULT_CATEGORY);
-		assertTrue("invalid number of positions", actual.length == expected.length);
-
-		for (int i= 0; i < expected.length; i++) {
-			assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
-		}
-	}
-
-	protected String print(Position p) {
-		return "[" + p.getOffset() + "," + p.getLength() + "]";
-	}
-
-	protected void setUp() throws Exception {
-//		fDocument= new Document("x-x-x-x-x-x-x-x-x-x-x");
-		fDocument= createDocument("x-x-x-x-x-x-x-x-x-x-x");
-		fDocument.addPosition(new Position(0, 0));
-		fDocument.addPosition(new Position(0, 1));
-		fDocument.addPosition(new Position(5, 0));
-		fDocument.addPosition(new Position(5, 3));
-	}
-
-	private IDocument createDocument(String contents) {
-		IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.core.runtime.xml");
-		BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
-		document.set(contents);
-		return document;
-	}
-
-	public static Test suite() {
-		return new TestSuite(PositionUpdatingCornerCasesTest.class);
-	}
-
-	protected void tearDown() {
-		fDocument= null;
-	}
-
-	public void testInsert() throws Exception {
-		fDocument.replace(0, 0, "yy");
-
-		Position[] positions= new Position[] {
-				new Position( 2, 1),
-				new Position( 2, 0),
-				new Position( 7, 3),
-				new Position( 7, 0)
-		};
-
-		checkPositions(positions);
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.classpath b/tests/org.eclipse.wst.xml.catalog.tests/.classpath
index 751c8f2..64c5e31 100644
--- a/tests/org.eclipse.wst.xml.catalog.tests/.classpath
+++ b/tests/org.eclipse.wst.xml.catalog.tests/.classpath
@@ -1,7 +1,7 @@
 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
index 0fe6428..7a3abf7 100644
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.204.qualifier
 Bundle-ClassPath: ssemodelxmltests.jar
 Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.xml b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
index 48bf2cc..03f1a8c 100644
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-	<extension point="org.eclipse.core.contenttype.contentTypes">
+	<extension point="org.eclipse.core.runtime.contentTypes">
 		<!-- associate .fragx files with the XML content type -->
 		<file-association
 			content-type="org.eclipse.core.runtime.xml"
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
index daa8ef4..2f030b0 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,10 +20,7 @@
 import org.eclipse.wst.xml.core.tests.document.TestStructuredDocument;
 import org.eclipse.wst.xml.core.tests.document.TestXMLDocumentLoader;
 import org.eclipse.wst.xml.core.tests.document.TransitionTests;
-import org.eclipse.wst.xml.core.tests.dom.AttrImplTests;
-import org.eclipse.wst.xml.core.tests.dom.ElementImplTests;
 import org.eclipse.wst.xml.core.tests.dom.NameValidatorTests;
-import org.eclipse.wst.xml.core.tests.dom.NodeListImplTests;
 import org.eclipse.wst.xml.core.tests.format.TestPartitionFormatterXML;
 import org.eclipse.wst.xml.core.tests.model.TestModelManager;
 import org.eclipse.wst.xml.core.tests.model.TestModelsFromFiles;
@@ -49,9 +46,6 @@
 		addTest(new TestSuite(TestStructuredModel.class));
 		addTest(new TestSuite(TestStructuredPartitionerXML.class));
 		addTest(new TestSuite(NameValidatorTests.class));
-		addTest(new TestSuite(ElementImplTests.class));
-		addTest(new TestSuite(AttrImplTests.class));
-		addTest(new TestSuite(NodeListImplTests.class));
 		addTest(new TestSuite(TransitionTests.class));
 		addTest(new TestSuite(XMLCorePreferencesTest.class));
 		addTest(new TestSuite(TestCatalogRetrivalAndModelCreation.class));
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
index 332d49b..8099d71 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,14 +7,11 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Jesper Steen Moeller - Added XML Catalogs 1.1 support
  *     
  *******************************************************************************/
 
 package org.eclipse.wst.xml.core.tests.contentmodel;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.net.MalformedURLException;
 
@@ -22,13 +19,9 @@
 
 import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.IDelegateCatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.IRewriteEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ISuffixEntry;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
 import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
 
 public class TestCatalogRetrivalAndModelCreation extends TestCase {
 
@@ -115,14 +108,14 @@
 	public void testExternalDTD() throws MalformedURLException, IOException {
 		doCM_directURITest("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd");
 	}
-
-	public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
-		doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
-	}
-	
-	public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
-		doURI_CMTest("http://www.w3.org/2001/XMLSchema");
-	}
+// Bug 123547 - temporarily comment these tests out.
+//	public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
+//		doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
+//	}
+//	
+//	public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
+//		doURI_CMTest("http://www.w3.org/2001/XMLSchema");
+//	}
 	
 	public void testInvoiceRemote() throws MalformedURLException, IOException {
 		doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd", 18);
@@ -131,143 +124,7 @@
 	public void testInvoiceRemoteIndirect() throws MalformedURLException, IOException {
 		doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd", 18);
 	}
-	public final static String LOCAL_SCHEMA_FILE = "file:///usr/tmp/mySchemaSchema.xsd";
-	public final static String LOCAL_SCHEMA_DIR = "file:///usr/tmp/schemas/";
-	public final static String LOCAL_SCHEMA_DIR_REWRITTEN = "file:///usr/tmp/schemas/example.dtd";
 	
-	public void testCatalog11SystemSuffix() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		ISuffixEntry systemSuffix = (ISuffixEntry)xmlCatalog.createCatalogElement(ISuffixEntry.SUFFIX_TYPE_SYSTEM);
-		systemSuffix.setSuffix("XMLSchema.xsd");
-		systemSuffix.setURI(LOCAL_SCHEMA_FILE);
-		xmlCatalog.addCatalogElement(systemSuffix);
-		try {
-			String resolved = xmlCatalog.resolveSystem("http://www.w3.org/2001/XMLSchema.xsd");
-			assertEquals(LOCAL_SCHEMA_FILE, resolved);
-		} finally {
-			xmlCatalog.removeCatalogElement(systemSuffix);
-		}
-	}
-
-	public void testCatalog11UriSuffix() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		ISuffixEntry uriSuffix = (ISuffixEntry)xmlCatalog.createCatalogElement(ISuffixEntry.SUFFIX_TYPE_URI);
-		uriSuffix.setSuffix("XMLSchema.xsd");
-		uriSuffix.setURI(LOCAL_SCHEMA_FILE);
-		xmlCatalog.addCatalogElement(uriSuffix);
-		try {
-			String resolved = xmlCatalog.resolveURI("http://www.w3.org/2001/XMLSchema.xsd");
-			assertEquals(LOCAL_SCHEMA_FILE, resolved);
-		} finally {
-			xmlCatalog.removeCatalogElement(uriSuffix);
-		}
-	}
-
-	public void testCatalog11RewriteSystem() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		IRewriteEntry systemSuffix = (IRewriteEntry)xmlCatalog.createCatalogElement(IRewriteEntry.REWRITE_TYPE_SYSTEM);
-		systemSuffix.setStartString("http://www.example.org/dtds/");
-		systemSuffix.setRewritePrefix(LOCAL_SCHEMA_DIR);
-		xmlCatalog.addCatalogElement(systemSuffix);
-		try {
-			String resolved = xmlCatalog.resolveSystem("http://www.example.org/dtds/example.dtd");
-			assertEquals(LOCAL_SCHEMA_DIR_REWRITTEN, resolved);
-		} finally {
-			xmlCatalog.removeCatalogElement(systemSuffix);
-		}
-	}
-
-	public void testCatalog11RewriteUri() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		IRewriteEntry uriSuffix = (IRewriteEntry)xmlCatalog.createCatalogElement(IRewriteEntry.REWRITE_TYPE_URI);
-		uriSuffix.setStartString("urn:fisk:");
-		uriSuffix.setRewritePrefix(LOCAL_SCHEMA_DIR);
-		xmlCatalog.addCatalogElement(uriSuffix);
-		try {
-			String resolved = xmlCatalog.resolveURI("urn:fisk:example.dtd");
-			assertEquals(LOCAL_SCHEMA_DIR_REWRITTEN, resolved);
-		} finally {
-			xmlCatalog.removeCatalogElement(uriSuffix);
-		}
-	}
-
-	public void testCatalog11DelegatePublic() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		IDelegateCatalog publicDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_PUBLIC);
-
-		// Ironically, we don't use WTP's Resolver when loading the catalog XML.
-		// Adding <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.1//EN" "http://www.example.org/dtd/catalog.dtd">
-		// to the catalog below will make the loading fail... 
-
-		File delegateCat = makeTempFile("delegatePublic", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\"\r\n" +
-			"       prefer=\"public\">\r\n" + 
-			"    <public publicId=\"-//Example//an example V1.0.0//EN\"\r\n" + 
-			"            uri=\"file:///example.dtd\"/>\r\n" + 
-			"</catalog>");
-
-		publicDelegate.setStartString("-//Example//");
-		publicDelegate.setCatalogLocation(delegateCat.toURI().toString());
-		xmlCatalog.addCatalogElement(publicDelegate);
-		try {
-			String resolved = xmlCatalog.resolvePublic("-//Example//an example V1.0.0//EN", "example.dtd");
-			assertEquals("file:///example.dtd", resolved);
-		} finally {
-			xmlCatalog.removeCatalogElement(publicDelegate);
-		}
-	}
-
-	public void testCatalog11DelegateSystem() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		IDelegateCatalog systemDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_SYSTEM);
-
-		File delegateCat = makeTempFile("delegateSystem", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">\r\n" + 
-			"    <system systemId=\"http://funky.org/dog\" uri=\"file:///funky-dog.dtd\"/>\r\n" + 
-			"    <systemSuffix systemIdSuffix=\"/cat.dtd\" uri=\"file:///smellycat.xsd\"/>\r\n" + 
-			"    <rewriteSystem systemIdStartString=\"http://funky.org/parrots/\" rewritePrefix=\"file:///dtds/parrots/\"/>\r\n" + 
-			"</catalog>");
-
-		systemDelegate.setStartString("http://funky.org/");
-		systemDelegate.setCatalogLocation(delegateCat.toURI().toString());
-		xmlCatalog.addCatalogElement(systemDelegate);
-		try {			
-			assertEquals("try systemId entry", "file:///funky-dog.dtd", xmlCatalog.resolveSystem("http://funky.org/dog"));
-			assertEquals("try systemSuffix entry", "file:///smellycat.xsd", xmlCatalog.resolveSystem("http://funky.org/some/cat.dtd"));
-			assertEquals("try rewriteSystem entry", "file:///dtds/parrots/macaw.xsd", xmlCatalog.resolveSystem("http://funky.org/parrots/macaw.xsd"));
-		} finally {
-			xmlCatalog.removeCatalogElement(systemDelegate);
-		}
-	}
-
-	public void testCatalog11DelegateUri() throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		IDelegateCatalog uriDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_URI);
-
-		File delegateCat = makeTempFile("delegateUri", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">\r\n" + 
-			"    <uri name=\"urn:funky:dog\" uri=\"file:///funky-dog.dtd\"/>\r\n" + 
-			"    <uriSuffix uriSuffix=\":cat\" uri=\"file:///smellycat.dtd\"/>\r\n" + 
-			"    <rewriteURI uriStartString=\"urn:funky:fish:\" rewritePrefix=\"file:///dtds/\"/>\r\n" + 
-			"</catalog>");
-
-		uriDelegate.setStartString("urn:funky:");
-		uriDelegate.setCatalogLocation(delegateCat.toURI().toString());
-		xmlCatalog.addCatalogElement(uriDelegate);
-		try {			
-			assertEquals("uri entry", "file:///funky-dog.dtd", xmlCatalog.resolveURI("urn:funky:dog"));
-			assertEquals("uriSuffix entry", "file:///smellycat.dtd", xmlCatalog.resolveURI("urn:funky:where-is-my:cat"));
-			assertEquals("rewriteUri entry", "file:///dtds/parrot.dtd", xmlCatalog.resolveURI("urn:funky:fish:parrot.dtd"));
-		} finally {
-			xmlCatalog.removeCatalogElement(uriDelegate);
-		}
-	}
-
-	private File makeTempFile(String name, String contents) throws IOException {
-		File delegateCat = FileUtil.makeFileFor("catalogs", name, "cat");
-		FileWriter fw = new FileWriter(delegateCat);
-		fw.write(contents);
-		fw.close();
-		return delegateCat;
-	}
-
 	private void doTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
 		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
 		String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java
deleted file mode 100644
index 1694e26..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class AttrImplTests extends TestCase {
-
-	private static final String contents = "<elementName attrPrefix:local='lorem' />"; //$NON-NLS-1$
-
-	public AttrImplTests() {
-	}
-
-	public AttrImplTests(String name) {
-		super(name);
-	}
-
-	public void testAttrImplPrefix() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-		
-		Element documentElement = model.getDocument().getDocumentElement();
-		assertNotNull("no document element found", documentElement);
-		NamedNodeMap attributes = documentElement.getAttributes();
-		assertTrue("no attributes found", attributes.getLength() > 0);
-		Attr attribute = (Attr) attributes.item(0);
-		assertEquals("attribute prefix was not as expected", "attrPrefix", attribute.getPrefix());
-	}
-
-	public void testAttrImplLocalName() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Element documentElement = model.getDocument().getDocumentElement();
-		assertNotNull("no document element found", documentElement);
-		NamedNodeMap attributes = documentElement.getAttributes();
-		assertTrue("no attributes found", attributes.getLength() > 0);
-		Attr attribute = (Attr) attributes.item(0);
-		assertEquals("attribute local name was not as expected", "local", attribute.getLocalName());
-	}
-
-	public void testNamespaceURIOnCreation() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Attr attr = model.getDocument().createAttribute("simple");
-		assertNull("namespace was found", attr.getNamespaceURI());
-		
-		Attr attr2 = model.getDocument().createAttributeNS("http://lorem.ipsum", "complex");
-		assertEquals("attribute namespace URI was not as expected", "http://lorem.ipsum", attr2.getNamespaceURI());
-		Attr attr3 = model.getDocument().createAttributeNS(null, "complex");
-		assertEquals("attribute namespace URI was not as expected", null, attr3.getNamespaceURI());
-	}
-
-	public void testNullAttributeValue() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Attr attribute = model.getDocument().createAttribute("attr");
-		try {
-			attribute.setNodeValue(null);
-		} catch (NullPointerException npe) {
-			fail("Setting a null node value caused a NullPointerException.");
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java
deleted file mode 100644
index a36fccb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class ElementImplTests extends TestCase {
-
-	private static final String contents = "<elementPrefix:localName attrPrefix:local='lorem' xmlns:elementPrefix='urn:prefix' xmlns:attributePrefix='urn:attribute:prefix' />"; //$NON-NLS-1$
-
-	public ElementImplTests() {
-	}
-
-	public ElementImplTests(String name) {
-		super(name);
-	}
-
-	public void testElementImplPrefix() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Element documentElement = model.getDocument().getDocumentElement();
-		assertNotNull("no document element found", documentElement);
-		assertEquals("attribute prefix was not as expected", "elementPrefix", documentElement.getPrefix());
-	}
-
-	public void testElementImplLocalName() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Element documentElement = model.getDocument().getDocumentElement();
-		assertNotNull("no document element found", documentElement);
-		assertEquals("attribute local name was not as expected", "localName", documentElement.getLocalName());
-	}
-
-	public void testAttrBasedElementNamespace() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Element documentElement = model.getDocument().getDocumentElement();
-		assertNotNull("no document element found", documentElement);
-		assertNotNull("Namespace was not found.", documentElement.getNamespaceURI());
-		String namespace = documentElement.getNamespaceURI();
-		assertEquals("attribute local name was not as expected", "urn:prefix", namespace);
-	}
-
-	public void testNamespaceURIOnCreation() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		model.getStructuredDocument().set(contents);
-
-		Element element = model.getDocument().createElement("simple");
-		assertNull("namespace was found", element.getNamespaceURI());
-
-		Element element2 = model.getDocument().createElementNS("http://lorem.ipsum", "complex");
-		assertEquals("attribute namespace URI was not as expected", "http://lorem.ipsum", element2.getNamespaceURI());
-		Element element3 = model.getDocument().createElementNS(null, "complex");
-		assertEquals("attribute namespace URI was not as expected", null, element3.getNamespaceURI());
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java
deleted file mode 100644
index 9fec6ca..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.NodeListImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class NodeListImplTests extends TestCase {
-
-	private static class AccessorNodeList extends NodeListImpl {
-		public Node appendNode(Node node) {
-			return super.appendNode(node);
-		}
-
-		public Node insertNode(Node node, int index) {
-			return super.insertNode(node, index);
-		}
-
-		public Node removeNode(int index) {
-			return super.removeNode(index);
-		}
-
-	}
-
-	public NodeListImplTests() {
-	}
-
-	public NodeListImplTests(String name) {
-		super(name);
-	}
-
-	public void testInsertAtIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		assertEquals("non-zero length at start", 0, list.getLength());
-
-		list.appendNode(document.createElement("test0"));
-		list.appendNode(document.createElement("test1"));
-		list.appendNode(document.createElement("test2"));
-		list.appendNode(document.createElement("test3"));
-		list.appendNode(document.createElement("test4"));
-		list.appendNode(document.createElement("test5"));
-		list.appendNode(document.createElement("test6"));
-
-		list.insertNode(document.createElement("test"), 3);
-		
-		assertEquals("list size did not increment", 8, list.getLength());
-		
-		assertEquals("test0 was not at expected index", "test0", list.item(0).getLocalName());
-		assertEquals("test1 was not at expected index", "test1", list.item(1).getLocalName());
-		assertEquals("test2 was not at expected index", "test2", list.item(2).getLocalName());
-		assertEquals("test was not at expected index",  "test",  list.item(3).getLocalName());
-		assertEquals("test3 was not at expected index", "test3", list.item(4).getLocalName());
-		assertEquals("test4 was not at expected index", "test4", list.item(5).getLocalName());
-		assertEquals("test5 was not at expected index", "test5", list.item(6).getLocalName());
-		assertEquals("test6 was not at expected index", "test6", list.item(7).getLocalName());
-	}
-
-	public void testRemoveFromIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		list.appendNode(document.createElement("test0"));
-		list.appendNode(document.createElement("test1"));
-		list.appendNode(document.createElement("test2"));
-		list.appendNode(document.createElement("test3"));
-		list.appendNode(document.createElement("test4"));
-		list.appendNode(document.createElement("test5"));
-		list.appendNode(document.createElement("test6"));
-		assertEquals("wrong length after setup", 7, list.getLength());
-
-		Node excised = list.removeNode(3);
-		assertEquals("test3 was not the one removed", "test3", excised.getLocalName());
-
-		assertEquals("wrong length after removal", 6, list.getLength());		
-		assertEquals("test0 was not at expected index", "test0", list.item(0).getLocalName());
-		assertEquals("test1 was not at expected index", "test1", list.item(1).getLocalName());
-		assertEquals("test2 was not at expected index", "test2", list.item(2).getLocalName());
-		assertEquals("test4 was not at expected index", "test4", list.item(3).getLocalName());
-		assertEquals("test5 was not at expected index", "test5", list.item(4).getLocalName());
-		assertEquals("test6 was not at expected index", "test6", list.item(5).getLocalName());
-	}
-
-	public void testInsertAtNegativeIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		// appends on bad value
-		list.insertNode(document.createElement("test-1"),-1);
-		assertEquals("wrong length after insert at negative index", 1, list.getLength());
-	}
-
-	public void testRemoveFromNegativeIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		list.appendNode(document.createElement("test-1"));
-		// ignores bad index
-		list.removeNode(-1);
-		assertEquals("wrong length after removal at negative index", 1, list.getLength());
-	}
-
-	public void testInsertAtExcessiveIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		// appends on bad value
-		list.insertNode(document.createElement("test3"), 3);
-		assertEquals("wrong length after insert at out of bounds index", 1, list.getLength());
-	}
-
-	public void testRemoveFromExcessiveIndex() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		list.appendNode(document.createElement("test0"));
-		// ignores bad index
-		list.removeNode(3);
-		assertEquals("wrong length after removal at nonexistent index", 1, list.getLength());
-	}
-
-	public void testAppend() {
-		IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		Document document = model.getDocument();
-
-		AccessorNodeList list = new AccessorNodeList();
-
-		assertEquals("non-zero length at start", 0, list.getLength());
-
-		list.appendNode(document.createElement("test1"));
-		assertEquals("list size did not increment", 1, list.getLength());
-
-		list.appendNode(document.createElement("test2"));
-		assertEquals("list size did not increment", 2, list.getLength());
-
-		list.appendNode(document.createElement("test3"));
-		assertEquals("list size did not increment", 3, list.getLength());
-
-		Node element4 = list.appendNode(document.createElement("test4"));
-		assertEquals("list size did not increment", 4, list.getLength());
-		assertEquals("test4 not returned from append", "test4", element4.getLocalName());
-		
-		Node element5 = list.appendNode(document.createElement("test5"));
-		assertEquals("list size did not increment", 5, list.getLength());
-		assertEquals("test5 not returned from append", "test5", element5.getLocalName());
-		
-		Node element6 = list.appendNode(document.createElement("test6"));
-		assertEquals("list size did not increment", 6, list.getLength());
-		assertEquals("test6 not returned from append", "test6", element6.getLocalName());
-		
-		Node element7 = list.appendNode(document.createElement("test7"));
-		assertEquals("list size did not increment", 7, list.getLength());
-		assertEquals("test7 not returned from append", "test7", element7.getLocalName());
-
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
index b382943..2dd5b26 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -318,16 +318,11 @@
 		prefs.setClearAllBlankLines(true);
 		formatAndAssertEquals("testfiles/xml/xml-keep-blank-lines.xml", "testfiles/xml/xml-clear-blank-lines-fmt.xml", prefs);
 	}
-	
-	public void testFormatMalformedEndTag() throws UnsupportedEncodingException, IOException, CoreException {
-		// Bug 221279
-		// Test that malformed end tags do not cause a NPE and format the document
-		formatAndAssertEquals("testfiles/xml/xml-221279.xml", "testfiles/xml/xml-221279-fmt.xml");
-	}
 
 	public void testFormatWithFracturedXMLContent() throws UnsupportedEncodingException, IOException, CoreException {
 		// Bug 229135
 		// Test that text content that is split into multiple document regions does not stop the formatter
 		formatAndAssertEquals("testfiles/xml/xml-229135.xml", "testfiles/xml/xml-229135-fmt.xml");
 	}
+
 }
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml
deleted file mode 100644
index a02fc0e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<library>
-	<books>
-		<book>
-			<title>Title</title>
-			<author>Author</author>
-		</book 
-	</books>
-</library>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml
deleted file mode 100644
index 2930b22..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<library>
-<books>
-<book>
-<title>Title</title>
-<author>Author</author>
-	</book </books>
-</library>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
index 95a571c..df5e029 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
@@ -11,4 +11,4 @@
 		<pattern>%yyyy-%mm-%dd</pattern>
 		<date>2009-04-13</date>
 	</releaseDate>
-</book>
+</book>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
index 67efa2d..9026b07 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
@@ -11,4 +11,4 @@
 <pattern>%yyyy-%mm-%dd</pattern>
 <date>2009-04-13</date>
 			</releaseDate>
-</book>
+</book>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
index 0e3d579..77fff23 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.tests.encoding
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-ClassPath: tests.jar
 Bundle-Activator: org.eclipse.wst.xml.tests.encoding.TestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -15,12 +15,12 @@
  org.eclipse.wst.xml.tests.encoding.write,
  org.eclipse.wst.xml.tests.encoding.xml
 Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version="[3.8.1,4.0.0)",
+ org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.workbench,
  org.eclipse.ui.ide,
  org.eclipse.wst.xml.core,
  org.eclipse.core.runtime,
  org.eclipse.wst.sse.core
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
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
index a599850..f77bac9 100644
--- 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
@@ -29,12 +29,10 @@
 public class EncodingTestSuite extends TestSuite {
 
 	// FIXME: commented out lang. spec. tests, until all migrated to org.eclipse 
-	// [258343] jUnit failures after org.eclipse.core.runtime.xml content type is disabled
 	private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class, TestContentTypeDetectionForXML.class};
-//	private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
 	//private static Class[] classes = new Class[]{TestOverrides.class, CSSEncodingTester.class, CSSHeadTokenizerTester.class, HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, XMLMalformedInputTests.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentTypeDetection.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
 	public EncodingTestSuite() {
-		super("XML Encoding Test Suite");
+		super("Encoding Test Suite");
 		for (int i = 0; i < classes.length; i++) {
 			addTest(new TestSuite(classes[i], classes[i].getName()));
 		}
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
index 85e6a6e..76ebccb 100644
--- 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
@@ -460,10 +460,10 @@
 	public void testFile114() throws CoreException, IOException {
 		doTest("UTF-8", "testfiles/xml/testIllFormed2.xml", null);
 	}
-//  [249214] - XMLContentDescriber no longer returns content types for invalid encodings
-//	public void testFile115() throws CoreException, IOException {
-//		doTest("UTF-8 standalone=", "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
-//	}
+
+	public void 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);
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
index a20afa2..8ce009c 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
+++ b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
@@ -19,7 +19,7 @@
 public class TestContentTypeDetectionForXML extends TestContentTypeDetection {
 	private static final String expectedCustomXMLContentType = "org.eclipse.wst.xml.core.xmlsource";
 	
-//	private static final String expectedXSLContentType = "org.eclipse.wst.xml.core.xslsource";
+	private static final String expectedXSLContentType = "org.eclipse.wst.xml.core.xslsource";
 	
 	private static final String expectedXMLContentType = "org.eclipse.core.runtime.xml";
 
@@ -42,10 +42,10 @@
 	public void testFile105() throws CoreException, IOException {
 		doTest(expectedXMLContentType, "testfiles/xml/IllformedNormalNonDefault.xml", null);
 	}
-//  [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-//	public void testFile106() throws CoreException, IOException {
-//		doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
-//	}
+
+	public void testFile106() throws CoreException, IOException {
+		doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
+	}
 
 	/**
 	 * This file is illformed in its specified charset
@@ -53,14 +53,13 @@
 	 * @throws CoreException
 	 * @throws IOException
 	 */
-//  [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-//	public void testFile107() throws CoreException, IOException {
-//		doTest(expectedXSLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
-//	}
-//  [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-//	public void testFile107P() throws CoreException, IOException {
-//		doTestForParent(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
-//	}
+	public void testFile107() throws CoreException, IOException {
+		doTest(expectedXSLContentType, "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);
@@ -82,21 +81,18 @@
 	public void testFile112() throws CoreException, IOException {
 		doTest(expectedXMLContentType, "testfiles/xml/testExtraValidStuff.xml", null);
 	}
-	// [250392] the version number is illformed and should not be parsed correctly by the XMLContentDescriber.
-	// Might be able to fix when [251786] is corrected
-//	public void testFile113() throws CoreException, IOException {
-//		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed.xml", null);
-//	}
+
+	public void testFile113() throws CoreException, IOException {
+		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed.xml", null);
+	}
 
 	public void testFile114() throws CoreException, IOException {
 		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed2.xml", null);
 	}
 
-	// [250392] the version number is illformed and should not be parsed correctly by the XMLContentDescriber.
-	// Might be able to fix when [251786] is corrected
-//	public void testFile115() throws CoreException, IOException {
-//		doTest(expectedXMLContentType, "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
-//	}
+	public void 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);
diff --git a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
index 0982b2e..ac9b8a1 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.ui.tests; singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.202.qualifier
 Bundle-ClassPath: xmluitests.jar
 Bundle-Activator: org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin
 Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
index 79371c6..f0ba56e 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
@@ -55,7 +55,7 @@
 		</editor>
 	</extension>
     <extension
-         point="org.eclipse.core.contenttype.contentTypes">
+         point="org.eclipse.core.runtime.contentTypes">
         <content-type
 			file-extensions="xml99"
 			priority="low"
@@ -64,11 +64,4 @@
 			base-type="org.eclipse.core.runtime.xml">
 		</content-type>
 	</extension>
-	<extension point="org.eclipse.wst.sse.core.commentElementHandler">
-		<handler-custom
-			commenttype="xml"
-			class="org.eclipse.wst.xml.ui.tests.commentelement.CommentElementHandlerForFoo">
-			<startwith prefix="$"></startwith>
-		</handler-custom>
-	</extension>
 </plugin>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
index 4d8408e..f58f9c5 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
@@ -48,17 +48,17 @@
 		String fileName1 = "international-instance.xml";
 		String fileName2 = "international.xsd";
 		
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-		if (!project.isAccessible()) {
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
 
-			try {
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
+		try {
+			if(!project.exists())
 				project.create(description, new NullProgressMonitor());
+			if(!project.isAccessible())
 				project.open(new NullProgressMonitor());
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
+		}
+		catch (CoreException e) {
+			e.printStackTrace();
 		}
 		
 		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(projName + "/" + fileName1));
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java
deleted file mode 100644
index 08ef4a4..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *     David Carver - copied over from XSL UI Tests for XML UI Tests
- *     IBM Corporation - make use of (copy of JSP UI Tests') ProjectUtil to skip
- *         file-system calls
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/* 
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class AbstractXMLUITest extends TestCase
-{
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static final String PROJECT_FILES = "testresources";
-	private static final String TEST_PROJECT_NAME = "AbstractXMLUITest_testresources";
-
-	protected void setUp() throws Exception
-	{
-		super.setUp();
-		if (!fTestProjectInitialized)
-		{
-			ProjectUtil.createProject(TEST_PROJECT_NAME, null, null);
-			ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, TEST_PROJECT_NAME);
-
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace()
-	{
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java
deleted file mode 100644
index 7969c63..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2005, 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.xml.ui.tests;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.Enumeration;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IProjectDescription;

-import org.eclipse.core.resources.IWorkspaceRunnable;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Path;

-

-/**

- * Some utilities for creating projects, and copying files into the workspace.

- * Copied from JSP UI tests.

- */

-public class ProjectUtil {

-

-	static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {

-		Enumeration entries = XMLUITestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);

-		while (entries != null && entries.hasMoreElements()) {

-			String entryPath = entries.nextElement().toString();

-			String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();

-			if (entryPath.endsWith("/")) {

-				IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));

-				if (!folder.exists()) {

-					folder.create(true, true, new NullProgressMonitor());

-				}

-				_copyBundleEntriesIntoWorkspace(entryPath, targetPath);

-			}

-			else {

-				_copyBundleEntryIntoWorkspace(entryPath, targetPath);

-			}

-			// System.out.println(entryPath + " -> " + targetPath);

-		}

-	}

-

-	static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {

-		IFile file = null;

-		URL entry = XMLUITestsPlugin.getDefault().getBundle().getEntry(entryname);

-		if (entry != null) {

-			try {

-				byte[] b = new byte[2048];

-				InputStream input = entry.openStream();

-				ByteArrayOutputStream output = new ByteArrayOutputStream();

-				int i = -1;

-				while ((i = input.read(b)) > -1) {

-					output.write(b, 0, i);

-				}

-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));

-				if (file != null) {

-					if (!file.exists()) {

-						file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());

-					}

-					else {

-						file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());

-					}

-				}

-			}

-			catch (IOException e) {

-				e.printStackTrace();

-			}

-			catch (CoreException e) {

-				e.printStackTrace();

-			}

-		}

-		return file;

-	}

-

-	/**

-	 * @param rootEntry - avoid trailing separators

-	 * @param fullTargetPath

-	 */

-	public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {

-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {

-			public void run(IProgressMonitor monitor) throws CoreException {

-				_copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);

-				ResourcesPlugin.getWorkspace().checkpoint(true);

-			}

-		};

-		try {

-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());

-		}

-		catch (CoreException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * 

-	 * @param entryname

-	 *            path relative to TEST plugin starting w/ a "/" (eg.

-	 *            "/testfiles/bugnumber/struts-logic.tld")

-	 * @param fullPath

-	 *            path relative to junit test workpace (eg.

-	 *            "/myruntimeproj/struts-logic.tld")

-	 * @return

-	 */

-	public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {

-		final IFile file[] = new IFile[1];

-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {

-			public void run(IProgressMonitor monitor) throws CoreException {

-				file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);

-				ResourcesPlugin.getWorkspace().checkpoint(true);

-			}

-		};

-		try {

-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());

-		}

-		catch (CoreException e) {

-			e.printStackTrace();

-		}

-		return file[0];

-	}

-

-	public static IProject createProject(String name, IPath location, String[] natureIds) {

-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);

-		if (location != null) {

-			description.setLocation(location);

-		}

-		if (natureIds != null) {

-			description.setNatureIds(natureIds);

-		}

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);

-		try {

-			project.create(description, new NullProgressMonitor());

-			project.open(new NullProgressMonitor());

-		}

-		catch (CoreException e) {

-			e.printStackTrace();

-		}

-		return project;

-	}

-}

diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
index 8776f72..6bbe2b5 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
@@ -48,17 +48,10 @@
 	}
 	
 	public void testGetDocumentationTextHover() {
-		Object[] hovers = ExtendedConfigurationBuilder.getInstance().getConfigurations(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IXMLPartitions.XML_DEFAULT).toArray();
-		assertTrue("no documentation text hover for " + IXMLPartitions.XML_DEFAULT, hovers.length > 0);
-//		// check for over-qualified subclasses
-//		assertEquals("unexpected documentation text hover for " + IXMLPartitions.XML_DEFAULT, o.getClass(), XMLTagInfoHoverProcessor.class);
-		Class required = XMLTagInfoHoverProcessor.class;
-		boolean requiredFound = false;
-		for (int i = 0; i < hovers.length; i++) {
-			if(required.equals(hovers[i].getClass()))
-				requiredFound = true;
-		}
-		assertTrue(required.getName() + " not loaded", requiredFound);
+		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IXMLPartitions.XML_DEFAULT);
+		assertNotNull("no documentation text hover for " + IXMLPartitions.XML_DEFAULT, o);
+		// check for over-qualified subclasses
+		assertEquals("unexpected documentation text hover for " + IXMLPartitions.XML_DEFAULT, o.getClass(), XMLTagInfoHoverProcessor.class);
 	}
 	
 	public void testGetDoubleClickStrategy() {
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
index 047a896..4175fde 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
@@ -49,7 +49,7 @@
 	private static boolean fIsSetup = false;
 
 	public TestOpenEditorXML() {
-		super("TestStructuredTextEditorXML");
+		super("TestStructredTextEditorXML");
 	}
 
 	protected void setUp() throws Exception {
@@ -61,14 +61,13 @@
 			fIsSetup = true;
 		}
 
-		assertTrue("Input file not accessible: " + fFile.getFullPath(), fFile.isAccessible());
-
 		// editor is opened each time
 		if (fIsSetup && fEditor == null) {
 			IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 			IWorkbenchPage page = workbenchWindow.getActivePage();
 			fEditor = IDE.openEditor(page, fFile, true, true);
-			assertTrue("Unable to open structured text editor " + fEditor, (fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor));
+			if (!((fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor)))
+				assertTrue("Unable to open structured text editor", false);
 		}
 	}
 
@@ -83,13 +82,17 @@
 		}
 	}
 
-	private void createProject(String projName) throws CoreException {
+	private void createProject(String projName) {
 		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
 
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-
-		project.create(description, new NullProgressMonitor());
-		project.open(new NullProgressMonitor());
+		try {
+			project.create(description, new NullProgressMonitor());
+			project.open(new NullProgressMonitor());
+		}
+		catch (CoreException e) {
+			e.printStackTrace();
+		}
 	}
 
 	private IFile getOrCreateFile(String filePath) {
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
index 1371740..e300cc0 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
@@ -74,7 +74,7 @@
 					fEditor = (StructuredTextEditor) adapter;
 			}
 			if (fEditor == null)
-				assertTrue("Unable to open structured text editor " + ((fMainEditor != null) ? fMainEditor.getClass().getName() : ""), false);
+				assertTrue("Unable to open structured text editor", false);
 		}
 	}
 
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java
deleted file mode 100644
index 105c829..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.spelling.ISpellcheckDelegate;
-import org.eclipse.wst.xml.ui.internal.spelling.SpellcheckDelegateAdapterFactory;
-
-/**
- * Tests for the <code>SpellcheckDelegateAdapaterFactory</code>
- */
-public class TestSpellcheckDelegateAdapaterFactory extends TestCase {
-	/**
-	 * Default constructor
-	 */
-	public TestSpellcheckDelegateAdapaterFactory() {
-		super("Test Spellcheck Delegate AdapaterFactory");
-	}
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param name the name to give to this test run
-	 */
-	public TestSpellcheckDelegateAdapaterFactory(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Test the <code>SpellcheckDelegateAdapaterFactory</code>
-	 * @throws CoreException 
-	 * @throws IOException 
-	 */
-	public void testSpellcheckDelegateAdapaterFactory() throws IOException, CoreException  {
-		String projectName = "TestSpellcheckDelegateAdapaterFactory";
-		IProject project = ProjectUtil.createProject(projectName, null, null);
-		
-		IStructuredModel structuredModel = null;
-		
-		try {
-			//get test file
-			ProjectUtil.copyBundleEntriesIntoWorkspace("testresources/spellcheck", projectName);
-			IFile testFile = project.getFile("spellcheck_comment_element.xml");
-			assertTrue("Test file " + testFile + " does not exist", testFile.exists());
-		
-			//get delegate
-			structuredModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(testFile);
-			SpellcheckDelegateAdapterFactory factory = new SpellcheckDelegateAdapterFactory();
-			ISpellcheckDelegate delegate = (ISpellcheckDelegate)factory.getAdapter(structuredModel, ISpellcheckDelegate.class);
-			assertNotNull("Could not get spellcheck delegate", delegate);
-			
-			//run tests
-			boolean shouldSpellcheckCommentElement = delegate.shouldSpellcheck(54, structuredModel);
-			assertFalse("Should not be spellchecking comment elements", shouldSpellcheckCommentElement);
-			
-			boolean shouldSpellcheckComment = delegate.shouldSpellcheck(80, structuredModel);
-			assertTrue("Should be spellchecking comment regions", shouldSpellcheckComment);
-		} finally {
-			project.delete(true, null);
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
index 82edbfd..b6941c9 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,6 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     David Carver (STAR) - bug 259447 - content assistance tests
  *******************************************************************************/
 package org.eclipse.wst.xml.ui.tests;
 
@@ -17,7 +16,6 @@
 
 import org.eclipse.wst.xml.ui.internal.validation.TestDelegatingSourceValidatorForXML;
 import org.eclipse.wst.xml.ui.internal.validation.TestMarkupValidator;
-import org.eclipse.wst.xml.ui.tests.contentassist.TestXMLContentAssist;
 import org.eclipse.wst.xml.ui.tests.viewer.TestViewerConfigurationXML;
 
 
@@ -39,7 +37,5 @@
 		addTestSuite(TestMarkupValidator.class);
 		addTestSuite(TestReconcilerXML.class);
 		addTestSuite(TestSourceValidationFramework.class);
-		addTestSuite(TestXMLContentAssist.class);
-		addTest(new TestSuite(TestSpellcheckDelegateAdapaterFactory.class, "Test Spellcheck Delegate Adapter Factory"));
 	}
 }
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
index bbc4fcd..8a03aed 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,14 +7,11 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     David Carver (STAR) - bug 259447 - content assistance tests
  *******************************************************************************/
 package org.eclipse.wst.xml.ui.tests;
 
 import java.util.ResourceBundle;
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -91,26 +88,5 @@
 	    	return null;
 	    }
 	  }
-    
-	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 URL getInstallLocation() {
-		URL installLocation = pluginBundle.getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}	
-}
\ No newline at end of file
+	}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java
deleted file mode 100644
index f497837..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.wst.xml.ui.tests.commentelement;
-
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory;
-import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class CommentElementHandlerForFoo implements CommentElementHandler{
-
-	private static final String PREFIX = "foo"; //$NON-NLS-1$
-	public Element createElement(Document document, String data, boolean isJSPTag) {
-
-		TagScanner scanner = new TagScanner(data, 1);
-		String name = scanner.nextName();
-		if (name == null) {
-			return null;
-		}
-		StringBuffer buffer = new StringBuffer(name.length() + 4);
-		buffer.append(PREFIX);
-		buffer.append(':');
-		buffer.append(name);
-		String tagName = buffer.toString();
-
-		CommentElementFactory factory = new CommentElementFactory(document, isJSPTag, this);
-		Element element = factory.create(tagName, CommentElementFactory.IS_START);
-
-		// set attributes
-		String attrName = scanner.nextName();
-		while (attrName != null) {
-			String attrValue = scanner.nextValue();
-			Attr attr = document.createAttribute(attrName);
-			if (attr != null) {
-				if (attrValue != null)
-					attr.setValue(attrValue);
-				element.setAttributeNode(attr);
-			}
-			attrName = scanner.nextName();
-		}
-		return element;
-	}
-
-	public String generateEndTagContent(IDOMElement element) {
-		return null;
-	}
-
-	public String generateStartTagContent(IDOMElement element) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append('#');
-		buffer.append(element.getLocalName());
-
-		NamedNodeMap attributes = element.getAttributes();
-		int length = attributes.getLength();
-		for (int i = 0; i < length; i++) {
-			Attr attr = (Attr) attributes.item(i);
-			if (attr == null) {
-				continue;
-			}
-			buffer.append(' ');
-			String attrName = attr.getNodeName();
-			if (attrName != null) {
-				buffer.append(attrName);
-			}
-			String attrValue = attr.getNodeValue();
-			if (attrValue != null) {
-				// attr name only for HTML boolean and JSP
-				buffer.append('=');
-				buffer.append(attrValue);
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	public boolean isCommentElement(IDOMElement element) {
-		String prefix = element.getPrefix();
-		if (prefix == null || !prefix.equals(PREFIX)) {
-			return false;
-		}
-		String tagName = element.getTagName();
-		if (tagName.length() <= 4) {
-			return false;
-		}
-		return true;
-	}
-
-	public boolean isEmpty() {
-		return true;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java
deleted file mode 100644
index 3007b72..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - bug 259447 - intial API and implementation
- *     IBM Corporation - make use of (copy of JSP UI Tests') ProjectUtil to skip
- *         file-system calls
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.tests.contentassist;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-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.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
-import org.eclipse.wst.xml.ui.tests.ProjectUtil;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestXMLContentAssist extends TestCase {
-
-	protected String projectName = null;
-	protected String fileName = null;
-	protected IFile file = null;
-	protected IEditorPart textEditorPart = null;
-	protected ITextEditor editor = null;
-
-	protected XMLDocumentLoader xmlDocumentLoader = null;
-	protected IStructuredDocument document = null;
-	protected StructuredTextViewer sourceViewer = null;
-	private IStructuredModel model;
-	protected XMLContentAssistProcessor xmlContentAssistProcessor = null;
-
-	public TestXMLContentAssist() {
-	}
-
-	/**
-	 * Setup the necessary projects, files, and source viewer for the tests.
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		projectName = "TestXMLContentAssist";
-		fileName = "xmlContentAssist-test1.xml";
-
-		// Setup the Project and File to be used during the test.
-		String xmlFilePath = setupProject();
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(xmlFilePath));
-		if (file != null && !file.exists()) {
-			Assert.fail("Unable to locate " + xmlFilePath + ".");
-		}
-
-		loadXMLFile();
-
-		initializeSourceViewer();
-		xmlContentAssistProcessor = new XMLContentAssistProcessor();
-	}
-
-	protected void initializeSourceViewer() {
-		// some test environments might not have a "real" display
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getShell();
-			} else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			sourceViewer = new StructuredTextViewer(parent, null, null, false,
-					SWT.NONE);
-		} else {
-			Assert
-					.fail("Unable to run the test as a display must be available.");
-		}
-
-		configureSourceViewer();
-	}
-
-	protected void configureSourceViewer() {
-		sourceViewer.configure(new StructuredTextViewerConfigurationXML());
-
-		sourceViewer.setDocument(document);
-	}
-
-	protected void loadXMLFile() throws ResourceAlreadyExists, ResourceInUse,
-			IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		model = modelManager.getModelForEdit(file);
-		document = model.getStructuredDocument();
-	}
-
-	protected String setupProject() {
-		IProjectDescription description = ResourcesPlugin.getWorkspace()
-				.newProjectDescription(projectName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		} catch (CoreException e) {
-
-		}
-		String xmlFilePath = project.getFullPath().addTrailingSeparator().append(fileName).toString();
-		// needs both the test file and schemas
-		ProjectUtil.copyBundleEntriesIntoWorkspace("/testresources", project.getFullPath().toString());
-		return xmlFilePath;
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		xmlContentAssistProcessor.release();
-	}
-
-	/**
-	 * Get the content completion proposals at <code>lineNumber</code>,
-	 * <code>columnNumber</code>.
-	 * 
-	 * @param lineNumber
-	 * @param columnNumber
-	 * @return
-	 * @throws Exception
-	 */
-	private ICompletionProposal[] getProposals(int offset) throws Exception {
-		
-		return xmlContentAssistProcessor.computeCompletionProposals(
-				sourceViewer, offset);
-	}
-
-	public void testAttributeProposal() throws Exception {
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(10) + 10;
-			IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(
-					sourceViewer, offset);
-			assertEquals("Wrong node name returned:", "Member", node
-					.getNodeName());
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertTrue("Length less than 1", proposals.length > 1);
-			ICompletionProposal proposal = proposals[0];
-			assertEquals("Wrong attribute proposal returned at ["+sourceViewer.getDocument().get(offset-9, 9)+"|"+sourceViewer.getDocument().get(offset, 9)+"]", "handicap",
-					proposal.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testChildElementProposal() throws Exception {
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(11) + 8;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Unexpected number of proposals", 5, proposals.length);
-			ICompletionProposal proposal = proposals[0];
-			assertEquals("Wrong element proposal returned.", "ExclusiveMember",
-					proposal.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testShaftElementProposal() throws Exception {
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Unexpected number of proposals", 7, proposals.length);
-			ICompletionProposal proposal = proposals[0];
-			assertEquals("Wrong element proposal returned.", "Shaft", proposal
-					.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testXMLTemplatePositionalProposal() throws Exception {
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Unexpected number of proposals", 7, proposals.length);
-			ICompletionProposal proposal = proposals[5];
-			assertEquals("Wrong template proposal returned.",
-					"comment - xml comment", proposal.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testXMLCommentTemplateProposalExists() throws Exception {
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("No proposals returned.", proposals);
-			boolean foundsw = false;
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				ICompletionProposal proposal = proposals[cnt];
-				if (proposal.getDisplayString().equals("comment - xml comment")) {
-					foundsw = true;
-				}
-			}
-			if (foundsw == false) {
-				fail("XML Template 'xml comment' was not found in the proposal list");
-			}
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml
deleted file mode 100644
index 329638a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-	<!--$foo bar baz  -->
-
-	<!-- Spell check me: foo baz -->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml
deleted file mode 100644
index c895cfc..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
-  <GolfCourse>
-    <Name></Name>
-    <Yardage></Yardage>
-    <Par></Par>
-    <Handicap></Handicap>
-    <Slope></Slope>
-    
-  </GolfCourse>
-  <Member >
-  	   	
-  </Member>
-  <Employee >
-    <FirstName></FirstName>
-    <LastName></LastName>
-    <EmployeeNumber></EmployeeNumber>
-  </Employee>
-  <ProShop>
-    <GolfClub>
-      <ManufacturerName></ManufacturerName>
-      <Quantity></Quantity>
-      <ClubKind></ClubKind>
-      <Loft></Loft>
-      
-    </GolfClub>
-    <BoxOfBalls >
-      <ManufacturerName></ManufacturerName>
-      <Quantity></Quantity>
-      <ProductDetails></ProductDetails>
-    </BoxOfBalls>
-  </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
index 7294efc..28a20c9 100644
--- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: validatexmltests.jar
 Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
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
index 5ccd6cd..1d276ee 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * Copyright (c) 2001, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,7 +40,7 @@
    */
   public AllXMLTests()
   {
-    super("XML Validation Test Suite");
+    super("XMLTestsTestSuite");
     addTest(XMLValidationConfigurationTest.suite());
     addTest(ValidatorTest.suite());
     addTest(XMLMessageInfoHelperTest.suite());
@@ -52,7 +52,5 @@
     addTestSuite(ErrorMessageCustomizerDelegateTest.class);
     addTestSuite(ErrorCustomizationRegistryTest.class);
     addTestSuite(LineNumberAdjustmentsTest.class);
-    addTestSuite(XIncludeTest.class);
-    addTestSuite(HonourAllSchemaLocationsTest.class);
   }
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
deleted file mode 100644
index 29e6b8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the "honour all schema locations" feature. 
- */
-public class HonourAllSchemaLocationsTest extends BaseTestCase
-{
-  public void testHonoursAllSchemaLocations()
-  {
-    try
-    {
-      configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
-    }
-    catch (Exception e)
-    {
-      fail();
-    }
-
-    String testFile = getTestFile();
-    List keys = new ArrayList();
-    int numErrors = 0;
-    int numWarnings = 0;
-
-    runTest(testFile, keys, numErrors, numWarnings);
-  }
-
-  public void testCanTurnOffHonourAllSchemaLocations()
-  {
-    try
-    {
-      configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
-    }
-    catch (Exception e)
-    {
-      fail();
-    }
-
-    String testFile = getTestFile();
-    List keys = new ArrayList();
-    keys.add(null);
-    keys.add("cvc-complex-type.2.4.d"); //$NON-NLS-1$
-    int numErrors = 2;
-    int numWarnings = 0;
-
-    runTest(testFile, keys, numErrors, numWarnings);
-  }
-
-  private String getTestFile()
-  {
-    return FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/HonourAllSchemaLocations/A-instance.xml"; //$NON-NLS-1$
-  }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
deleted file mode 100644
index 719ab54..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the XInclude feature. 
- */
-public class XIncludeTest extends BaseTestCase
-{
-  public void testSupportsXInclude()
-  {
-    try
-    {
-      configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, true);
-    }
-    catch (Exception e)
-    {
-      fail();
-    }
-
-    String testFile = getTestFile();
-    List keys = new ArrayList();
-    int numErrors = 0;
-    int numWarnings = 0;
-
-    runTest(testFile, keys, numErrors, numWarnings);
-  }
-
-  public void testCanTurnOffXInclude()
-  {
-    try
-    {
-      configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, false);
-    }
-    catch (Exception e)
-    {
-      fail();
-    }
-
-    String testFile = getTestFile();
-    List keys = new ArrayList();
-    keys.add("cvc-complex-type.2.4.a");
-    int numErrors = 1;
-    int numWarnings = 0;
-
-    runTest(testFile, keys, numErrors, numWarnings);
-  }
-
-  private String getTestFile()
-  {
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/XInclude/master.xml";
-    return testfile;
-  }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
deleted file mode 100644
index 8aa7395..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nsA:A xmlns:nsA="urn:nsA" xmlns:p="urn:nsB" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:nsA A.xsd ">
-  <p:B1>p:B1</p:B1>
-  <p:B2>p:B2</p:B2>
-</nsA:A>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
deleted file mode 100644
index 0a43e77..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsA" elementFormDefault="qualified"
-	xmlns="http://www.w3.org/2001/XMLSchema" xmlns:nsB="urn:nsB" xmlns:nsA="urn:nsA">
-
-    <import namespace="urn:nsB" schemaLocation="B1.xsd"/>
-	<import namespace="urn:nsB" schemaLocation="B2.xsd"/>
-	<element name="A">
-		<complexType>
-			<sequence>
-				<element ref="nsB:B1"></element>
-				<element ref="nsB:B2"></element>
-			</sequence>
-		</complexType>
-	</element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
deleted file mode 100644
index 68a85a4..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-    <element name="B1" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
deleted file mode 100644
index c4ece00..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-    <element name="B2" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
deleted file mode 100644
index 4c85730..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="master.xsd"/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
deleted file mode 100644
index 7fbae72..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<master xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="master.xsd">
-  <!-- <body/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="body.xml"/>
-</master>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
deleted file mode 100644
index 034f57a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="master">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="body" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="body"/>
-</xs:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
index e9a1fe6..df7b463 100644
--- a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xsd.core.tests
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.2.qualifier
 Bundle-ClassPath: xsdcoretests.jar
 Bundle-Activator: org.eclipse.wst.xsd.core.tests.internal.XSDCoreTestsPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
index 12b77b5..25e505d 100644
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
+++ b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
@@ -21,18 +21,22 @@
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
+import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
+import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
+import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
 import org.eclipse.wst.xsd.contentmodel.internal.CMDocumentFactoryXSD;
 import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl;
 import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.DocumentationImpl;
 import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDElementDeclarationAdapter;
 import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDModelGroupAdapter;
 import org.eclipse.xsd.XSDComplexTypeDefinition;
+import org.eclipse.xsd.XSDElementDeclaration;
 import org.eclipse.xsd.XSDSchema;
 import org.eclipse.xsd.XSDTypeDefinition;
 import org.osgi.framework.Bundle;
@@ -342,21 +346,6 @@
 	
  }
   
-  public void testForBug176420() {
-	  // Obtain the model from /testresources/samples/testSchemaForBug176420.xsd
-	  Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
-	  URL url = bundle.getEntry("/testresources/samples/testSchemaForBug176420.xsd");
-	  CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
-	  assertNotNull("Content model loaded Null", document);
-	  
-	  // Obtain the enumerated values of the root element
-	  CMNode cmNode = document.getElements().item(0);
-	  String[] enumeratedValues = ((CMElementDeclaration)cmNode).getDataType().getEnumeratedValues();
-
-	  // Verify that all 12 enumerated values are included
-	  assertEquals(12, enumeratedValues.length);
-  }
-  
 	private void testLocalAttrDocumentation(CMNamedNodeMap attributes) {
 		CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("localAttr");
 		assertNotNull("Missing localAttr attribute.");
@@ -432,5 +421,77 @@
 		assertNull("globalAttr4 returned data when non expected.", ((DocumentationImpl)documentation.item(0)).getValue());
 	}
 	
-		
+
+  public void testCMVisitorForCyclicGroupReferences()
+  {
+    // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245851
+    Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
+    URL url = bundle.getEntry("/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd");
+    
+    CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
+    assertNotNull("Content model loaded Null", document);
+    
+    CMNamedNodeMap elements = document.getElements();
+    
+    CMElementDeclaration rootElement =  (CMElementDeclaration)elements.getNamedItem("RootElement");
+    assertNotNull("Missing object element", rootElement);
+    
+    try
+    {
+      // Tests GraphGenerator's visitCMNode
+      CMValidator cmValidator = new CMValidator();  // internal
+      cmValidator.createGraph(rootElement);
+      
+      // Tests CMDescriptionBuilder's visitCMNode
+      CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder(); // internal
+      descriptionBuilder.buildDescription(rootElement);
+    }
+    catch (StackOverflowError e)
+    {
+      fail(e.getLocalizedMessage()); 
+    }
+  }
+  
+  public void testXSDVisitorForCyclicGroupReferences()
+  {
+    // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245851
+    Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
+    URL url = bundle.getEntry("/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd");
+
+    XSDSchema xsdSchema = XSDImpl.buildXSDModel(url.toExternalForm());
+    assertNotNull(xsdSchema);
+
+    String typeName = "RootElement";
+    try
+    {
+      for (Iterator elements = xsdSchema.getElementDeclarations().iterator(); elements.hasNext();)
+      {
+        Object obj = elements.next();
+        if (obj instanceof XSDElementDeclaration)
+        {
+          XSDElementDeclaration element = (XSDElementDeclaration) obj;
+          if (typeName.equals(element.getName()))
+          {
+            CMNode cmNode = XSDImpl.getAdapter(element);
+            if (cmNode instanceof XSDElementDeclarationAdapter)
+            {
+              XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) cmNode;
+              CMContent content = adapter.getContent();
+              assertNotNull("Content is null", content);
+            
+              CMNamedNodeMap localElements = adapter.getLocalElements();
+              assertNotNull("localElements is null", localElements);
+              return;
+            }
+          }
+        }
+      }
+    }
+    catch (StackOverflowError e)
+    {
+      fail(e.getLocalizedMessage());
+    }
+    fail("Unexpected failure");
+  }
+
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd
new file mode 100644
index 0000000..d495539
--- /dev/null
+++ b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://cyclicGroupReferences"
+	elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cyclicGroupReferences">
+
+	<group name="NewGroupDefinition0">
+		<sequence>
+			<element name="gr0e1" type="string"></element>
+			<group ref="tns:NewGroupDefinition1"></group>
+		</sequence>
+	</group>
+
+	<group name="NewGroupDefinition1">
+		<sequence>
+			<element name="gr1e1" type="string"></element>
+			<element name="gr1e2" type="string"></element>
+			<group ref="tns:NewGroupDefinition2"></group>
+			<element name="gr1e3" type="string"></element>
+		</sequence>
+	</group>
+
+	<complexType name="GlobalComplexType">
+		<sequence>
+			<element name="cte1" type="string"></element>
+			<group ref="tns:NewGroupDefinition1"></group>
+			<element name="cte2" type="string"></element>
+			<element name="cte3" type="string"></element>
+		</sequence>
+	</complexType>
+
+	<group name="NewGroupDefinition2">
+		<sequence>
+			<element name="gr2e1" type="string"></element>
+			<element name="gr2e2" type="string"></element>
+			<group ref="tns:NewGroupDefinition0"></group>
+		</sequence>
+	</group>
+
+	<group name="ValidGroup001">
+		<sequence>
+			<element name="ve1" type="string"></element>
+			<element name="ve2" type="string"></element>
+			<group ref="tns:ValidGroup002"></group>
+		</sequence>
+	</group>
+
+	<group name="ValidGroup002">
+		<sequence>
+			<element name="v2e2" type="string"></element>
+			<element name="v2e1" type="string"></element>
+			<group ref="tns:ValidGroup003"></group>
+		</sequence>
+	</group>
+
+	<group name="ValidGroup003">
+		<sequence>
+			<element name="v3e1" type="string"></element>
+			<element name="v3e2" type="string"></element>
+		</sequence>
+	</group>
+
+	<element name="RootElement" type="tns:GlobalComplexType">
+	</element>
+</schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
deleted file mode 100644
index 4bcaf57..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/testSchemaForBug176420"
-	xmlns:tns="http://www.example.org/testSchemaForBug176420"
-	elementFormDefault="qualified">
-	<simpleType name="numbersType">
-		<restriction base="string">
-			<enumeration value="1"/>
-			<enumeration value="2"/>
-			<enumeration value="3"/>
-			<enumeration value="4"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="lettersType">
-		<restriction base="string">
-			<enumeration value="a"/>
-			<enumeration value="b"/>
-			<enumeration value="c"/>
-			<enumeration value="d"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="unionType">
-		<union memberTypes="tns:lettersType tns:numbersType tns:union2Type" />
-	</simpleType>
-	<element name="element" type="tns:unionType"></element>
-    <simpleType name="numbers2Type">
-    	<restriction base="string">
-    		<enumeration value="4"/>
-    		<enumeration value="5"/>
-    		<enumeration value="6"/>
-    	</restriction>
-    </simpleType>
-    <simpleType name="letters2Type">
-    	<restriction base="string">
-    		<enumeration value="d"/>
-    		<enumeration value="e"/>
-    		<enumeration value="f"/>
-    	</restriction>
-    </simpleType>
-    <simpleType name="union2Type">
-    	<union memberTypes="tns:letters2Type tns:numbers2Type"/></simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.classpath b/tests/org.eclipse.wst.xsd.ui.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.project b/tests/org.eclipse.wst.xsd.ui.tests/.project
deleted file mode 100644
index a9aa178..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsd.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1900f21..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Wed Jul 23 11:19:13 EDT 2008
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9b44b17..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jul 22 12:13:51 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ec9085..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.ui.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: xsduitests.jar
-Bundle-Activator: org.eclipse.wst.xsd.ui.tests.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="[3.8.1,4.0.0)",
- org.eclipse.wst.xsd.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/about.html b/tests/org.eclipse.wst.xsd.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/build.properties b/tests/org.eclipse.wst.xsd.ui.tests/build.properties
deleted file mode 100644
index 9d56d8d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               build.properties,\
-               testresources/,\
-               plugin.properties,\
-               test.xml,\
-               xsduitests.jar,\
-               about.html
-jars.compile.order = xsduitests.jar
-source.xsduitests.jar = src/
-output.xsduitests.jar = bin/
-
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties b/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties
deleted file mode 100644
index cbe1669..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = XSD UI Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java
deleted file mode 100644
index c7081ab..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin
-{
-
-  // The plug-in ID
-  public static final String PLUGIN_ID = "org.eclipse.wst.xsd.ui.tests";
-  private static Bundle pluginBundle = null;
-
-  // The shared instance
-  private static Activator plugin;
-
-  /**
-   * The constructor
-   */
-  public Activator()
-  {
-    plugin = this;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-   * )
-   */
-  public void start(BundleContext context) throws Exception
-  {
-    super.start(context);
-    plugin = this;
-    pluginBundle = context.getBundle();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-   * )
-   */
-  public void stop(BundleContext context) throws Exception
-  {
-    plugin = null;
-    super.stop(context);
-  }
-
-  /**
-   * Returns the shared instance
-   * 
-   * @return the shared instance
-   */
-  public static Activator getDefault()
-  {
-    return plugin;
-  }
-
-  /**
-   * Get the install URL of this plugin.
-   * 
-   * @return the install url of this plugin
-   */
-  public static String getInstallURL()
-  {
-    try
-    {
-      return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java
deleted file mode 100644
index a12fb86..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Wrapper test suite for all XSD UI tests.
- */
-public class AllXSDUITests extends TestSuite
-{
-  /**
-   * Create this test suite.
-   * 
-   * @return This test suite.
-   */
-  public static Test suite()
-  {
-    return new AllXSDUITests();
-  }
-
-  /**
-   * Constructor
-   */
-  public AllXSDUITests()
-  {
-    super("AllXSDUITests");
-    // XSD Includes tests
-    addTest(ChameleonIncludesTest.suite());
-    // Testing used imports aren't removed (ensure logic to determine
-    // what is or what is not used is correct)
-    addTest(ImportsTest.suite());
-    // Unused XSD imports tests
-    addTest(XSDUnusedTests.suite());
-    // XSD xml ns table cleanup
-    addTest(XSDXMLNSCleanupTests.suite());
-  }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java
deleted file mode 100644
index 1634b3d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.tests.Activator;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-
-public class BaseTestCase extends TestCase
-{
-  protected static final String PLUGIN_ABSOLUTE_PATH = Activator.getInstallURL();
-  protected static final String RESOURCES_FOLDER = "testresources"; //$NON-NLS-1$
-  protected static final String TC_ROOT_FOLDER = PLUGIN_ABSOLUTE_PATH + "/" + RESOURCES_FOLDER + "/XSD"; //$NON-NLS-1$
-  protected XSDDirectivesManager importManager = new XSDDirectivesManager();
-
-  public BaseTestCase()
-  {
-  }
-
-  public BaseTestCase(String name)
-  {
-    super(name);
-  }
-
-  protected XSDSchema getXSDSchema(String path)
-  {
-    URI uri = URI.createFileURI(path);
-    ResourceSet resourceSet = new ResourceSetImpl();
-    XSDResourceImpl resource = (XSDResourceImpl) resourceSet.getResource(uri, true);
-    XSDSchema schema = resource.getSchema();
-    assertNotNull(schema);
-    return schema;
-  }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java
deleted file mode 100644
index 64d18f4..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class ChameleonIncludesTest extends BaseTestCase
-{
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(ChameleonIncludesTest.class);
-  }
-  
-  public void testChameleonTest001()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest002()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-  }
-
-  public void testChameleonTest003()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest004()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-  }
-
-  public void testChameleonTest005()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest006()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest007()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest008()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest009()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest010()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest011()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest012()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest013()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest014()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest015()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest016()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest017()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest018()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest019()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest020()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest021()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest022()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest023()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testChameleonTest024()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java
deleted file mode 100644
index 89e33be..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class ImportsTest extends BaseTestCase
-{
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(ImportsTest.class);
-  }
-
-  public void testImport001()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttribute/Used/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport002()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-  }
-
-  public void testImport003()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport004()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-  }
-
-  public void testImport005()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport006()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport007()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport008()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport009()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport010()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport011()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport012()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport013()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport014()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport015()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport016()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport017()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport018()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport019()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport020()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport021()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport022()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport023()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport024()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java
deleted file mode 100644
index 5644947..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
-public class XSDUnusedTests extends BaseTestCase
-{
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(XSDUnusedTests.class);
-  }
-
-  public void testImport001()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport001RepeatRemovalOnce()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
-    
-    importManager.performRemoval(schema);
-    list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport001RepeatRemovalTwice()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
-    
-    importManager.performRemoval(schema);
-    list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-    
-    importManager.performRemoval(schema);
-    list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
- 
-  public void testImport002()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main001.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport003()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main002.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport004()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main003.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport005()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main004.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Import3.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport006()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main005.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 5);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(2);
-    assertTrue("../Import2.xsd".equals(d2.getSchemaLocation()));
-    XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(3);
-    assertTrue("../Import3.xsd".equals(d3.getSchemaLocation()));
-    XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(4);
-    assertTrue("../Import4.xsd".equals(d4.getSchemaLocation()));
-    XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d5.getSchemaLocation()));
-  }
-
-  public void testImport007()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main006.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport008()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main007.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport009()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main008.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport010()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport011()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009a.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 0);
-  }
-
-  public void testImport012()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009b.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include2.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include3.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport013()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009c.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 3);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
-    XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
-    assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
-  }
-
-  public void testImport014()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009d.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include3.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport015()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009e.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include2.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testImport016()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009f.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 5);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../A.xsd".equals(d2.getSchemaLocation()));
-    XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
-    assertTrue("../Include5.xsd".equals(d3.getSchemaLocation()));
-
-    XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(3);
-    assertTrue("../Include2.xsd".equals(d4.getSchemaLocation()));
-    XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(4);
-    assertTrue("../Include3.xsd".equals(d5.getSchemaLocation()));
-  }
-
-  public void testImport017()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009g.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 2);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
-  }
-
-  public void testImport018()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009h.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 3);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include5.xsd".equals(d2.getSchemaLocation()));
-    XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
-    assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
-  }
-
-  public void testCircularIncludes001()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Includes/circular/test/Main001.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 1);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include4.xsd".equals(d1.getSchemaLocation()));
-  }
-
-  public void testCircularIncludes002()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Includes/circular/test/Main002.xsd");
-    importManager.performRemoval(schema);
-    List list = importManager.getUnusedXSDDirectives();
-    assertTrue(list.size() == 6);
-    XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
-    assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
-    XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
-    assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
-    XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
-    assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
-    XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(3);
-    assertTrue("../Include4.xsd".equals(d4.getSchemaLocation()));
-    XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(4);
-    assertTrue("../Include5.xsd".equals(d5.getSchemaLocation()));
-    XSDSchemaDirective d6 = (XSDSchemaDirective) list.get(5);
-    assertTrue("../Include6.xsd".equals(d6.getSchemaLocation()));
-
-  }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java
deleted file mode 100644
index 60c4743..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.tests.internal;
-
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDXMLNSCleanupTests extends BaseTestCase
-{
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(XSDXMLNSCleanupTests.class);
-  }
-
-  public void testCleanup001()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main001.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 0);
-    assertTrue(usedPrefixes.size() == 14);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns01"));
-    assertTrue(usedPrefixes.contains("tns02"));
-    assertTrue(usedPrefixes.contains("tns03"));
-    assertTrue(usedPrefixes.contains("tns04"));
-    assertTrue(usedPrefixes.contains("tns05"));
-    assertTrue(usedPrefixes.contains("tns06"));
-    assertTrue(usedPrefixes.contains("tns07"));
-    assertTrue(usedPrefixes.contains("tns08"));
-    assertTrue(usedPrefixes.contains("tns09"));
-    assertTrue(usedPrefixes.contains("tns10"));
-    assertTrue(usedPrefixes.contains("tns11"));
-    assertTrue(usedPrefixes.contains("tns12"));
-    assertTrue(usedPrefixes.contains("p"));
-  }
-
-  public void testCleanup002()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main002.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("tns05"));
-
-    assertTrue(usedPrefixes.size() == 6);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns01"));
-    assertTrue(usedPrefixes.contains("tns02"));
-    assertTrue(usedPrefixes.contains("tns03"));
-    assertTrue(usedPrefixes.contains("tns04"));
-    assertTrue(usedPrefixes.contains("p"));
-  }
-
-  public void testCleanup003()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main003.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 0);
-    assertTrue(usedPrefixes.size() == 14);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains("tns01"));
-    assertTrue(usedPrefixes.contains("tns02"));
-    assertTrue(usedPrefixes.contains("tns03"));
-    assertTrue(usedPrefixes.contains("tns04"));
-    assertTrue(usedPrefixes.contains("tns05"));
-    assertTrue(usedPrefixes.contains("tns06"));
-    assertTrue(usedPrefixes.contains("tns07"));
-    assertTrue(usedPrefixes.contains("tns08"));
-    assertTrue(usedPrefixes.contains("tns09"));
-    assertTrue(usedPrefixes.contains("tns10"));
-    assertTrue(usedPrefixes.contains("tns11"));
-    assertTrue(usedPrefixes.contains("tns12"));
-    assertTrue(usedPrefixes.contains("p"));
-  }
-
-  public void testCleanup004()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main004.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 12);
-    assertTrue(unusedPrefixes.contains("tns02"));
-    assertTrue(unusedPrefixes.contains("tns03"));
-    assertTrue(unusedPrefixes.contains("tns04"));
-    assertTrue(unusedPrefixes.contains("tns05"));
-    assertTrue(unusedPrefixes.contains("tns06"));
-    assertTrue(unusedPrefixes.contains("tns07"));
-    assertTrue(unusedPrefixes.contains("tns08"));
-    assertTrue(unusedPrefixes.contains("tns09"));
-    assertTrue(unusedPrefixes.contains("tns10"));
-    assertTrue(unusedPrefixes.contains("tns11"));
-    assertTrue(unusedPrefixes.contains("tns12"));
-    assertTrue(unusedPrefixes.contains(null));
-
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains("tns01"));
-    assertTrue(usedPrefixes.contains("p"));
-  }
-
-  public void testCleanup005()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main005.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 12);
-    assertTrue(unusedPrefixes.contains("tns01"));
-    assertTrue(unusedPrefixes.contains("tns02"));
-    assertTrue(unusedPrefixes.contains("tns03"));
-    assertTrue(unusedPrefixes.contains("tns04"));
-    assertTrue(unusedPrefixes.contains("tns05"));
-    assertTrue(unusedPrefixes.contains("tns06"));
-    assertTrue(unusedPrefixes.contains("tns07"));
-    assertTrue(unusedPrefixes.contains("tns08"));
-    assertTrue(unusedPrefixes.contains("tns09"));
-    assertTrue(unusedPrefixes.contains("tns10"));
-    assertTrue(unusedPrefixes.contains("tns11"));
-    assertTrue(unusedPrefixes.contains("tns12"));
-
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains("p"));
-    assertTrue(usedPrefixes.contains(null));
-  }
-
-  public void testCleanup006()
-  {
-    // Null target namespace schema
-
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main006.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("tns01"));
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains("p"));
-    // This was added since references were made without a prefix
-    assertTrue(usedPrefixes.contains(null));
-
-  }
-
-  public void testCleanup007()
-  {
-    // Test Unused Null Prefix
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main007.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains(null));
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains("p"));
-    assertTrue(usedPrefixes.contains("tns"));
-
-  }
-
-  public void testCleanup008()
-  {
-    // Test Used Null Prefix
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main008.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("p"));
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains("xsd"));
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup009()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main001.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 0);
-    assertTrue(usedPrefixes.size() == 2);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup010()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main002.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("imp"));
-    assertTrue(usedPrefixes.size() == 2);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup011()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main003.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("imp"));
-    assertTrue(usedPrefixes.size() == 2);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup012()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main004.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 1);
-    assertTrue(unusedPrefixes.contains("imp"));
-    assertTrue(usedPrefixes.size() == 2);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup013()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main005.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 2);
-    assertTrue(unusedPrefixes.contains("imp"));
-    assertTrue(unusedPrefixes.contains("imp4"));
-    assertTrue(usedPrefixes.size() == 2);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-  }
-
-  // Using the test XSDs from the Unused folder
-  public void testCleanup014()
-  {
-    XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main006.xsd");
-    importManager.performRemoval(schema);
-    Set unusedPrefixes = importManager.getUnusedPrefixes();
-    Set usedPrefixes = importManager.getUsedPrefixes();
-    assertTrue(unusedPrefixes.size() == 0);
-    assertTrue(usedPrefixes.size() == 3);
-    assertTrue(usedPrefixes.contains(null));
-    assertTrue(usedPrefixes.contains("tns"));
-    assertTrue(usedPrefixes.contains("p"));
-  }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/test.xml b/tests/org.eclipse.wst.xsd.ui.tests/test.xml
deleted file mode 100644
index 2222477..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.xsd.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.xsd.ui.tests.internal.AllXSDUITests" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd
deleted file mode 100644
index b2bfc2a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <xsd:complexType name="ImpCT1">
-    	<xsd:sequence>
-    		<xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
-    	</xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="ImpGr1">
-    	<xsd:sequence>
-    		<xsd:element name="e1" type="xsd:string"></xsd:element>
-    	</xsd:sequence>
-    </xsd:group>
-
-    <xsd:attribute name="ImpAttr1" type="ImpST1"></xsd:attribute>
-
-    <xsd:attributeGroup name="ImpAttrGr1">
-    	<xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
-    </xsd:attributeGroup>
-
-    <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
-    <xsd:simpleType name="ImpST1">
-    	<xsd:restriction base="xsd:string"></xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="ImpST2">
-    	<xsd:restriction base="xsd:string"></xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:complexType name="ImpCT2">
-    	<xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
-    </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd
deleted file mode 100644
index 192925f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-	<xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
-	<xsd:complexType name="MainCT">
-		<xsd:attribute ref="MainAttribute"></xsd:attribute>
-	</xsd:complexType>
-
-    <xsd:attribute name="MainAttribute" type="xsd:string"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd
deleted file mode 100644
index 3d16c33..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-	<xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
-	<xsd:complexType name="MainCT">
-		<xsd:attribute ref="ImpAttr1"></xsd:attribute>
-	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd
deleted file mode 100644
index e562da3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-	<xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
-	<xsd:complexType name="MainCT">
-        <xsd:attributeGroup ref="MainAttributeGroup1"></xsd:attributeGroup>
-    </xsd:complexType>
-
-	<xsd:attributeGroup name="MainAttributeGroup1">
-		<xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
-		<xsd:anyAttribute></xsd:anyAttribute>
-	</xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd
deleted file mode 100644
index 039d24a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-	<xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
-	<xsd:complexType name="MainCT">
-        <xsd:attributeGroup ref="ImpAttrGr1"></xsd:attributeGroup>
-    </xsd:complexType>
-
-	<xsd:attributeGroup name="MainAttributeGroup1">
-		<xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
-		<xsd:anyAttribute></xsd:anyAttribute>
-	</xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
deleted file mode 100644
index 839a1aa..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-    
-    <xsd:complexType name="MainCT1">
-    	<xsd:complexContent>
-    		<xsd:extension base="MainCT2"></xsd:extension>
-    	</xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
deleted file mode 100644
index 73e2825..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-    
-    <xsd:complexType name="MainCT1">
-    	<xsd:complexContent>
-    		<xsd:restriction base="MainCT2">
-    			<xsd:sequence>
-    				<xsd:element name="e1" minOccurs="1">
-    					<xsd:simpleType>
-    						<xsd:restriction base="xsd:string">
-    							<xsd:minLength value="1"></xsd:minLength>
-    							<xsd:maxLength value="10"></xsd:maxLength>
-    						</xsd:restriction>
-    					</xsd:simpleType>
-    				</xsd:element>
-    			</xsd:sequence>
-    		</xsd:restriction>
-    	</xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="MainCT2">
-    	<xsd:sequence>
-    		<xsd:element name="e1" type="xsd:string"></xsd:element>
-    	</xsd:sequence>
-    </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
deleted file mode 100644
index 78769fb..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
-    <xsd:element name="MainElement">
-    	<xsd:complexType>
-    		<xsd:sequence>
-    			<xsd:element name="elem1">
-    				<xsd:complexType>
-    					<xsd:sequence>
-    						<xsd:element name="elem1">
-                                <xsd:complexType>
-                                	<xsd:complexContent>
-                                		<xsd:extension base="MainCT1">
-                                			<xsd:sequence>
-                                				<xsd:element
-                                					name="elem1" type="xsd:string">
-                                				</xsd:element>
-                                			</xsd:sequence>
-                                		</xsd:extension>
-                                	</xsd:complexContent>
-                                </xsd:complexType>
-    						</xsd:element>
-    					</xsd:sequence>
-    				</xsd:complexType>
-    			</xsd:element>
-    		</xsd:sequence>
-    	</xsd:complexType>
-    </xsd:element>
-
-    <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index a4a6167..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
-    <xsd:element name="MainElement1" type="MainCT1"></xsd:element>
-
-    <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index c20fe2e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
-    <xsd:complexType name="MainCT1">
-    	<xsd:sequence>
-    		<xsd:element name="localElem1" type="MainCT2"></xsd:element>
-    	</xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index bd7fea7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
-	elementFormDefault="qualified"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://www.example.org/Main">
-    <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
-    <xsd:group name="MainGroup1">
-    	<xsd:sequence>
-    		<xsd:element name="localElem1" type="MainCT1"></xsd:element&