Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java')
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java69
1 files changed, 0 insertions, 69 deletions
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
deleted file mode 100644
index 2ba8bc5d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-
-public final class DirUtils
-{
- public static boolean isRTL()
- {
- return "rtl".equals(getDir());
- }
-
- public static String getDir()
- {
- String rtl = "rtl";
- String ltr = "ltr";
-
- // from system property
- String orientation = System.getProperty("eclipse.orientation"); //$NON-NLS-1$
- if (rtl.equals(orientation)) //$NON-NLS-1$
- return rtl;
- else if (ltr.equals(orientation)) //$NON-NLS-1$
- return ltr;
-
- // from command line
- String[] args = Platform.getCommandLineArgs();
- for (int i = 0; i < args.length; i++)
- {
- if ("-dir".equalsIgnoreCase(args[i])) //$NON-NLS-1$
- {
- if ((i + 1) < args.length && "rtl".equalsIgnoreCase(args[i + 1])) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
- }
-
- // Check if the user property is set. If not do not
- // rely on the vm.
- if (System.getProperty("osgi.nl.user") == null) //$NON-NLS-1$
- return ltr;
-
- // guess from default locale
- String locale = Platform.getNL();
- if (locale == null)
- {
- locale = Locale.getDefault().toString();
- }
- if (locale.startsWith("ar") || locale.startsWith("fa") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("ur")) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
-}

Back to the top

'> -rw-r--r--tests/org.eclipse.jst.jsp.core.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/build.properties23
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java146
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java75
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java96
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java143
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java39
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java26
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java69
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ProjectUtil.java127
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java31
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java91
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java113
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java360
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java586
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml43
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml36
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html123
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html95
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml129
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml127
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html143
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html142
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml35
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml44
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml28
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml28
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml28
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp54
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp47
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml70
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml62
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml70
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml102
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml66
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml32
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp112
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp144
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml10
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml10
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java284
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java194
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java27
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java142
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java304
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java43
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java149
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java64
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java148
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java43
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java162
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java246
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp222
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java267
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java484
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java606
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java255
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java71
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java160
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java187
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java152
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java98
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java59
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java44
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java422
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp32
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf32
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf26
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp28
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf26
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp23
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf23
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/test.xml115
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld31
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/JSPTranslatorPersistenceTest/Test1.jsp18
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/header.jspf5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project31
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp16
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml18
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld39
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp16
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp18
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jarbin11454 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_error.jsp39
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp39
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jarbin11447 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml16
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/WebContent/escapedQuotes.jsp13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java29
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java29
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.project37
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/.jsdtscope11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.component9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.project.facet.core.xml9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.container1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.name1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/META-INF/MANIFEST.MF10
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/1.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/WEB-INF/web.xml22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/src/testtomcat/servlet/TestServlet.java37
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zipbin4414 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jarbin11454 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jarbin11454 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jarbin11454 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jarbin498051 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.classpath8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.project25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/META-INF/MANIFEST.MF10
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/plain.tld26
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test.jsp20
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test_missing_end_tag.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/LoopTag.java30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/SimpleTag.java26
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/WEB-INF/web.xml37
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/both/test.jsp11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/coda-user/test.jsp11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda0.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/coda1.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude0.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/common/prelude1.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/prelude-user/test.jsp11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/test.jsp11
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testPreludeAndCodas/web stuff/testFragment.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld33
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml18
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp36
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.classpath5
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/main.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header1.jspf4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testVariablesFromIncludedFragments/WebContent/test_header2.jspf4
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld25
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld44
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp16
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp19
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710el.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/bug265710expression.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/fragment.jspf1
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/WebContent/testinclude.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.project28
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF20
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/about.html34
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/build.properties20
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties13
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java56
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java142
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java204
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java370
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java226
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/test.xml116
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp0
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp122
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp15
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp18
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp21
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp5
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp4
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp356
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjspbin78 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jspbin118 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jspbin744 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jspbin990 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jspbin522 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jspbin478 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jspbin721 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jspbin721 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jspbin649 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.core.tests/.classpath12
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.cvsignore6
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF24
-rw-r--r--tests/org.eclipse.wst.css.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.css.core.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.css.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java66
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java163
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java31
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java181
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java175
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java179
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css79
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css35
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css19
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css19
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css8
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css5
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css5
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css23
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css6
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css19
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css19
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css7
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css7
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java175
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java50
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java267
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java81
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java96
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java44
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java217
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java224
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java74
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java238
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java858
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java229
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java111
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java263
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java207
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css29
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css15
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java41
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css17
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css43
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css155
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css30
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css41
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css102
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css554
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css554
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css68
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css454
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css19
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css29
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css73
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css124
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css706
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css706
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css101
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css583
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css22
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css8
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css11
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css20
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css54
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css54
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css10
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css82
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java105
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java69
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java71
-rw-r--r--tests/org.eclipse.wst.css.core.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.project23
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.component7
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.project.facet.core.xml5
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/base.css4
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle0.css4
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle1.css4
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle2.css4
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importDNE.css1
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importMethods.css3
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/site.css10
-rw-r--r--tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/style/sub.css1
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.project28
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/about.html34
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/build.properties20
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java56
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java141
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java196
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java205
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java30
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java73
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/test.xml115
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css0
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css46
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css7
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.cssbin38 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.cssbin41 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.cssbin39 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.cssbin111 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.cssbin109 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.cvsignore8
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF26
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/build.properties11
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/plugin.xml8
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java23
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java54
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java20
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java148
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java54
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/CSSCodeFoldingTest.java434
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java142
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java241
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest1.css32
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest2.css32
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css5
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/.cvsignore7
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF23
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd3
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java28
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java48
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java29
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java47
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java32
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java46
-rw-r--r--tests/org.eclipse.wst.dtd.core.tests/test.xml116
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.cvsignore7
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF30
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/plugin.xml8
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java71
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java36
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/ProjectUtil.java128
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java44
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java33
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java76
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java144
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/plugin/TestPluginXMLRequirements.java94
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/DTDCodeFoldingTest.java441
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java159
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java493
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/testresources/folding/DTDFoldingTest1.dtd36
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/testresources/folding/DTDFoldingTest2.dtd36
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.classpath13
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.cvsignore8
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF30
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt19
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt47
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt16
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt46
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt46
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt59
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt39
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt53
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt71
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt73
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt74
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt24
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt28
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt31
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt92
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt86
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt36
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt34
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt22
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt14
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt36
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt16
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt225
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt41
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt26
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt243
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt107
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt82
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt91
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt71
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt138
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt33
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt30
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt30
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt105
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt18
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt18
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt78
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt197
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt70
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt29
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt40
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt43
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt31
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt127
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt58
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt29
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt29
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt41
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt34
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt28
-rw-r--r--tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt27
-rw-r--r--tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt18
-rw-r--r--tests/org.eclipse.wst.html.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.html.core.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.html.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java53
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java133
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ProjectUtil.java127
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/cleanup/TestHTMLCleanupProcessor.java234
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/TestFormatProcessorHTML.java201
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat-fmt.html20
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat.html10
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss-fmt.html28
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss.html21
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/scriptformat-fmt.html15
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/scriptformat.html1
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat-fmt.html19
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat.html11
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java164
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java118
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java90
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java57
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java304
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestCatalogContentModels.java141
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java91
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java152
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java50
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java77
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java67
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java64
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java74
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java74
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java71
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java85
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java70
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java78
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java76
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java79
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java60
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java60
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java62
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java82
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java78
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java63
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java63
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java53
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java53
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java63
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java291
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java142
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java69
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java70
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java102
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java93
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java89
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java84
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java112
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java115
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java93
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java87
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java79
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java81
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java79
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java94
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java65
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java66
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java66
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java85
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java61
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java61
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java106
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java105
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java112
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java62
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java64
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java66
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java58
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java64
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java77
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java69
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java62
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java63
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java67
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java62
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java60
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java61
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java73
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java75
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java67
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java319
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html5
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html14
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html8
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html2283
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java86
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java46
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java189
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java71
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java81
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java26
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java51
-rw-r--r--tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java54
-rw-r--r--tests/org.eclipse.wst.html.core.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.html.core.tests/testresources/HTMLCleanupProcessor/test1-expected.html14
-rw-r--r--tests/org.eclipse.wst.html.core.tests/testresources/HTMLCleanupProcessor/test1.html14
-rw-r--r--tests/org.eclipse.wst.html.core.tests/testresources/HTMLCleanupProcessor/test2-expected.html15
-rw-r--r--tests/org.eclipse.wst.html.core.tests/testresources/HTMLCleanupProcessor/test2.html15
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.project28
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/about.html34
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/build.properties19
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java56
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java141
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java187
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java312
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java70
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/test.xml115
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html0
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html664
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html665
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html18
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html19
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.htmlbin509 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.htmlbin500 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.htmlbin573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.htmlbin573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.cvsignore6
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF29
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/build.properties21
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.ui.tests/plugin.properties14
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/plugin.xml15
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java114
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java35
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/ProjectUtil.java155
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java55
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java33
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/validation/TestHTMLValidator.java282
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java248
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java496
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/test.xml114
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/TestHTMLValidator/InvalidateTagNameThenFix.html12
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/TestHTMLValidator/RemoveAndAddBackCommentEndTag.html12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/build.properties4
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/Activator.java53
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java19
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java303
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/test.xml114
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/testFiles/test1.html9
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/META-INF/MANIFEST.MF24
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/OSGI-INF/l10n/bundle.properties2
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties7
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.properties1
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.xml56
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/Activator.java50
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/AllWebUITests.java30
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/style/StyleTests.java92
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/JSTranslationEditorInput.java169
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/RunCodeHandler.java418
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/ShowTranslationHandler.java132
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/test.xml114
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.project27
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF23
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/META-INF/eclipse.inf6
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/build.properties18
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/resources/testfile.jarbin3984 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java14
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java70
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java77
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java66
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestUnsupportedContentType.java112
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java118
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java48
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java48
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java48
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java194
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestObjects.java55
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java93
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java57
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java60
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java57
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java55
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java38
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java49
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java51
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java45
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java42
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java31
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java70
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/modelhandler/ModelHandlerRegistryTest.java106
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java187
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java191
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java86
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java90
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/util/TestJarUtilities.java270
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/test.xml167
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.classpath13
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.project27
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF25
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java363
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java508
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java44
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java45
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java97
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java36
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java26
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java436
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java67
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java624
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java140
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java367
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java31
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java28
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java265
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java305
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java34
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java70
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java201
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/plugin.properties21
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/plugin.xml89
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java172
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ClearReadOnlyDelegate.java49
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java99
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java824
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java154
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ReadOnlyToggleDelegate.java52
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java66
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java35
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java89
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java27
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java70
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java454
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java67
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java280
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/test.xml116
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java332
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java50
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java161
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java82
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/build.properties10
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd30
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml41
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd25
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml41
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd79
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd65
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml32
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd77
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd68
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml30
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd59
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd59
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml28
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd81
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml28
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd81
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd196
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml9
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml8
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml11
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml42
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml8
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml3
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml15
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml15
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jarbin1433 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml9
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl27
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml10
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff2
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd390
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/plugin.xml33
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java155
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java34
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java149
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java152
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java82
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java68
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java162
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java96
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/test.xml59
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF35
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/plugin.xml20
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMValidatorTestProject.zipbin975 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zipbin1350 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zipbin1257 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java185
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java145
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java77
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java80
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java164
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/TestCleanupProcessorXML.java159
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/fixdecl.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/noheader.xml4
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java325
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java149
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java102
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorValidationTest.java176
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java101
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java160
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java323
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java336
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java115
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java502
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java114
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java78
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java136
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java92
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java164
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java65
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeContainerTests.java89
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java184
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/RegionChangedAdapterNotificationTests.java786
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java258
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java395
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml10
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml11
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml17
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml20
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml16
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml6
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml14
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml6
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml1
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml1
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml3
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml3
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml33
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml28
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml31
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml6
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml14
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml14
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml18
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText-formated.xml21
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText.xml18
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText-formated.xml33
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText.xml27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText-formated.xml21
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText-formated.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml17
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText-formated.xml18
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText.xml18
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText-formated.xml27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText.xml27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText-formated.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText-formated.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml13
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml9
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled-fmt.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment-fmt.xml10
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment.xml10
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment-fmt.xml5
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment.xml5
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled-fmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml30
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml28
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml14
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd5
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml48
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml43
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml36
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml47
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml32
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml28
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml37
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml15
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml16
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd28
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl23
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java61
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java275
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java148
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java333
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java129
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java356
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml8100
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml0
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml4
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd59
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java88
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java47
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java166
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java374
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java71
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java52
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/testfiles.zipbin64336 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.classpath11
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.project27
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF26
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/about.html34
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/build.properties19
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt857
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt343
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java253
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java68
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java55
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java30
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java409
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java84
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java150
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java109
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java73
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java28
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java44
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java614
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java717
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java536
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java711
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java210
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java207
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java50
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java337
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java54
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java127
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java192
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java380
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java275
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/test.xml115
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles.zipbin147499 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm40
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp40
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css46
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css7
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.cssbin39 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.cssbin41 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.cssbin39 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.cssbin111 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.cssbin109 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-CESU-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-COMPOUND_TEXT.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GB2312.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1006.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1041.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1043.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1046.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1046S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1088.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1098.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1114.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1115.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1124.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1363.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1363C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1370.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1381.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1383.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1386.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-33722C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-437.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-737.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-775.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-808.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-850.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-852.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-855.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-856.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-857.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-858.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-859.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-860.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-861.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-862.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-863.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-864.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-864S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-865.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-866.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-867.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-868.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-869.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-874.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-897.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-921.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-922.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-932.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-942.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-942C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-943.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-943C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-948.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-949C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-954C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-CN-GB.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-10.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-14.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-16.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-6S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0212.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-RU.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-U.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KSC5601.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacArabic.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCentralEurope.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCroatian.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCyrillic.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacGreek.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacHebrew.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacIceland.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacRoman.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacRomania.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacThai.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacTurkish.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacUkraine.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-PTCP154.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32.xmlbin424 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32BE.xmlbin432 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32LE.xmlbin432 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-8J.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-X-UnicodeBig.xmlbin224 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-X-UnicodeLittle.xmlbin230 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-hp-roman8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1256S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-874.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-932.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/testMethods.text525
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Big5-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-JIS_X0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-JIS_X0212-1990.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-31j.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-EUC-TW.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-MS950-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-euc-jp-linux.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-mswin-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/testMethods.text193
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Big5-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-JIS_X0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-JIS_X0212-1990.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-31j.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-EUC-TW.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-MS950-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-euc-jp-linux.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-mswin-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/testMethods.text193
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html664
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html665
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html18
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html19
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.htmlbin509 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.htmlbin503 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.htmlbin573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.htmlbin573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp122
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp18
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp21
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp356
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjspbin78 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jspbin118 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jspbin747 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jspbin990 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jspbin522 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jspbin478 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jspbin721 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jspbin721 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jspbin649 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp122
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp121
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp19
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp194
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xmlbin35914 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml13
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml13
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml356
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xmlbin118 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xmlbin990 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xmlbin522 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xmlbin466 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xmlbin169 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xmlbin114 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xmlbin173 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xmlbin115 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.cvsignore6
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF29
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/build.properties21
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gifbin197 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/plugin.properties17
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/plugin.xml78
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpgbin37408 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpgbin42622 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpgbin15318 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpgbin38739 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpgbin15778 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpgbin10692 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml10
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpgbin29241 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml0
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpgbin58872 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpgbin35336 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpgbin33482 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpgbin28667 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpgbin14889 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpgbin26186 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpgbin19083 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpgbin41573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gifbin3067 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpgbin17803 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java212
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java112
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java54
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java153
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java70
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestNewXMLGenerator.java144
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java148
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java161
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java223
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java285
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java78
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java32
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java484
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLDiff.java194
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java115
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java46
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java116
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java64
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java114
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java94
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java249
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java252
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java500
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/test.xml114
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-0.xml30
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-1.xml30
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-2.xml31
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-20.xml37
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-31.xml39
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-8.xml30
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema2-BillInfo-31.xml4
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml10
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd31
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1.xml9
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1Schema.xsd10
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Schema1.xsd162
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/Schema2.xsd51
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingCommentTest.xml34
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest1.xml21
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest2.xml21
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XSLFoldingTest1.xsl8
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml6
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml33
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF22
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/build.properties18
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java144
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java185
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java48
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java56
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java42
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java37
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java165
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java52
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java112
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java26
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java63
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java41
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java28
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java58
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java95
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java186
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java70
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java133
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java616
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java70
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java138
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java38
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml7
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml8
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd11
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd11
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml5
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd15
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd30
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd50
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml5
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd12
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml13
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd16
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml0
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml6
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd10
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml5
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml6
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml8
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd7
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF18
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/build.properties8
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java36
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java53
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java436
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java89
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/test.xml115
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd29
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd29
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd69
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd52
-rw-r--r--tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd41
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs70
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/build.properties21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java94
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java47
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java48
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java224
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java224
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java314
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java283
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/test.xml114
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd36
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd30
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd35
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd24
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd32
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-CT.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-Group.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-CT.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-Group.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-List.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Restriction.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union1.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union2.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union3.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/Import1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Used/Main.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType1.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType2.xsd31
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType3.xsd36
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd30
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd33
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-CT.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-Group.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-CT.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-Group.xsd22
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd22
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-List.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Restriction.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union1.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union2.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union3.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/Include1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Unused/Main.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Used/Main.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Unused/Main.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Used/Main.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType2.xsd30
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType3.xsd35
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-GlobalElementType.xsd11
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType1.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType2.xsd15
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType2.xsd24
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType3.xsd32
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-GlobalElementType.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-CT.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-Group.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-CT.xsd14
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-Group.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-CT.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-Group.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-CT.xsd20
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-Group.xsd21
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalElementType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-List.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Restriction.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union1.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union2.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union3.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalAttributeType.xsd10
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalElementType.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-List.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalAttributeType1.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType1.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType2.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Restriction.xsd12
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union1.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union2.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union3.xsd18
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include2.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include3.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include4.xsd40
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include5.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include6.xsd44
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main001.xsd16
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main002.xsd26
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import001.xsd25
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import002.xsd23
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import003.xsd31
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Test.xsd26
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import2.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import3.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import4.xsd42
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import5.xsd41
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import6.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include2.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include3.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include4.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include5.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include6.xsd39
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main001.xsd7
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main002.xsd8
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main003.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main004.xsd9
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main005.xsd13
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main006.xsd17
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main007.xsd19
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main008.xsd23
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009.xsd25
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009a.xsd23
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009b.xsd27
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009c.xsd27
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009d.xsd25
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009e.xsd25
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009f.xsd31
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009g.xsd27
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009h.xsd29
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Import1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Include1.xsd38
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main001.xsd111
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main002.xsd37
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main003.xsd110
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main004.xsd111
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main005.xsd111
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main006.xsd99
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main007.xsd100
-rw-r--r--tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main008.xsd100
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.classpath11
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs16
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF22
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/build.properties17
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java118
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java161
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java28
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java82
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java25
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java42
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java37
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java46
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java338
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java240
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java1086
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java65
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/test.xml116
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log8
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/ImportQuoteInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd0
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd66
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd7
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd8
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd24
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd8
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd7
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd2
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd50
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/ImportQuoteInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd3
2264 files changed, 0 insertions, 111988 deletions
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index 62260a46f..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_tests.feature_*.zip
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d0a..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 27affc577..000000000
--- a/features/org.eclipse.wst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_tests.feature/epl-v10.html b/features/org.eclipse.wst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.web_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.properties b/features/org.eclipse.wst.web_tests.feature/feature.properties
deleted file mode 100644
index 6c7982ccb..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index fd4fd5f1a..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.wst.jsdt.web.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0ea..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287f0..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 27affc577..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.properties b/features/org.eclipse.wst.xml_tests.feature/feature.properties
deleted file mode 100644
index bce1c9126..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index d9b1edc2f..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.dtd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.catalog.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index 303e66574..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c09..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350fb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 309a22e6c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,28 +0,0 @@
-#Sun Aug 23 21:30:48 EDT 2009
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.illegal-att-value=0
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.missing-version-export-package=2
-compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
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
deleted file mode 100644
index 30fcbd8c7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: jspcoretests.jar
-Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.core.tests.cleanupformat,
- org.eclipse.jst.jsp.core.tests.cleanupformat.testfiles,
- org.eclipse.jst.jsp.core.tests.contentmodels,
- org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom,
- org.eclipse.jst.jsp.core.tests.model,
- org.eclipse.jst.jsp.core.tests.source,
- org.eclipse.jst.jsp.core.tests.taglibindex,
- org.eclipse.jst.jsp.core.tests.translation,
- org.eclipse.jst.jsp.core.tests.util,
- org.eclipse.jst.jsp.core.tests.validation,
- org.eclipse.jst.jsp.css.core.tests.source,
- org.eclipse.jst.jsp.css.core.tests.testfiles,
- org.eclipse.jst.jsp.css.core.tests.testfiles.results
-Require-Bundle: org.junit;bundle-version=3.8.2,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.css.core,
- com.ibm.icu,
- org.eclipse.wst.validation,
- org.eclipse.jdt.core,
- org.eclipse.wst.sse.ui
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/about.html b/tests/org.eclipse.jst.jsp.core.tests/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the 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.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index 5c6ba20a9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- jspcoretests.jar,\
- META-INF/,\
- about.html,\
- testfiles/,\
- plugin.properties,\
- src/org/eclipse/jst/jsp/css/core/tests/testfiles/
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
-src.includes = test.xml,\
- testfiles/,\
- about.html
diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties b/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
deleted file mode 100644
index 93d3d51ea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Core Tests \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
deleted file mode 100644
index 139f20455..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
+++ /dev/null
@@ -1,146 +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.jst.jsp.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentLoader;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the JSP Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class JSPCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.jst.jsp.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, JSPCorePreferenceNames.DEFAULT_EXTENSION);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- String defaultValue = null;
-
- String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS, Boolean.toString(true));
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForJSP.ContentTypeID_JSP);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForJSP.ContentTypeID_JSP);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- JSPDocumentLoader loader = new JSPDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index 7bccb263f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestFixedCMDocuments;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestTaglibCMTests;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-import org.eclipse.jst.jsp.core.tests.dom.TestImportedNodes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelIncludes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelRelease;
-import org.eclipse.jst.jsp.core.tests.model.TestModelWithNoFile;
-import org.eclipse.jst.jsp.core.tests.source.JSPTokenizerTest;
-import org.eclipse.jst.jsp.core.tests.translation.JSPJavaTranslatorCoreTest;
-import org.eclipse.jst.jsp.core.tests.translation.JSPTranslatorPersistenceTest;
-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;
-
-public class JSPCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new JSPCoreTestSuite();
- }
-
- public JSPCoreTestSuite() {
- super("JSP Core Test Suite");
-
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- String wtp_autotest_noninteractive = null;
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- addTest(TestCeanupFormat.suite());
- addTest(ModelCloneSuite.suite());
- addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
- addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
- addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- addTest(new TestSuite(TestModelRelease.class, "Model Tests"));
- addTest(new TestSuite(TestModelWithNoFile.class, "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(JSPedCSSSourceParserTest.class, "Special Parsing Tests for JSP-CSS content"));
- addTest(new TestSuite(JSPJavaValidatorTest.class, "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(JSPTranslatorPersistenceTest.suite());
-
- 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/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 10dda5f6c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,96 +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.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCoreTestsPlugin extends Plugin {
- //The shared instance.
- private static JSPCoreTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index 58eabf640..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,143 +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.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
- private static Bundle fBundle = fPlugin.getBundle();
- private static final String fPluginId = fBundle.getSymbolicName();
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, fPluginId, severity, message, exception);
- fPlugin.getLog().log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, fPluginId, IStatus.OK, message, exception);
- fPlugin.getLog().log(statusObj);
- }
- }
-
- /**
- * @return true if the plugin for this logger is debugging
- */
- public static boolean isDebugging() {
- return fPlugin.isDebugging();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(fPluginId + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java
deleted file mode 100644
index 57f180c84..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.taglibindex.TestIndex;
-
-public class ManyTestIndex extends TestSuite {
- public static Test suite() {
- return new ManyTestIndex();
- }
-
- public ManyTestIndex() {
- super("SSE JSP Core Test Suite");
-
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- String wtp_autotest_noninteractive = null;
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- for (int i = 0; i < 25; i++) {
- addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests " + (i + 1)));
- }
-
- 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/ModelCloneSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
deleted file mode 100644
index 183caf93a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneSuite extends TestSuite {
- public static Test suite() {
- return new ModelCloneSuite();
- }
-
- public ModelCloneSuite() {
- super("ModelCloneSuite");
-
- addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index 794f832ac..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ProjectUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ProjectUtil.java
deleted file mode 100644
index 5d96f8d65..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ProjectUtil.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-/**
- *
- * @see org.eclipse.wst.xml.ui.tests.ProjectUtil Similar Project Utils
- * @see org.eclipse.wst.css.ui.tests.ProjectUtil Similar Project Utils
- * @see org.eclipse.wst.dtd.ui.tests.ProjectUtil Similar Project Utils
- */
-public class ProjectUtil {
- 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;
- }
-
- /**
- * @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();
- }
- }
-
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = JSPCoreTestsPlugin.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);
- }
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.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;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
deleted file mode 100644
index 7a4df4182..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class TestCeanupFormat extends TestSuite {
- public static Test suite() {
- return new TestCeanupFormat();
- }
-
- public TestCeanupFormat() {
- super("TestCeanupFormat");
-
- addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index f609b6cfe..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- *
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
- /**
- * Constructor for TestModelManager.
- *
- * @param name
- */
- public TestModelManager(String name) {
- super(name);
- }
-
- public void testModelManager() throws IOException {
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- assertTrue("modelManager must not be null", modelManager != null);
-
- try {
- model = modelManager.getModelForEdit(getClass().getName() + "." + getName() + ".test.jsp", new NullInputStream(), null);
- assertTrue("basic JSP empty model could not be created", model != null);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- 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;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- model = modelManager.getModelForEdit((String) null, null, null);
- } catch (IllegalArgumentException exception) {
- e = exception;
- assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index 6539f3f9d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,113 +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.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestStructuredDocumentClone extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestStructuredDocumentClone(String name) {
- super(name);
- }
-
- public static Test getTest() {
- return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
- }
-
- public void testCloneStructuredDocumentXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- String testContent = "<@! page contentType=\"text/xml\" @>";
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index ad456c99b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
-// private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
- protected IModelManager fModelManager = null;
- protected CleanupProcessorXML fCleanupProcessor = null;
- protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
- private StringCompareUtil fStringCompareUtil;
-
- public CleanupTester(String name) {
- super(name);
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get cleanup processor
- fCleanupProcessor = new CleanupProcessorXML();
-
- // get HTML cleanup processor
- fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
- }
-
- protected void setUp() throws Exception {
- fStringCompareUtil = new StringCompareUtil();
- }
-
- public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // use for debugging
- // String precleaned = structuredModel.getStructuredDocument().get();
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupInsertTags() throws IOException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("small2.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(true);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(false);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(true);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small2.afterCompressEmptyElementTags-newfmt.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- // public void testCleanupJSPEmptyTags1() throws
- // UnsupportedEncodingException, IOException {
- // // get model
- // IStructuredModel structuredModel = getModel("login.jsp");
- //
- // // init CleanupPreferences
- // IStructuredCleanupPreferences cleanupPreferences =
- // fHTMLCleanupProcessor.getCleanupPreferences();
- // cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
- // cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
- // cleanupPreferences.setCompressEmptyElementTags(false);
- // cleanupPreferences.setInsertRequiredAttrs(false);
- // cleanupPreferences.setInsertMissingTags(true);
- // cleanupPreferences.setQuoteAttrValues(true);
- // cleanupPreferences.setFormatSource(true);
- // cleanupPreferences.setConvertEOLCodes(false);
- //
- // // cleanup
- // ((AbstractStructuredCleanupProcessor)
- // fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- // fHTMLCleanupProcessor.cleanupModel(structuredModel);
- // ((AbstractStructuredCleanupProcessor)
- // fHTMLCleanupProcessor).refreshCleanupPreferences = true;
- //
- // // compare
- // String cleaned = structuredModel.getStructuredDocument().get();
- // String expectedFileName = "login.afterCleanup.jsp";
- // String expected = getFile(expectedFileName);
- // compare(expectedFileName, expected, cleaned);
- //
- // // release model
- // structuredModel.releaseFromRead();
- // }
- //
- // public void testCleanupJSPEmptyTags2() throws
- // UnsupportedEncodingException, IOException {
- // // get model
- // IStructuredModel structuredModel = getModel("subscription.jsp");
- //
- // // init CleanupPreferences
- // IStructuredCleanupPreferences cleanupPreferences =
- // fHTMLCleanupProcessor.getCleanupPreferences();
- // cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
- // cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
- // cleanupPreferences.setCompressEmptyElementTags(false);
- // cleanupPreferences.setInsertRequiredAttrs(false);
- // cleanupPreferences.setInsertMissingTags(true);
- // cleanupPreferences.setQuoteAttrValues(true);
- // cleanupPreferences.setFormatSource(true);
- // cleanupPreferences.setConvertEOLCodes(false);
- //
- // // cleanup
- // ((AbstractStructuredCleanupProcessor)
- // fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- // fHTMLCleanupProcessor.cleanupModel(structuredModel);
- // ((AbstractStructuredCleanupProcessor)
- // fHTMLCleanupProcessor).refreshCleanupPreferences = true;
- //
- // // compare
- // String cleaned = structuredModel.getStructuredDocument().get();
- // String expectedFileName = "subscription.afterCleanup.jsp";
- // String expected = getFile(expectedFileName);
- // compare(expectedFileName, expected, cleaned);
- //
- // // release model
- // structuredModel.releaseFromRead();
- // }
-
- protected String readFile(String fileName) throws IOException {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[2048];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer, 0, bytesRead);
- // bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
- }
- finally {
- if (fileInputStream != null)
- fileInputStream.close();
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- // since in test code, no need to catch this
- // catch (Exception exception) {
- // Logger.logException(exception);
- // }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- StringWriter s = new StringWriter();
- exception.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) throws IOException {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String cleaned) {
- assertTrue("Cleaned up document differs from the expected.\nExpected Contents:\n" + expected + "\nActual Contents:\n" + cleaned, fStringCompareUtil.equalsIgnoreLineSeperator(expected, cleaned));
-// if (cleaned.compareTo(expected) != 0) {
-// if (PRINT_FAILED_FORMAT_TESTS) {
-// System.out.println();
-// System.out.println(testcaseName + " failed");
-// System.out.println("========== expected file ==========");
-// System.out.println(expected);
-// System.out.println("========== cleaned file ==========");
-// System.out.println(cleaned);
-// System.out.println("========== expected file ==========");
-// String expectedString = StringUtils.replace(expected, "\r", "\\r");
-// expectedString = StringUtils.replace(expectedString, "\n", "\\n");
-// expectedString = StringUtils.replace(expectedString, "\t", "\\t");
-// System.out.println(expectedString);
-// System.out.println("========== cleaned file ==========");
-// String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
-// cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
-// cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
-// System.out.println(cleanedString);
-// System.out.println("=======================================");
-// }
-// assertTrue(false);
-// }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index 348a3d815..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
- private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
- protected IModelManager fModelManager = null;
- protected FormatProcessorXML fFormatProcessor = null;
- protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
- public FormatTester(String name) {
- super(name);
-
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get format processor
- fFormatProcessor = new FormatProcessorXML();
-
- // get HTML format processor
- fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
- }
-
- public void testFormat261968() {
- // get model
- IStructuredModel structuredModel = getModel("261968.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "261968.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpen() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpen.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpen.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpenTagClose() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpenTagClose.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTags() {
- // get model
- IStructuredModel structuredModel = getModel("tags.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tags.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatEmpty() {
- // get model
- IStructuredModel structuredModel = getModel("empty.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneSpace() {
- // get model
- IStructuredModel structuredModel = getModel("oneSpace.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneChar() {
- // get model
- IStructuredModel structuredModel = getModel("oneChar.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "oneChar.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpaces() {
- // get model
- IStructuredModel structuredModel = getModel("spaces.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatChars() {
- // get model
- IStructuredModel structuredModel = getModel("chars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpacesAndChars() {
- // get model
- IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormat() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLines() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatBlockComments() {
- // get model
- IStructuredModel structuredModel = getModel("blockComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "blockComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineComments() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testHTMLFormat() {
- // get model
- IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
- fHTMLFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- protected String readFile(String fileName) {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[1024];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer);
- bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
-
- if (fileInputStream != null)
- fileInputStream.close();
- }
- catch (IOException exception) {
- StringWriter s = new StringWriter();
- exception.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- catch (Exception exception) {
- StringWriter s = new StringWriter();
- exception.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- StringWriter s = new StringWriter();
- exception.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String formatted) {
- if (formatted.compareTo(expected) != 0) {
- if (PRINT_FAILED_FORMAT_TESTS) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== formatted file ==========");
- System.out.println(formatted);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== formatted file ==========");
- String formattedString = StringUtils.replace(formatted, "\r", "\\r");
- formattedString = StringUtils.replace(formattedString, "\n", "\\n");
- formattedString = StringUtils.replace(formattedString, "\t", "\\t");
- System.out.println(formattedString);
- System.out.println("=======================================");
- }
- assertEquals(expected, formatted);
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 048388219..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>
- /t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2>
- </t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- t3>
- </t3>
-</tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>/t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2></t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 > <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 ><t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 >t3></t3>
-</tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index cbace4dac..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
- action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
- height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG
- src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java
- servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to
- store the counter. If you have not already installed and configured
- your database for the WebSphere samples, refer to <A
- href="../Configuration/DBConfig.html">Database Configuration</A> for
- instructions. </FONT></P>
- <P><FONT size="-1"><A
- href="javascript:document.myForm.submit()" target="_self"> <B>Run
- this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
- name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a
- counter every time it is invoked </FONT>
- <UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that
- invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides
- information about the servlet to the WebSphere Application
- Server </FONT>
- </UL>
- </UL>
- <P><FONT size="-1">The Application Server processes
- .jsp files with its JSP 1.0 processor servlet. It handles the
- &lt;jsp:include ... /&gt; tag as a server-side include, replacing
- the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
- cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
- cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
- width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1"> How to use this sample on your
- web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any
- HTML page you have on your site. Rename the HTML file with a .jsp
- file extension, put the Java .class and .servlet files in the
- classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca180a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
- <HEAD>
-<META http-equiv
-=
-"Content-Type"
-content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name = "myForm" method="post" action="../Controllers/SampleController">
- <TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2">
- <IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the &lt;jsp:include ... /&gt; tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b841349..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
- <!--
- No space
- -->
- <!--
- OneSpace
- -->
- <!--
- One tab
- -->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.-->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
-
- -->
- <!--
-
-
-
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
-
-
-
- -->
- <item type="appetizer">
- <!-- a
- b-->
- <!-- a
- b -->
- <!--
- a
- b-->
- <!--
- a
- b -->
- <!--
- a
- b
- -->
- <!-- a
- b
- -->
- <!--
-
-
-
- a
-
-
-
- b
-
-
-
- -->
- <desc>Prosciutto ham with melon</desc>
- <!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 296987833..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <!-- comment on a new line -->
- <menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
- One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
- <item type="appetizer">
-<!-- a
- b-->
-<!-- a
- b -->
-<!--
-a
- b-->
-<!--
-a
- b -->
-<!--
-a
- b
--->
-<!-- a
- b
- -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
- <desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f84a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index afb30ac81..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-<HTML></HTML>
-</HTML> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a0020..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4bea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price units="usd" units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5e6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price
- units="usd"
- units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bcf4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc> <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/> <!-- inline comment after tag --></price>
-<price units="usd"> <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982d9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount=promotion price=57>
- <description>A wedding ring</description></Item></Invoice> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812da0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber="custNumber"/>
- <BillTo custNumber= "custNumber"/>
- <BillTo custNumber ="custNumber"/>
- <BillTo custNumber = "custNumber"/>
- <BillTo custNumber="custNumber" name="Craig" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name="name" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name = "Craig" phone="phone"/>
- <BillTo custNumber="custNumber" name="name" phone="phone"/>
- <BillTo custNumber = "X5739" name="Craig Salter" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount="promotion" price="57">
- <description>A wedding ring</description></Item></Invoice> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b59f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </Header>
- <Item discount=promotion price=57>
- <description>A wedding ring \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c976..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
- type="hidden" name="command"
- value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
- name="previous_page" value="Login/Login.jsp"> <A
- href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40"
- value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40"
- value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67bd8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe2a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecba6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7fd6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name" v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e15..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
- xmi.version="1.0"
- timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel
- xmi.name="UML"
- xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1"
- xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension
- xmi.extender="IXT"
- xmi.extenderID="">
- <ixts s="IDL">
- <ixttv
- t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D" />
- <ixttv
- t="is_unit"
- v="TRUE" />
- <ixttv
- t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv
- t="is_loaded"
- v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv
- t="charSet"
- v="0" />
- <ixttv
- t="version"
- v="43" />
- <ixttv
- t="_written"
- v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5cc0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>
- XMI Toolkit
- </XMI.exporter>
-
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public"/>
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
- />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D"
- />
- <ixttv
- t="is_unit"
- v="TRUE"
- />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;"
- />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" /></ixts></XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml
deleted file mode 100644
index 8a49f9e88..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
- <XMI.content />
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml
deleted file mode 100644
index 7b9be5a14..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb569..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
- abc \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0f8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Create">
- <TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Delete">
- <TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Edit">
- <TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
- <html:hidden property="action" />
- <TABLE border="0" width="100%">
-
- <TR>
- <TH align="right"><bean:message key="prompt.username" />:</TH>
- <TD align="left"><bean:write name="user" property="username"
- filter="true" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
- <TD align="left"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:text property="host" size="50" />
- </logic:equal> <logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:hidden property="host" write="true" />
- </logic:notEqual></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
- <TD align="left"><html:text property="username" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
- <TD align="left"><html:password property="password" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
- <TD align="left"><html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label" />
- </html:select></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
- <TD align="left"><html:checkbox property="autoConnect" /></TD>
- </TR>
-
- <TR>
- <TD align="right"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal></TD>
- <TD align="left"><logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset" />
- </html:reset>
- </logic:notEqual> &nbsp; <html:cancel>
- <bean:message key="button.cancel" />
- </html:cancel></TD>
- </TR>
-
- </TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea48..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
- <tr>
- <th align="right">
- <bean:message key="prompt.username"/>:
- </th>
- <td align="left">
- <bean:write name="user" property="username" filter="true"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailHostname"/>:
- </th>
- <td align="left">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:text property="host" size="50"/>
- </logic:equal>
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:hidden property="host" write="true"/>
- </logic:notEqual>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailUsername"/>:
- </th>
- <td align="left">
- <html:text property="username" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailPassword"/>:
- </th>
- <td align="left">
- <html:password property="password" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailServerType"/>:
- </th>
- <td align="left">
- <html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.autoConnect"/>:
- </th>
- <td align="left">
- <html:checkbox property="autoConnect"/>
- </td>
- </tr>
-
- <tr>
- <td align="right">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- </td>
- <td align="left">
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset"/>
- </html:reset>
- </logic:notEqual>
- &nbsp;
- <html:cancel>
- <bean:message key="button.cancel"/>
- </html:cancel>
- </td>
- </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa78456..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-< \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e487a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235dfa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949bb5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag > \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
deleted file mode 100644
index 1f679b9c2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
+++ /dev/null
@@ -1,284 +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.jst.jsp.core.tests.contentmodels;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.JSPCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.contentmodel.JSP11Namespace;
-import org.eclipse.wst.html.core.internal.contentmodel.JSP20Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-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.provisional.contentmodel.CMDocType;
-
-public class TestFixedCMDocuments extends TestCase {
-
- public TestFixedCMDocuments(String name) {
- super(name);
- }
-
- /**
- * @param cm_doc_type
- * @param elementName
- * @param attrNameImport
- */
- private void checkAttrNames(String documentKey, String elementName, String[] attrNames) {
- CMDocument document = JSPCMDocumentFactory.getCMDocument(documentKey);
- CMNode elementDeclaration = document.getElements().getNamedItem(elementName);
- assertEquals("not an element declaration:" + elementDeclaration, CMNode.ELEMENT_DECLARATION, elementDeclaration.getNodeType());
- assertNotNull("missing element declaration:" + elementName, elementDeclaration);
-
- CMNamedNodeMap attributes = ((CMElementDeclaration) elementDeclaration).getAttributes();
-
- for (int i = 0; i < attrNames.length; i++) {
- assertNotNull("missing attribute declaration:" + attrNames[i], attributes.getNamedItem(attrNames[i]));
- }
- assertEquals("Attributes defined in content model that are not expected by the test", attributes.getLength(), attrNames.length);
- }
-
- private void checkDocument(Object documentKey) {
- CMDocument document = JSPCMDocumentFactory.getCMDocument(documentKey.toString());
- assertNotNull("missing doc:" + documentKey.toString(), document);
- CMNamedNodeMap elements = document.getElements();
- for (int i = 0; i < elements.getLength(); i++) {
- CMNode item = elements.item(i);
- verifyElementDeclarationHasName(item);
- }
- }
-
- public void testAttributesOnJSP11Forward() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
- }
-
- public void testAttributesOnJSP11GetProperty() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
- }
-
- public void testAttributesOnJSP11Include() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
- }
-
- public void testAttributesOnJSP11IncludeDirective() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
- }
-
- public void testAttributesOnJSP11PageDirective() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING});
- }
-
- public void testAttributesOnJSP11Param() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnJSP11Plugin() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL});
- }
-
- public void testAttributesOnJSP11Root() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
- }
-
-// public void testAttributesOnJSP21PageDirective() {
-// checkAttrNames(CMDocType.JSP21_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, JSP20Namespace.ATTR_NAME_TRIM_DIRECTIVE_WHITESPACES, JSP20Namespace.ATTR_NAME_ISELIGNORED});
-// }
-
- public void testAttributesOnJSP11SetProperty() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnJSP11TaglibDirective() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX});
- }
-
- public void testAttributesOnJSP11UseBean() {
- checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
- }
-
- public void testAttributesOnJSP20Attribute() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_TRIM});
- }
-
- public void testAttributesOnJSP20Element() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.ELEMENT, new String[]{JSP11Namespace.ATTR_NAME_NAME});
- }
-
-
- public void testAttributesOnJSP20Forward() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
- }
-
- public void testAttributesOnJSP20GetProperty() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
- }
-
- // JSP 2.1 attributes on tag directives
-// public void testAttributesOnTAG21TagDirective() {
-// checkAttrNames(CMDocType.TAG21_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_TAG, new String[]{JSP20Namespace.ATTR_NAME_DISPLAY_NAME, JSP20Namespace.ATTR_NAME_BODY_CONTENT, JSP20Namespace.ATTR_NAME_DYNAMIC_ATTRIBUTES, JSP20Namespace.ATTR_NAME_SMALL_ICON, JSP20Namespace.ATTR_NAME_LARGE_ICON, JSP20Namespace.ATTR_NAME_DESCRIPTION, JSP20Namespace.ATTR_NAME_EXAMPLE, JSP20Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED, JSP20Namespace.ATTR_NAME_DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, JSP20Namespace.ATTR_NAME_TRIM_DIRECTIVE_WHITESPACES});
-// }
-
- public void testAttributesOnJSP20Include() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
- }
-
- public void testAttributesOnJSP20IncludeDirective() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
- }
-
- public void testAttributesOnJSP20Output() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.OUTPUT, new String[]{JSP20Namespace.ATTR_NAME_OMIT_XML_DECL, JSP20Namespace.ATTR_NAME_DOCTYPE_PUBLIC, JSP20Namespace.ATTR_NAME_DOCTYPE_ROOT_ELEMENT, JSP20Namespace.ATTR_NAME_DOCTYPE_SYSTEM});
- }
-
- public void testAttributesOnJSP20PageDirective() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED});
- }
-
- public void testAttributesOnJSP20Param() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnJSP20Plugin() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL, JSP20Namespace.ATTR_NAME_MAYSCRIPT});
- }
-
- public void testAttributesOnJSP20Root() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
- }
-
- public void testAttributesOnJSP20SetProperty() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnJSP20TaglibDirective() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX, JSP20Namespace.ATTR_NAME_TAGDIR});
- }
-
- public void testAttributesOnJSP20UseBean() {
- checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
- }
-
- public void testAttributesOnTAG20Attribute() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_TRIM});
- }
-
- public void testAttributesOnTAG20AttributeDirective() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_REQUIRED, JSP20Namespace.ATTR_NAME_FRAGMENT, JSP20Namespace.ATTR_NAME_RTEXPRVALUE, JSP20Namespace.ATTR_NAME_TYPE, JSP20Namespace.ATTR_NAME_DESCRIPTION});
- }
-
- public void testAttributesOnTAG20DoBody() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DOBODY, new String[]{JSP20Namespace.ATTR_NAME_VAR, JSP20Namespace.ATTR_NAME_VARREADER, JSP11Namespace.ATTR_NAME_SCOPE});
- }
-
- public void testAttributesOnTAG20Element() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.ELEMENT, new String[]{JSP11Namespace.ATTR_NAME_NAME});
- }
-
- public void testAttributesOnTAG20Forward() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
- }
-
- public void testAttributesOnTAG20GetProperty() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
- }
-
- public void testAttributesOnTAG20Include() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
- }
-
- public void testAttributesOnTAG20IncludeDirective() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
- }
-
- public void testAttributesOnTAG20Invoke() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.INVOKE, new String[]{JSP20Namespace.ATTR_NAME_FRAGMENT, JSP20Namespace.ATTR_NAME_VAR, JSP20Namespace.ATTR_NAME_VARREADER, JSP11Namespace.ATTR_NAME_SCOPE});
- }
-
- public void testAttributesOnTAG20Output() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.OUTPUT, new String[]{JSP20Namespace.ATTR_NAME_OMIT_XML_DECL, JSP20Namespace.ATTR_NAME_DOCTYPE_PUBLIC, JSP20Namespace.ATTR_NAME_DOCTYPE_ROOT_ELEMENT, JSP20Namespace.ATTR_NAME_DOCTYPE_SYSTEM});
- }
-
- public void testAttributesOnTAG20Param() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnTAG20Plugin() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL, JSP20Namespace.ATTR_NAME_MAYSCRIPT});
- }
-
- public void testAttributesOnTAG20Root() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
- }
-
- public void testAttributesOnTAG20SetProperty() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
- }
-
- public void testAttributesOnTAG20TagDirective() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_TAG, new String[]{JSP20Namespace.ATTR_NAME_DISPLAY_NAME, JSP20Namespace.ATTR_NAME_BODY_CONTENT, JSP20Namespace.ATTR_NAME_DYNAMIC_ATTRIBUTES, JSP20Namespace.ATTR_NAME_SMALL_ICON, JSP20Namespace.ATTR_NAME_LARGE_ICON, JSP20Namespace.ATTR_NAME_DESCRIPTION, JSP20Namespace.ATTR_NAME_EXAMPLE, JSP20Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED});
- }
-
- public void testAttributesOnTAG20TaglibDirective() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX, JSP20Namespace.ATTR_NAME_TAGDIR});
- }
-
- public void testAttributesOnTAG20UseBean() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
- }
-
- public void testAttributesOnTAG20VariableDirective() {
- checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_VARIABLE, new String[]{JSP20Namespace.ATTR_NAME_NAME_GIVEN, JSP20Namespace.ATTR_NAME_NAME_FROM_ATTRIBUTE, JSP20Namespace.ATTR_NAME_ALIAS, JSP20Namespace.ATTR_NAME_VARIABLE_CLASS, JSP20Namespace.ATTR_NAME_DECLARE, JSP11Namespace.ATTR_NAME_SCOPE, JSP20Namespace.ATTR_NAME_DESCRIPTION});
- }
-
- public void testCHTMLdocument() {
- checkDocument(CMDocType.CHTML_DOC_TYPE);
- }
-
- public void testHTML4document() {
- checkDocument(CMDocType.HTML_DOC_TYPE);
- }
-
- public void testJSP11document() {
- checkDocument(CMDocType.JSP11_DOC_TYPE);
-
- }
-
- public void testJSP12document() {
- checkDocument(CMDocType.JSP12_DOC_TYPE);
-
- }
-
- public void testJSP20document() {
- checkDocument(CMDocType.JSP20_DOC_TYPE);
- }
-
- public void testTag20document() {
- checkDocument(CMDocType.TAG20_DOC_TYPE);
- }
-
- private void verifyAttributeDeclaration(CMElementDeclaration elemDecl, CMNode attr) {
- assertTrue(attr.getNodeType() == CMNode.ATTRIBUTE_DECLARATION);
- assertNotNull("no name on an attribute declaration", attr.getNodeName());
- CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attr;
- assertNotNull("no attribute 'type' on an attribute declaration " + elemDecl.getNodeName() + "/" + attr.getNodeName(), attrDecl.getAttrType());
- }
-
- private void verifyElementDeclarationHasName(CMNode item) {
- assertTrue(item.getNodeType() == CMNode.ELEMENT_DECLARATION);
- assertNotNull("no name on an element declaration", item.getNodeName());
- CMNamedNodeMap attrs = ((CMElementDeclaration) item).getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- CMNode attr = attrs.item(i);
- verifyAttributeDeclaration(((CMElementDeclaration) item), attr);
- }
- }
-}
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
deleted file mode 100644
index 74633d735..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,194 +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.jst.jsp.core.tests.contentmodels;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.Test;
-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.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.provisional.JSP20Namespace;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class TestTaglibCMTests extends TestCase {
- private static final String TESTFILES_PATHSTRING = "/testfiles/";
- private static final String PROJECT_NAME = "testLoadTaglibs";
- private static final String TAG_NAME = "logic:empty";
-
- public TestTaglibCMTests(String name) {
- super(name);
- }
-
- public TestTaglibCMTests() {
- super();
- }
-
- public static Test suite() {
- return new TestTaglibCMTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace(TESTFILES_PATHSTRING + PROJECT_NAME, Path.ROOT.append(PROJECT_NAME).toString());
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", Path.ROOT.append(PROJECT_NAME).append("web stuff/WEB-INF/lib/struts.jar").toString());
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- }
- assertTrue(project.isAccessible());
- }
-
- 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 {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
- NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
- assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
- assertNotNull("no CMElementDelcaration for " + TAG_NAME, declaration);
- assertEquals("qualified name from element declaration was different", TAG_NAME, declaration.getNodeName());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- 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 {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
- NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
- assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
- assertNotNull("no CMElementDeclaration for " + TAG_NAME, declaration);
- assertEquals("qualified name from element declaration was different", TAG_NAME, declaration.getNodeName());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testTagFileReferencedInTLD() throws IOException, CoreException {
- String DPROJECT_NAME = "DynamicWebProject";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(DPROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(DPROJECT_NAME, null, null);
- BundleResourceUtil.copyBundleZippedEntriesIntoWorkspace("/testfiles/jspErrorProject.zip", Path.ROOT);
- }
- 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 {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
- String DTAGNAME = "date:returndate";
- NodeList returnDates = model.getDocument().getElementsByTagName(DTAGNAME);
- assertNotNull("date:returndate was missing from document", returnDates.item(0));
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) returnDates.item(0)).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) returnDates.item(0));
- assertNotNull("no CMElementDeclaration for date:returndate", declaration);
- assertEquals("qualified name from element declaration was different", DTAGNAME, declaration.getNodeName());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testTagFileHasHTMLContentModel() throws IOException, CoreException {
- String DPROJECT_NAME = getName();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(DPROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(DPROJECT_NAME, null, null);
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
- IFile tagFile = project.getFile("test1.tag");
- tagFile.create(new ByteArrayInputStream(new byte[0]), IResource.FORCE, null);
-
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(tagFile);
- model.getStructuredDocument().set("<b/>");
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) model.getDocument().getDocumentElement()).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration(model.getDocument().getDocumentElement());
- assertNotNull("no CMElementDeclaration for 'b'", declaration);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- project.delete(true, null);
- }
- public void testTagFileHasTagContentModel() throws IOException, CoreException {
- String DPROJECT_NAME = getName();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(DPROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(DPROJECT_NAME, null, null);
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
- IFile tagFile = project.getFile("test1.tag");
- tagFile.create(new ByteArrayInputStream(new byte[0]), IResource.FORCE, null);
-
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(tagFile);
- model.getStructuredDocument().set("<"+JSP20Namespace.ElementName.DOBODY+"/>");
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) model.getDocument().getDocumentElement()).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration(model.getDocument().getDocumentElement());
- assertNotNull("no CMElementDeclaration for '"+JSP20Namespace.ElementName.DOBODY+"'", declaration);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- project.delete(true, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f838f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index ff92ba27f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- *
- * It tests that
- *
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- *
- *
- *
- *
- */
-public class TestContentTypeHandlers extends TestCase {
- private static final boolean DEBUG = false;
-
- public TestContentTypeHandlers(String name) {
- super(name);
- }
-
- private static IContentTypeManager getContentTypeRegistry() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- return registry;
- }
-
- public void testCreation() {
- IContentTypeManager registry = getContentTypeRegistry();
- assertTrue("content type identifer registry must exist", registry != null);
- if (DEBUG) {
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- System.out.println(allTypes[i]);
-
- }
- }
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
- }
-
- public void testXMLExistsByFileExtension() throws IOException {
- String filename = "test.xml";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
- }
-
- public void testHTMLExistsByFileExtension() throws IOException {
- String filename = "test.html";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExistsByFileExtension() throws IOException {
- String filename = "test.jsp";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExistsByFileExtension() throws IOException {
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExistsByFileExtension() throws IOException {
- String filename = "test.dtd";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
- }
-
- public void testMultipleDefinitions() throws IOException {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier1 = registry.getContentType(id);
- IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("mulitple content type identifiers need to be equal (but not same instance) ", identifier1.equals(identifier2));
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index 3e6c937e1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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() {
- ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
- return registry;
- }
-
- public TestModelHandlers() {
- super();
- }
-
- public void testCreation() {
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- assertTrue("model handler registry must exist", registry != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testCSSExistsFromFilename() throws IOException {
- String filename = "test.css";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testDTDExistsFromFilename() throws IOException {
- String filename = "test.dtd";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testHTMLExistsFromFilename() throws IOException {
- String filename = "test.html";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testJSPExistsFromFilename() throws IOException {
- String filename = "test.jsp";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_XML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
- }
-
- public void testXMLExistsFromFilename() throws IOException {
- String filename = "test.xml";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
- }
-
- public void testDirtyStateForEmbeddedContentTypeTextHTML() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("html.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateForEmbeddedContentTypeTextCSS() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("css.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateForEmbeddedContentTypeTextXML() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("xml.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- 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);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("rdf.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateForDefaultEmbeddedContentType() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("default.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateWithNoPageDirective() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("nodirective.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
deleted file mode 100644
index 74e69ee44..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
+++ /dev/null
@@ -1,43 +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.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-public class TestImportedNodes extends TestCase {
-
-
- public void testImportedComments() {
- IDOMModel orgModel = (IDOMModel) StructuredModelManager.getModelManager().
-
- createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
- IDOMModel foreignModel = (IDOMModel) StructuredModelManager.getModelManager().
-
- createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
- foreignModel.getStructuredDocument().set("<%-- abc --%>");
- Node child = foreignModel.getDocument().getLastChild();
- // import comment node
- child = orgModel.getDocument().importNode(child, true);
- orgModel.getDocument().appendChild(child);
- // create text node and insert it after comment node
- child = orgModel.getDocument().createTextNode("abc");
- orgModel.getDocument().appendChild(child);
- String text = orgModel.getStructuredDocument().get();
- assertEquals("document text was not expected", "<%-- abc --%>abc", text);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index 71105b591..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
- private static final String fCategory = "unittests";
-
- public TestOrphan(String name) {
-
- super(name);
- }
-
- private Document getJSPDoc() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Document getHTMLDoc() {
-
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Element makeElement(Document document) {
-
- Element element = document.createElement("IMG");
- element.setAttribute("src", "<bean:message />");
- return element;
- }
-
- public void testNonOrphanInHTMLDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
- Document doc = getHTMLDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInJSPDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInJSPDoc");
- Document doc = getJSPDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void testNonOrphanInBoth() {
-
- Logger.trace(fCategory, "testNonOrphanInBoth");
- Document jspDoc = getJSPDoc();
- Element commonElement = makeElement(jspDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- jspDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- Document htmlDoc = getHTMLDoc();
- // this test will cause a "region management error" to be
- // thrown in parser (and its subsequent 'handleRefresh').
- // this is "normal" in this error case, of appending an jsp
- // element to an html document. This error/exception is not
- // normally printed out, but is if 'debug' is turned on.
- htmlDoc.appendChild(commonElement);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInBothReversedOrder() {
-
- Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
- Document htmlDoc = getHTMLDoc();
- Element commonElement = makeElement(htmlDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- htmlDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- Document jspDoc = getJSPDoc();
- // this little test shows its important to
- // actually create the element with the right kind of
- // document, not just append.
- // (and, append is needed too, as can be seen by
- // commenting out one or the other of the following
- // two lines.
- commonElement = makeElement(jspDoc);
- jspDoc.appendChild(commonElement);
- //
- attr = (AttrImpl) commonElement.getAttributeNode("src");
- attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void doBothTests() {
-
- testNonOrphanInHTMLDoc();
- testNonOrphanInJSPDoc();
- testNonOrphanInBoth();
- testNonOrphanInBothReversedOrder();
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
deleted file mode 100644
index 037739258..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ /dev/null
@@ -1,64 +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.jst.jsp.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-/**
- * @deprecated - we don't have INodeAdapters directly on our models and this
- * is not part of the usual test suite (test.xml)
- */
-public class TestModelAdapters extends TestCase {
-
-
-
- public void testJSPModel() throws IOException {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- try {
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) structuredModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
- IStructuredModel newModel = structuredModel.newInstance();
- // IDOMDocument newDocument = ((IDOMModel)
- // newModel).getDocument();
- // INodeNotifier notifier = newDocument;
- ModelQueryAdapter result = (ModelQueryAdapter) newModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
- }
- finally {
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
deleted file mode 100644
index a9eee7718..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-/**
- * Tests for JSP include directives
- */
-public class TestModelIncludes extends TestCase {
- String wtp_autotest_noninteractive = null;
-
- 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");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests the custom tag content model when single line fragments are used
- * without trailing white space
- *
- * @throws Exception
- */
- public void testContentModelSingleLineIncludedFileWithNoSpacesButWithTaglibInInclude() throws Exception {
- String projectName = "prj119576_a";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/prj119576_a/WebContent/body2.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- Element element = (Element) model.getIndexedRegion(75);
- CMElementDeclaration ed = ModelQueryUtil.getModelQuery(model).getCMElementDeclaration(element);
- assertNotNull("no (TLD) element declaration found for " + element.getNodeName(), ed);
- assertTrue("not a wrapping content model element declaration: " + ed.getNodeName(), ed instanceof CMNodeWrapper);
- assertTrue("not a taglib content model element declaration: " + ed.getNodeName(), ((CMNodeWrapper) ed).getOriginNode() instanceof TLDElementDeclaration);
- String tagClassName = ((TLDElementDeclaration) ((CMNodeWrapper) ed).getOriginNode()).getTagclass();
- assertNotNull("no tag class name found", tagClassName);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * multiple lines
- *
- * @throws Exception
- */
- public void testTranslateMultiLineIncludedFileWithSpacesAndScriptletInInclude() throws Exception {
- String projectName = "prj119576_c";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = JSPTranslationAdapterFactory.getDefault();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found\n" + source, source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * single line and document region and no trailing white space.
- *
- * @throws Exception
- */
- public void testTranslateSingleLineIncludedFileWithNoSpacesButScriptletInInclude() throws Exception {
- String projectName = "prj119576_b";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = JSPTranslationAdapterFactory.getDefault();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found", source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
deleted file mode 100644
index 76f539c53..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
+++ /dev/null
@@ -1,43 +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.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelRelease extends TestCase {
-
-
-
- public void testJSPModel() {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
deleted file mode 100644
index cca9267dc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ /dev/null
@@ -1,162 +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.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-
-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.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelWithNoFile extends TestCase {
-
- public void testJSPModel() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- structuredModel.releaseFromEdit();
- assertTrue(true);
- }
-
- public void testBug116066_1() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_1", null, null);
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testBug116066_2() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_2", null, null);
- // Copy a TLD into the project
- IFile tld = copyBundleEntryIntoWorkspace("/testfiles/116066/tagdep.tld", "/bug116066_2/tagdep.tld");
- assertNotNull("TLD entry was not copied properly", tld);
- assertTrue("TLD IFile does not exist", tld.exists());
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private IFile copyBundleEntryIntoWorkspace(String entryname, String fullPath) {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.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) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- catch (CoreException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
- return file;
- }
-
- private IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- assertTrue(project.exists());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- return project;
- }
-}
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
deleted file mode 100644
index fb22dd90f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,246 +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.jst.jsp.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class JSPTokenizerTest extends TestCase {
- private JSPTokenizer tokenizer = null;
-
- private void reset(Reader in) {
- tokenizer.reset(in);
- }
-
- private void reset(String filename) {
- Reader fileReader = null;
- try {
- fileReader = new InputStreamReader(getClass().getResourceAsStream(filename), "utf8");
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- BufferedReader reader = new BufferedReader(fileReader);
- reset(reader);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- tokenizer = new JSPTokenizer();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- tokenizer = null;
- }
-
- public void test144807_AttrName() {
- String input = "";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- public void test144807_AttrValue() {
- String input = "<a b=";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- public void test144807_Equals() {
- String input = "<a b";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- public void testInsertComment() {
- reset("jspcomment01.jsp");
- try {
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- catch (StackOverflowError e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
-
- // success if StackOverFlowError does not occur with tokenizer.
- assertTrue(true);
- }
- // [260004]
- public void test26004() {
- String input = "<c:set var=\"foo\" value=\"${foo} bar #\" /> <div id=\"container\" >Test</div>";
- try {
- reset(new StringReader(input));
- ITextRegion region = tokenizer.getNextToken();
- assertTrue("empty input", region != null);
- while (region != null) {
- if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
- region = tokenizer.getNextToken();
- assertNotNull("document consumed by trailing $ or #", region);
- }
- else
- region = tokenizer.getNextToken();
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
- // [150794]
- public void test150794() {
- String input = "<a href=\"<jsp:getProperty/>\">";
- try {
- reset(new StringReader(input));
- ITextRegion region = tokenizer.getNextToken();
- assertTrue("empty input", region != null);
- while (region != null) {
- if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
- region = tokenizer.getNextToken();
- assertNotNull("document consumed by embedded JSP tag", region);
- }
- else
- region = tokenizer.getNextToken();
- }
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- /**
- * <p>This test is to protect against regression of 299146 where &#160 was being
- * broken up into & #1 60 and then when a ; was typed could not be recognized
- * as a Unicode character reference. It should be detected as & #160 which is
- * what is tested for here.</p>
- */
- public void test299146() {
- String input = "<root>&#160</root>";
- try {
- reset(new StringReader(input));
- ITextRegion region = null;
- for(int i = 0; i < 5; ++i) {
- region = tokenizer.getNextToken();
- }
- assertNotNull("This region should exist", region);
- assertEquals("The region did not have the expected start location", 7, region.getStart());
- assertEquals("The region did not have the expected length", 4, region.getLength());
- }
- catch (IOException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- }
-
- // 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 {
- String projectName = "bug_265380";
- int oldDepth = BooleanStack.maxDepth;
- // Make the maxDepth equivalent to that we'd see in a normal editor
- BooleanStack.maxDepth = 100;
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- IFile file = project.getFile("test265380.jsp");
- assertTrue(file.exists());
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(file);
-
- try {
- IStructuredDocument jspDocument = model.getStructuredDocument();
-
- // offset in the document to begin inserting text
- int offset = 414;
- // String to insert character-by-character
- String cif = "<c:out value=\"lorem ipsum\"></c:out>\n";
- // It takes several tags to be inserted before the stack was overflowed
- for (int i = 0; i < 10; i++) {
- for (int j = 0; j < cif.length(); j++)
- jspDocument.replace(offset++, 0, String.valueOf(cif.charAt(j)));
- }
- }
- catch (StackOverflowError e) {
- fail("Stack overflow encountered while editing document.");
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- BooleanStack.maxDepth = oldDepth;
- }
- }*/
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
deleted file mode 100644
index 71a8c053e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
+++ /dev/null
@@ -1,222 +0,0 @@
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
deleted file mode 100644
index c3f557376..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,267 +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.jst.jsp.core.tests.taglibindex;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-
-public class BundleResourceUtil {
-
- public static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws Exception {
- Enumeration entries = JSPCoreTestsPlugin.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);
- }
- }
-
- public static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws Exception {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- IPath path = new Path(fullPath);
- // for (int j = 1; j <= path.segmentCount() - 2; j++) {
- // IPath folderPath = path.removeLastSegments(path.segmentCount()
- // - j);
- // IFolder folder =
- // ResourcesPlugin.getWorkspace().getRoot().getFolder(folderPath);
- // if (!folder.exists()) {
- // folder.create(true, true, null);
- // }
- // }
- 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(path);
- 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());
- }
- }
- }
- else {
- System.err.println("can't find " + entryname);
- }
- return file;
- }
-
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws Exception {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, JSPCoreTestsPlugin.getDefault().getBundle().getSymbolicName(), 0, null, e));
- }
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
-
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) throws Exception {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, JSPCoreTestsPlugin.getDefault().getBundle().getSymbolicName(), 0, null, e));
- }
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- return file[0];
- }
-
- public static void copyBundleZippedEntriesIntoWorkspace(final String zipFileEntry, final IPath fullTargetPath) throws CoreException {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(zipFileEntry);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- ZipInputStream input = new ZipInputStream(entry.openStream());
-
- ZipEntry nextEntry = input.getNextEntry();
- while (nextEntry != null) {
- IPath path = fullTargetPath.append(nextEntry.getName());
-
- if (nextEntry.isDirectory()) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
- if (!folder.exists()) {
- folder.create(true, true, null);
- }
- }
- else {
- IPath folderPath = path.removeLastSegments(1);
- for (int i = folderPath.segmentCount(); i > 0; i--) {
- IPath parentFolderPath = path.removeLastSegments(i);
- if (parentFolderPath.segmentCount() > 1) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(parentFolderPath);
- if (!folder.exists()) {
- folder.create(true, true, null);
- }
- }
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- ResourcesPlugin.getWorkspace().checkpoint(true);
- nextEntry = input.getNextEntry();
- }
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- else {
- System.err.println("can't find " + zipFileEntry);
- }
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
-
- /**
- * Creates a simple project.
- *
- * @param name -
- * the name of the project
- * @param location -
- * the location of the project, or null if the default of
- * "/name" within the workspace is to be used
- * @param natureIds -
- * an array of natures IDs to set on the project, null if none
- * should be set
- * @return
- */
- public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-
- public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature";
-
- /**
- * Add a library entry (like a jar) to the classpath of a project. The jar
- * must be in your poject. You can copy the jar into your workspace using
- * copyBundleEntryIntoWorkspace(String entryname, String fullPath)
- *
- * @param proj
- * assumed it has java nature
- * @param pathToJar
- * project relative, no leading slash
- */
- public static void addLibraryEntry(IProject proj, String pathToJar) {
-
- IPath projLocation = proj.getLocation();
- IPath absJarPath = projLocation.append(pathToJar);
-
- IJavaProject jProj = JavaCore.create(proj);
-
- IClasspathEntry strutsJarEntry = JavaCore.newLibraryEntry(absJarPath, null, null);
- try {
- IClasspathEntry[] currentEntries = jProj.getRawClasspath();
-
- List l = new ArrayList();
- l.addAll(Arrays.asList(currentEntries));
- l.add(strutsJarEntry);
-
- IClasspathEntry[] newEntries = (IClasspathEntry[]) l.toArray(new IClasspathEntry[l.size()]);
- jProj.setRawClasspath(newEntries, new NullProgressMonitor());
- }
- catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
deleted file mode 100644
index ddde55557..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.taglib.IJarRecord;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.IURLRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * Tests for the TaglibIndex.
- */
-public class TestIndex extends TestCase {
- String wtp_autotest_noninteractive = null;
- int MAX_RETRYS = 5;
- int PAUSE_TIME = 1;
- boolean DEBUG = true;
-
- 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");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- removeAllProjects();
- }
-
- public void testAvailableAfterAddingJARToBuildPath() throws Exception {
- String url = "http://example.com/sample2_for_118251-e";
-
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-e", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-e", "/bug_118251-e");
- // bug_118251-e/WebContent/WEB-INF/web.xml
- // bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-e/WebContent/META-INF/MANIFEST.MF
- // bug_118251-e/WebContent/test1.jsp
- // bug_118251-e/.classpath
- // bug_118251-e/.project
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 2, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-e/WebContent/WEB-INF/sample_tld.jar");
-
- url = "http://example.com/sample-taglib";
- taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNotNull("expected record missing for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 3, records.length);
- }
-
- public void testAvailableAfterCopyingJARIntoProject() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-f", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-f", "/bug_118251-f");
- // bug_118251-f/WebContent/WEB-INF/web.xml
- // bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-f/WebContent/META-INF/MANIFEST.MF
- // bug_118251-f/WebContent/test1.jsp
- // bug_118251-f/.classpath
- // bug_118251-f/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getDescriptor().getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 81));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-
- public void testAvailableAfterCopyingJARIntoProject2() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-g", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-g", "/bug_118251-g");
- // bug_118251-g/Web Content/WEB-INF/web.xml
- // bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-g/Web Content/META-INF/MANIFEST.MF
- // bug_118251-g/Web Content/test1.jsp
- // bug_118251-g/.classpath
- // bug_118251-g/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getDescriptor().getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 82));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-
- public void testUtilityProjectSupport() throws Exception {
- // Create project 1
- IProject project = BundleResourceUtil.createSimpleProject("test-jar", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-jar", "/test-jar");
-
- // Create project 2
- IProject project2 = BundleResourceUtil.createSimpleProject("test-war", null, null);
- assertTrue(project2.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-war", "/test-war");
-
- IFile testFile = project2.getFile(new Path("src/main/webapp/test.jsp"));
- assertTrue("missing test JSP file!", testFile.isAccessible());
-
- IDOMModel jspModel = null;
- try {
- jspModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(testFile);
- NodeList tests = jspModel.getDocument().getElementsByTagName("test:test");
- assertTrue("test:test element not found", tests.getLength() > 0);
- CMElementDeclaration elementDecl = ModelQueryUtil.getModelQuery(jspModel).getCMElementDeclaration(((Element) tests.item(0)));
- assertNotNull("No element declaration was found for test:test at runtime", elementDecl);
- assertTrue("element declaration was not the expected kind", elementDecl instanceof CMNodeWrapper);
- CMNode originNode = ((CMNodeWrapper) elementDecl).getOriginNode();
- assertTrue("element declaration was not from a tag library", originNode instanceof TLDElementDeclaration);
- assertEquals("element declaration was not from expected tag library", "http://foo.com/testtags", ((TLDDocument) ((TLDElementDeclaration) originNode).getOwnerDocument()).getUri());
- }
- finally {
- if (jspModel != null) {
- jspModel.releaseFromRead();
- }
- }
- }
-
- public void testWebXMLTaglibMappingsToJARs() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("bug_148717");
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject("bug_148717", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_148717", "/bug_148717");
- }
-
- IFile file = project.getFile("/WebContent/WEB-INF/lib/internal.jar");
- assertTrue(file.exists());
-
- String uri = "http://example.com/external-uri";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_148717/WebContent/", uri, false);
- assertNotNull("record not found for " + uri, taglibRecord);
- assertEquals(ITaglibRecord.JAR, taglibRecord.getRecordType());
- assertEquals(uri, ((IJarRecord) taglibRecord).getDescriptor().getURI());
-
- ITaglibRecord taglibRecord2 = null;
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_148717/WebContent/"));
- for (int i = 0; i < records.length; i++) {
- int type = records[i].getRecordType();
- switch (type) {
- case ITaglibRecord.JAR : {
- taglibRecord2 = records[i];
- }
- break;
- }
- }
- assertNotNull("record not returned for " + uri, taglibRecord2);
- assertEquals(ITaglibRecord.JAR, taglibRecord2.getRecordType());
- assertEquals(uri, ((IJarRecord) taglibRecord2).getDescriptor().getURI());
- }
-
- /**
- * test caching from session-to-session
- */
- public void testRecordCacheCountBetweenSessions() throws Exception {
- TaglibIndex.shutdown();
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("testcache1", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache1", "/testcache1");
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache1/WebContent/WEB-INF/lib/sample_tld.jar");
- TaglibIndex.startup();
-
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match", 5, records.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length, records2.length);
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (3rd restart)", records.length, records2.length);
- }
-
- /**
- * test caching from session-to-session with an addition in one session
- */
- public void testCachingWithAddingLibrary() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("testcache2", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache2", "/testcache2");
-
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache2/WebContent/WEB-INF/lib/sample_tld.jar");
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart, added jar file)", records.length + 1, records2.length);
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length + 1, records2.length);
- BundleResourceUtil.addLibraryEntry(project, "WebContent/WEB-INF/lib/sample_tld.jar");
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- assertEquals("total ITaglibRecord count doesn't match (3nd restart)", records.length + 1, records2.length);
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match changed value (4th restart, add jar to build path)", records.length + 2, records2.length);
- }
-
- public void testAvailableFromExportedOnBuildpathFromAnotherProject() throws Exception {
- TaglibIndex.shutdown();
-
- // Create project 1
- IProject project = BundleResourceUtil.createSimpleProject("testavailable1", null, null);
- assertTrue(project.isAccessible());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable1", "/testavailable1");
-
- // Create project 2
- IProject project2 = BundleResourceUtil.createSimpleProject("testavailable2", null, null);
- assertTrue(project2.isAccessible());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable2", "/testavailable2");
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar");
-
- TaglibIndex.startup();
-
- // make sure project 1 sees no taglibs
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("ITaglibRecords were found", 0, records.length);
- // make sure project 2 sees two taglibs
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- if (records2.length != 2) {
- for (int i = 0; i < records2.length; i++) {
- System.err.println(records2[i]);
- }
- }
- assertEquals("total ITaglibRecord count doesn't match", 2, records2.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
-
-
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match after restart", 2, records2.length);
-
- IJavaProject created = JavaCore.create(project2);
- assertTrue("/availabletest2 not a Java project", created.exists());
-
- // export the jar from project 2
- IClasspathEntry[] entries = created.getRawClasspath();
- boolean found = false;
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
- found = true;
- assertFalse("was exported", entry.isExported());
- ((ClasspathEntry) entry).isExported = true;
- }
- }
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found in build path", found);
- IClasspathEntry[] entries2 = new IClasspathEntry[entries.length];
- System.arraycopy(entries, 1, entries2, 0, entries.length - 1);
- entries2[entries.length - 1] = entries[0];
- created.setRawClasspath(entries2, new NullProgressMonitor());
-
- entries = created.getRawClasspath();
- found = false;
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
- found = true;
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not exported", ((ClasspathEntry) entry).isExported);
- }
- }
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found (and exported) in build path", found);
-
- // project 2 should still have just two taglibs
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar)", 2, records.length);
-
- // now one taglib should be visible from project 1
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar), classpath provider problem?", 1, records.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
-
- // project 2 should still have just two taglibs
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 2, records.length);
-
- // and one taglib should still be visible from project 1
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 1, records.length);
- }
-
- private void removeAllProjects() throws CoreException, InterruptedException {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject[] projects = workspace.getRoot().getProjects();
- IProject project = null;
- for (int i = 0; i < projects.length; i++) {
- project = projects[i];
- deleteProject(project);
- }
- }
-
- /**
- * It's not easy to delete projects. If any of it's files are open by another thread,
- * the operation will fail. So, this method will make several attempts before giving up.
- * @param project
- * @throws CoreException
- * @throws InterruptedException
- */
- private void deleteProject(IProject project) throws CoreException, InterruptedException {
- int nTrys = 0;
- while (project != null && project.exists() && nTrys < MAX_RETRYS) {
- try {
- nTrys++;
- project.delete(true, true, null);
- }
- catch (ResourceException e) {
- if (DEBUG) {
- System.out.println();
- System.out.println("Could not delete project on attempt number: "+ nTrys);
- IStatus eStatus = e.getStatus();
- // should always be MultiStatus, but we'll check
- if (eStatus instanceof MultiStatus) {
- MultiStatus mStatus = (MultiStatus) eStatus;
- IStatus[] iStatus = mStatus.getChildren();
- for (int j = 0; j < iStatus.length; j++) {
- System.out.println("Status: " + j + " " + iStatus[j]);
- }
- }
- else {
- System.out.println("Status: " + eStatus);
- }
- }
- /*
- * If we could not delete the first time, wait a bit and
- * re-try. If we could not delete, it is likely because
- * another thread has a file open, or similar (such as the
- * validation thread).
- */
- Thread.sleep(PAUSE_TIME);
- }
- }
-
- if (project != null && project.exists()) {
- fail("Error in test infrastructure. Could not delete project " + project + " after " + MAX_RETRYS + "attempts.");
- }
- }
-}
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
deleted file mode 100644
index f9658346d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.translation;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-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;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-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.JSPTranslationExtension;
-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;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.jst.jsp.core.tests.validation.ReporterForTest;
-import org.eclipse.jst.jsp.core.tests.validation.ValidationContextForTest;
-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;
-
-public class JSPJavaTranslatorCoreTest extends TestCase {
-
- static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static byte[] creationLock = new byte[0];
-
- public JSPJavaTranslatorCoreTest() {
- }
-
- public JSPJavaTranslatorCoreTest(String name) {
- super(name);
- }
-
- String wtp_autotest_noninteractive = null;
-
- 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");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, wtp_autotest_noninteractive);
- }
-
- public void test_107338() throws Exception {
- String projectName = "bug_107338";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- IFile file = project.getFile("WebContent/test107338.jsp");
- assertTrue(file.exists());
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(file);
- IDOMModel jspModel = (IDOMModel) model;
-
- String jspSource = model.getStructuredDocument().get();
-
- assertTrue("line delimiters have been converted to Windows [CRLF]", jspSource.indexOf("\r\n") < 0);
- assertTrue("line delimiters have been converted to Mac [CR]", jspSource.indexOf("\r") < 0);
-
- ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-
- IDOMDocument xmlDoc = jspModel.getDocument();
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) xmlDoc.getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = translationAdapter.getJSPTranslation();
- // System.err.print(translation.getJavaText());
-
- assertTrue("new-line beginning scriptlet missing from translation", translation.getJavaText().indexOf("int i = 0;") >= 0);
-
- model.releaseFromRead();
- }
-
- /**
- * Tests jsp translation when jsp is within html comments. See
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=126377
- *
- * @throws Exception
- */
- public void test_126377() throws Exception {
- String projectName = "bug_126377";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- IFile file = project.getFile("WebContent/test126377_noerror.jsp");
- assertTrue(file.exists());
-
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- helper.setURI(file.getFullPath().toOSString());
- validator.validate(helper, reporter);
-
- assertTrue("found jsp java error within html comments when there are none", reporter.getMessages().isEmpty());
-
- file = project.getFile("WebContent/test126377_error.jsp");
- assertTrue(file.exists());
- helper.setURI(file.getFullPath().toOSString());
- validator.validate(helper, reporter);
-
- int errors = reporter.getMessages().size();
- assertTrue("found "+errors+" jsp java errors within html comments when there should be 3", (errors == 3));
- }
-
- // public void testMangling() {
- // assertEquals("simple_tag", JSP2ServletNameUtil.mangle("simple.tag"));
- // assertEquals("simple_jspf", JSP2ServletNameUtil.mangle("simple.jspf"));
- // assertEquals("sim_005f_005fple_tagx",
- // JSP2ServletNameUtil.mangle("sim__ple.tagx"));
- // assertEquals(new Path("Project.folder.simple_tag"),
- // JSP2ServletNameUtil.mangle(new Path("/Project/folder/simple.tag")));
- // assertEquals(new Path("Project.fold_005fer.simple_jspx"),
- // JSP2ServletNameUtil.mangle(new Path("/Project/fold_er/simple.jspx")));
- // }
- //
- // public void testUnmangling() {
- // assertEquals("simple.tag", JSP2ServletNameUtil.unmangle("simple_tag"));
- // assertEquals("simple.jspf",
- // JSP2ServletNameUtil.unmangle("simple_jspf"));
- // assertEquals("sim__ple.tagx",
- // JSP2ServletNameUtil.unmangle("sim_005f_005fple_tagx"));
- // assertEquals(new Path("/Project/folder/simple.tag"),
- // JSP2ServletNameUtil.unmangle(new Path("Project.folder.simple_tag")));
- // assertEquals(new Path("/Project/fold_er/simple.jspx"),
- // JSP2ServletNameUtil.unmangle(new
- // Path("Project.fold_005fer.simple_jspx")));
- // }
- public void test_174042() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_174042";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
- waitForBuildAndValidation(project);
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\nproblem marker on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": \"" + markers[i].getAttribute(IMarker.MESSAGE) + "\" ");
- }
- assertEquals("problem markers found, " + s.toString(), 0, markers.length);
- }
-
- private void waitForBuildAndValidation() throws CoreException {
- IWorkspaceRoot root = null;
- try {
- ResourcesPlugin.getWorkspace().checkpoint(true);
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- 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) {
- // woken up from sleep?
-// StringWriter s = new StringWriter();
-// e.printStackTrace(new PrintWriter(s));
-// fail(s.toString());
- }
- catch (IllegalArgumentException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- catch (OperationCanceledException e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- finally {
- if (root != null) {
- Job.getJobManager().endRule(root);
- }
- }
- }
-
- private void waitForBuildAndValidation(IProject project) throws CoreException {
- project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
- waitForBuildAndValidation();
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- waitForBuildAndValidation();
- }
-
- public void test_178443() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_178443";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- /*
- * Should be set to false. A referenced class in an included segment
- * does not exist.
- */
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
- waitForBuildAndValidation(project);
-
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-
- StringBuffer s = new StringBuffer();
- 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, markers.length);
- }
-
- public void test_109721() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_109721";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- /*
- * Should be set to false. A referenced class in an included segment
- * does not exist.
- */
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/WebContent/WEB-INF/lib/struts.jar");
-
- waitForBuildAndValidation(project);
-
- 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();
-
- 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());
- }
- assertEquals("problem markers found" + s.toString(), 0, messages.size());
- }
-
- public void test_181057a() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_181057";
- // Create new project
- IProject j = BundleResourceUtil.createSimpleProject("j", null, null);
- assertTrue(j.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/j", "/j");
- IProject k = BundleResourceUtil.createSimpleProject("k", null, null);
- assertTrue(k.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/k", "/k");
-
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
- waitForBuildAndValidation(project);
-
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- /*
- * main.jsp contains numerous references to tags in struts.jar, which
- * is at the end of the build path
- */
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\n" + markers[i].getAttribute(IMarker.LINE_NUMBER) + ":" + markers[i].getAttribute(IMarker.MESSAGE));
- }
- assertEquals("problem markers found" + s.toString(), 0, markers.length);
- }
-
- public void test_219761a() throws Exception {
- /**
- * Broken behavior has a Java syntax error on line 19, which only
- * contains an include directive to a fragment that doesn't exist.
- *
- * All syntax errors should be on lines 25 or 28 and after offset 373
- * (single character line delimiter!).
- */
- String testName = "testTranslatorMessagesWithIncludes";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-
- waitForBuildAndValidation(project);
- ValidationFramework.getDefault().validate(new IProject[]{project}, true, true, new NullProgressMonitor());
-
- IFile main = project.getFile("/WebContent/sample.jsp");
- assertTrue("sample test file does not exist", main.isAccessible());
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- StringBuffer markerText = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- // 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);
- }
- }
-// assertEquals("wrong number of syntax errors reported\n" + markerText, 3, numberOfSyntaxErrors);
-
- // clean up if we got to the end
- project.delete(true, true, null);
- }
-
- public void test_150794() throws Exception {
- String testName = "bug_150794";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-
- IFile main = project.getFile("/WebContent/escapedQuotes.jsp");
- assertTrue("sample test file does not exist", main.isAccessible());
-
- JSPJavaValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- helper.setURI(main.getFullPath().toOSString());
- validator.validate(helper, reporter);
-
- assertTrue("Unexpected problems 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();
- }
- }
-
- public void testIterationTags() throws Exception {
- String testName = "testIterationTags";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
- if (!project.isAccessible()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- }
- waitForBuildAndValidation(project);
- IFile testFile = project.getFile("/WebContent/test.jsp");
- assertTrue("test.jsp is not accessible", testFile.isAccessible());
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(testFile);
-
- ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
- translation.setProblemCollectingActive(true);
- assertNotNull("No Java translation found", translation);
- translation.reconcileCompilationUnit();
- translation.setProblemCollectingActive(false);
- List problems = translation.getProblems();
- assertNotNull("Translation had a null problems list.", problems);
- Iterator it = problems.iterator();
- String javaText = translation.getJavaText();
- int startOffset = javaText.indexOf("<plain:simple>");
- assertTrue("<plan:simple> scope not found.", startOffset > 0);
- int endOffset = javaText.indexOf("</plain:simple>", startOffset);
- assertTrue("</plan:simple> scope not found.", endOffset > 0);
- // Finds all errors caused by "continue cannot be used outside of a loop" - should only occur between <plain:simple></plain:simple>
- while (it.hasNext()) {
- IProblem problem = (IProblem) it.next();
- if (problem.isError()) {
- if ("continue cannot be used outside of a loop".equals(problem.getMessage())) {
- assertTrue("'continue cannot be used outside of a loop' outside of iteration tag: ", problem.getSourceStart() > startOffset && problem.getSourceEnd() < endOffset);
- }
-
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- /**
- * Tests that an iteration tag will generate
- * @throws Exception
- */
- public void testIterationTagsIncomplete() throws Exception {
- String testName = "testIterationTags";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
- if (!project.isAccessible()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- }
- waitForBuildAndValidation(project);
- IFile testFile = project.getFile("/WebContent/test_missing_end_tag.jsp");
- assertTrue("test_missing_end_tag.jsp is not accessible", testFile.isAccessible());
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(testFile);
-
- ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
- String javaText = translation.getJavaText();
- int startOffset = javaText.indexOf("} // [</plain:loop>]");
- assertTrue("Missing end tag was not accounted for.", startOffset != -1);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java
deleted file mode 100644
index 7b98dfb77..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.translation;
-
-import java.io.Externalizable;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationExtension;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-import org.eclipse.jst.jsp.core.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- *
- */
-public class JSPTranslatorPersistenceTest extends TestCase {
- /** The name of the project that all of these tests will use */
- private static final String PROJECT_NAME = "JSPTranslatorPersistenceTest";
-
- /** The location of the testing files */
- private static final String PROJECT_FILES = "/testfiles/JSPTranslatorPersistenceTest";
-
- /** The project that all of the tests use */
- private static IProject fProject;
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public JSPTranslatorPersistenceTest() {
- super("JSPTranslator Externalization Test");
- }
-
- /**
- * <p>Constructor that takes a test name.</p>
- * <p>Use {@link #suite()}</p>
- *
- * @param name The name this test run should have.
- *
- * @see #suite()
- */
- public JSPTranslatorPersistenceTest(String name) {
- super(name);
- }
-
- /**
- * <p>Use this method to add these tests to a larger test suite so set up
- * and tear down can be performed</p>
- *
- * @return a {@link TestSetup} that will run all of the tests in this class
- * with set up and tear down.
- */
- public static Test suite() {
- TestSuite ts = new TestSuite(JSPTranslatorPersistenceTest.class, "JSPTranslator Externalization Test");
- return new JSPTranslatorExternalizationTestSetup(ts);
- }
-
- public void testTranslationTextComparison() throws Exception {
- String outFileName = "testTranslationTextComparison.obj";
-
- JSPTranslator originalTranslator = writeTranslator("Test1.jsp", outFileName);
- StringBuffer originalTranslation = originalTranslator.getTranslation();
-
- JSPTranslator externalizedTranslator = (JSPTranslator)readObject(outFileName);
- StringBuffer externalizedTranslation = externalizedTranslator.getTranslation();
-
- assertEquals("The original translation should be the same as the restored externalized translation",
- originalTranslation.toString(), externalizedTranslation.toString());
- }
-
- /**
- * <p>This test case follows the general pattern of how a translation is created, then can be
- * externalized when the workspace is closed, then reloaded when its opened again.</p>
- *
- * @throws Exception
- */
- public void testCreateTranslationAdapter() throws Exception {
- String outFileName = "testCreateTranslationAdapter.obj";
-
- IStructuredModel structModel = getModelForRead("Test1.jsp");
-
- //verify there is not already an existing translation adapter
- IDOMDocument domDoc = ((IDOMModel)structModel).getDocument();
- INodeAdapter existingAdapter = domDoc.getAdapterFor(IJSPTranslation.class);
- assertNull("There should be no existing adapter for IJSPTranslation", existingAdapter);
-
- //create a translator and externalize it, then load the externalized translator
- JSPTranslator originalTranslator = writeTranslator(structModel, outFileName);
- JSPTranslator externalizedTranslator = (JSPTranslator)readObject(outFileName);
-
- //create an adaptr from the loaded externalized translator and add it to the doc
- JSPTranslationAdapter restoredAdapter = new JSPTranslationAdapter((IDOMModel)structModel, externalizedTranslator);
- domDoc.addAdapter(restoredAdapter);
-
- //verify we can retrieve the adapter we just set
- existingAdapter = domDoc.getAdapterFor(IJSPTranslation.class);
- assertNotNull("There should now be an existing adapter for IJSPTranslation", existingAdapter);
- assertTrue("Expected " + existingAdapter + " to be an instance of JSPTranslationAdapter",
- existingAdapter instanceof JSPTranslationAdapter);
- JSPTranslationAdapter retrievedAdapter = (JSPTranslationAdapter)existingAdapter;
- JSPTranslationExtension jspTranslationExtension = retrievedAdapter.getJSPTranslation();
-
- /* verify that the original translation is equal to that of the
- * retrieved adapter created from the previously externalized translator
- */
- assertEquals("The original translation should be the same as the restored externalized translation",
- originalTranslator.getTranslation().toString(), jspTranslationExtension.getJavaText());
- }
-
- private static JSPTranslator writeTranslator(String jspFileName, String externalizedFileName) throws IOException, CoreException {
- JSPTranslator translator = new JSPTranslator();
- IStructuredModel model = null;
- try {
- model = getModelForRead(jspFileName);
- translator = writeTranslator(model, externalizedFileName);
- } finally {
- if(model != null) {
- model.releaseFromRead();
- }
- }
-
- return translator;
- }
-
- private static IStructuredModel getModelForRead(String fileName) throws IOException, CoreException {
- IFile jspFile = fProject.getFile(fileName);
- assertTrue(jspFile.exists());
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(jspFile);
- assertNotNull(model);
-
- return model;
- }
-
- private static JSPTranslator writeTranslator(IStructuredModel jspModel, String externalizedFileName) throws IOException, CoreException {
- JSPTranslator translator = new JSPTranslator();
- translator.reset((IDOMNode)jspModel.getIndexedRegion(0), new NullProgressMonitor());
- translator.translate();
- writeObject(externalizedFileName, translator);
-
- return translator;
- }
-
- /**
- * <p>Write an {@link Externalizable} object to a file</p>
- *
- * @param fileName
- * @param obj
- * @throws IOException
- */
- private static void writeObject(String fileName, Object obj) throws IOException {
- FileOutputStream fos = new FileOutputStream(fileName);
- ObjectOutputStream out = new ObjectOutputStream(fos);
- out.writeObject(obj);
- out.close();
- }
-
- /**
- * <p>Read an {@link Externalizable} object from a file</p>
- *
- * @param fileName
- * @return
- * @throws IOException
- * @throws ClassNotFoundException
- */
- private static Object readObject(String fileName) throws IOException, ClassNotFoundException {
- Object obj = null;
-
- FileInputStream fis = new FileInputStream(fileName);
- ObjectInputStream in = new ObjectInputStream(fis);
- obj = in.readObject();
- in.close();
-
- return obj;
- }
-
- /**
- * <p>This inner class is used to do set up and tear down before and
- * after (respectively) all tests in the inclosing class have run.</p>
- */
- private static class JSPTranslatorExternalizationTestSetup extends TestSetup {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static String previousWTPAutoTestNonInteractivePropValue = null;
-
- /**
- * Default constructor
- *
- * @param test do setup for the given test
- */
- public JSPTranslatorExternalizationTestSetup(Test test) {
- super(test);
- }
-
- /**
- * <p>This is run once before all of the tests</p>
- *
- * @see junit.extensions.TestSetup#setUp()
- */
- public void setUp() throws Exception {
- fProject = ProjectUtil.createProject(PROJECT_NAME, null, null);
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, PROJECT_NAME);
-
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
-
- fProject.delete(true, new NullProgressMonitor());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index d289dec9f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
diff --git a/tests/org.eclipse.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
deleted file mode 100644
index e22c507a1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-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.JSPActionValidator;
-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;
-
-public class JSPActionValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "testvalidatejspactions";
- private static final String UNDEFINED_ATTR_IDONT = "idont";
- private static final String REQUIRED_ATTR_NAME = "name";
- private static final String NONEMPTY_INLINE_TAG_NAME = "libtags:emptybodycontent";
-
- 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);
- }
-
- /**
- * Tests if unknown attributes are detected
- *
- * @throws Exception
- */
- public void testUknownAttribute() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/undefinedattribute.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- boolean foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 4);
- if (foundError1)
- foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 12);
- if (foundError1)
- foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 13);
-
- assertTrue("jsp action validator did not detect undefined attributes", foundError1);
- }
-
- /**
- * Tests if missing required attributes are detected
- *
- * @throws Exception
- */
- public void testMissingRequiredAttribute() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/norequiredattribute.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- boolean foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 11);
- if (foundError)
- foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 12);
-
- assertTrue("jsp action validator did not detect missing required attributes", foundError);
- }
-
- private boolean errorMessageFound(IReporter reporter, String errorMessage, int errorLineNumber) {
- boolean foundError = false;
- List messages = reporter.getMessages();
- Iterator iter = messages.iterator();
- while (iter.hasNext() && !foundError) {
- IMessage message = (IMessage) iter.next();
- int lineNumber = message.getLineNumber();
- String messageText = message.getText();
-
- if (lineNumber == errorLineNumber && messageText.startsWith(errorMessage))
- foundError = true;
- }
- return foundError;
- }
-
- /**
- * Tests if missing required attributes are detected
- *
- * @throws Exception
- */
- public void testAttributesCorrect() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/worksfine.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
- 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());
- }
-
- /**
- * Tests if non-empty inline tags are flagged as warnings
- *
- * @throws Exception
- */
- public void testNonEmptyInlineTag() throws Exception {
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=203254
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/nonemptyinlinetag.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- boolean foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPActionValidator_0, NONEMPTY_INLINE_TAG_NAME), 10);
-
- assertTrue("jsp action validator had problems detecting an error with content in an inline tag", foundError);
- }
-}
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
deleted file mode 100644
index c4e09983a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
+++ /dev/null
@@ -1,187 +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 junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.validation.ReporterHelper;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Batch Validator
- */
-public class JSPBatchValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "batchvalidation";
- Object originalWorkspaceValue = null;
- IEclipsePreferences workspaceScope = null;
- IEclipsePreferences projectScope = null;
- Object[] validatorIds = new String[]{"org.eclipse.jst.jsp.core.JSPContentValidator", "org.eclipse.jst.jsp.core.JSPBatchValidator"};
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
- 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 (!getProject().exists()) {
- BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", getProject().exists());
-
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
- IFile fragment = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String qualifier = JSPCorePlugin.getDefault().getBundle().getSymbolicName();
- workspaceScope = new InstanceScope().getNode(qualifier);
- projectScope = new ProjectScope(fragment.getProject()).getNode(qualifier);
- originalWorkspaceValue = workspaceScope.get(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, null);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
- if (originalWorkspaceValue != null)
- workspaceScope.put(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, originalWorkspaceValue.toString());
- else
- workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- }
-
- /**
- * Tests validating 2 jsp files. See
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=214441
- *
- * @throws Exception
- */
- public void testValidating2Files() throws Exception {
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath1 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jsp";
- IFile file1 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
- assertTrue(file1.exists());
-
- String filePath2 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors2.jsp";
- IFile file2 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
- assertTrue(file2.exists());
-
- 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);
- }
-
- public void testFragmentValidationPreferenceOnProject() throws Exception {
- JSPBatchValidator validator1 = new JSPBatchValidator();
- JSPContentValidator validator2 = new JSPContentValidator();
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
- ValidationResult result = null;
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- // enable workspace-wide but disable in project, no problem markers
- // expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertEquals("Problems found while fragment validation was disabled in project but enabled on workspace", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
- /*
- * disable workspace-wide but enable in project, some problem markers
- * expected
- */
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- JSPFContentProperties.setProperty(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problems not found while fragment validation was enabled for project but disabled on workspace", 0 < (((ReporterHelper)result.getReporter(null)).getMessages().size()));
- }
-
- public void testFragmentValidationPreferenceOnWorkspace() throws Exception {
- JSPBatchValidator validator1 = new JSPBatchValidator();
- JSPContentValidator validator2 = new JSPContentValidator();
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- ValidationResult result = null;
-
- // disable workspace-wide, no problem markers expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertEquals("Problem markers found while fragment validation was disabled", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
- // enable workspace-wide, some problem markers expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- ValidationFramework.getDefault().validate(new IProject[]{getProject()}, true, false, new NullProgressMonitor());
- ValidationFramework.getDefault().join(new NullProgressMonitor());
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problem markers not found while fragment validation was enabled on workspace", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
-
- // check default value is true
- workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problem markers not found while fragment validation was preferences were default", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
- }
-
- /**
- * @return
- */
- private IProject getProject() {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- }
-}
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 1a5be7532..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java
+++ /dev/null
@@ -1,152 +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 junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-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;
-
-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);
- }
-
- public void testIncludeMappedURL() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("delos");
- if (!project.exists()) {
- BundleResourceUtil.createSimpleProject("delos", null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/delos", "/delos");
- }
- assertTrue("project could not be created", project.exists());
-
- JSPDirectiveValidator validator = new JSPDirectiveValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/delos/WebContent/1.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
- helper.setURI(filePath);
- validator.validate(helper, reporter);
- assertTrue("problems were found in JSP file", reporter.getMessages().isEmpty());
-
- try {
- project.delete(true, null);
- }
- catch (CoreException e) {
- // failure to clean up shouldn't fail the test
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
deleted file mode 100644
index 622071df3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
+++ /dev/null
@@ -1,98 +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.jst.jsp.core.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Java Validator
- */
-public class JSPJavaValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "bug_87351";
-
- 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);
- }
-
- /**
- * Tests if jsp fragments are validated when preference is set to true
- *
- * @throws Exception
- */
- public void testValidatingFragments() throws Exception {
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jspf";
- helper.setURI(filePath);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
- validator.validate(helper, reporter);
-
- if (validate != null) {
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
- }
- assertTrue("jspf was not validated when it should have been", !reporter.getMessages().isEmpty());
- }
-
- /**
- * Tests if jsp fragments are not validated when preference is set to
- * false
- *
- * @throws Exception
- */
- public void testNoValidatingFragments() throws Exception {
- JSPValidator validator = new JSPValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/ihaveerrors.jspf";
- helper.setURI(filePath);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(false));
- validator.validate(helper, reporter);
-
- if (validate != null) {
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
- }
- assertTrue("jspf was validated when it should not have been", reporter.getMessages().isEmpty());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
deleted file mode 100644
index ab7667d1b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
+++ /dev/null
@@ -1,59 +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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-public class ReporterForTest implements IReporter {
- List list = new ArrayList();
-
- public ReporterForTest() {
- super();
- }
-
- public void addMessage(IValidator origin, IMessage message) {
- list.add(message);
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {
- /* do not need to implement */
- }
-
- public IMessageAccess getMessageAccess() {
- return null;
- }
-
- public boolean isCancelled() {
- return false;
- }
-
- public void removeAllMessages(IValidator origin, Object object) { // do
- /* do not need to implement */
- }
-
- public void removeAllMessages(IValidator origin) {
- /* do not need to implement */
- }
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
- /* do not need to implement */
- }
-
- public List getMessages() {
- return list;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
deleted file mode 100644
index 81d7453fc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
+++ /dev/null
@@ -1,44 +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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-public class ValidationContextForTest implements IValidationContext {
- private String[] fURIs = null;
-
- public void setURI(String uri) {
- String[] uris = null;
- if (uri != null)
- uris = new String[]{uri};
-
- setURIs(uris);
- }
-
- public void setURIs(String[] uris) {
- fURIs = uris;
- }
-
- public String[] getURIs() {
- if (fURIs != null)
- return fURIs;
- return new String[0];
- }
-
- public Object loadModel(String symbolicName) {
- return null;
- }
-
- public Object loadModel(String symbolicName, Object[] parms) {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
deleted file mode 100644
index 1d474107e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
+++ /dev/null
@@ -1,422 +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.jst.jsp.css.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.tests.NullInputStream;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.osgi.framework.Bundle;
-
-/**
- *
- */
-public class JSPedCSSSourceParserTest extends TestCase {
- private static final String FILES_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles/results"; //$NON-NLS-1$
- private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
- private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
- private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
- private static final String commonEOL = "\r\n";//$NON-NLS-1$
-
- public void testSourceOpen1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_APPEND); //$NON-NLS-1$
- }
- /*
- * The following test case fails with WTP 1.5 RC2, but, ignore this release.
- *
- public void testSourceInsert2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- *
- */
- public void testSourceOpen4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen15() throws IOException {
- sourceParserTest("sample08.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceInsert15() throws IOException {
- sourceParserTest("sample08.jsp", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceAppend15() throws IOException {
- sourceParserTest("sample08.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen16() throws IOException {
- sourceParserTest("sample08.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceInsert16() throws IOException {
- sourceParserTest("sample08.jspf", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceAppend16() throws IOException {
- sourceParserTest("sample08.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- protected void setUp() throws Exception {
- // set cssjsptestX.jsp(f) file as css jsp.
- IContentType ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspsource");
- ct.addFileSpec("cssjsptest0.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest1.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest2.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest3.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest4.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest5.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest6.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest7.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest8.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest9.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest10.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest11.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest12.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest13.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest14.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest15.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest16.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest17.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest18.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest19.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest20.jsp", IContentType.FILE_NAME_SPEC);
- ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspfragmentsource");
- ct.addFileSpec("cssjsptest0.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest1.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest2.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest3.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest4.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest5.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest6.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest7.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest8.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest9.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest10.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest11.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest12.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest13.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest14.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest15.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest16.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest17.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest18.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest19.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest20.jspf", IContentType.FILE_NAME_SPEC);
- }
-
- static int index_jsp = 0;
- static int index_jspf = 0;
- private ICSSModel createModel(boolean isFragment) {
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = !isFragment ? modelManager.getModelForEdit("cssjsptest" + index_jsp++ + ".jsp", new NullInputStream(), null) : //$NON-NLS-1$
- modelManager.getModelForEdit("cssjsptest" + index_jspf++ + ".jspf", new NullInputStream(), null); //$NON-NLS-1$
- model.getStructuredDocument().setLineDelimiter(commonEOL);//$NON-NLS-1$
- }
- catch (Exception e) {
- StringWriter s = new StringWriter();
- e.printStackTrace(new PrintWriter(s));
- fail(s.toString());
- }
- return (ICSSModel) model;
-
- }
- private File createFile(String directory, String filename) throws IOException {
- Bundle bundle = Platform.getBundle("org.eclipse.jst.jsp.core.tests"); //$NON-NLS-1$
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
- URL totalURL = new URL(url, totalPath);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- return file;
- }
-
- private String createString(String directory, String filename) throws FileNotFoundException, IOException {
- StringBuffer buf = new StringBuffer();
- Reader fileReader = new FileReader(createFile(directory, filename));
- BufferedReader reader = new BufferedReader(fileReader);
- String line;
- while ((line = reader.readLine()) != null) {
- buf.append(line);
- buf.append(commonEOL);
- }
- return buf.toString();
- }
-
- private void sourceParserTest(String filename, String mode) throws IOException {
- ICSSModel model = null;
- if (mode.equals(MODE_OPEN)) {
- model = readModelOpen(filename);
- }
- else if (mode.equals(MODE_APPEND)) {
- model = readModelAppend(filename);
- }
- else if (mode.equals(MODE_INSERT)) {
- model = readModelInsert(filename);
- }
- String result = dumpRegions(model.getStructuredDocument());
- compareResult(result, "JSPedCSSSourceParserTest-" + filename); //$NON-NLS-1$
- closeModel(model);
- }
-
- private ICSSModel readModelOpen(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- document.replaceText(null, 0, 0, source);
-
- return model;
- }
-
- private ICSSModel readModelAppend(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- document.replaceText(null, i, 0, source.substring(i, i + 1));
- }
-
- return model;
- }
-
- private ICSSModel readModelInsert(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- int textIndex = source.length() - i - 1;
- document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
- }
-
- return model;
- }
-
- private void closeModel(ICSSModel model) {
- model.releaseFromEdit();
- }
-
- private String dumpRegions(IStructuredDocument document) {
- StringBuffer buf = new StringBuffer();
- buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
- return buf.toString();
- }
-
- private String dumpRegions(IStructuredDocumentRegion region) {
- StringBuffer buf = new StringBuffer();
- while (region != null){
- buf.append(dumpOneRegion(region));
- region = region.getNext();
- }
-
- buf.append(commonEOL + "-------" + commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
- StringBuffer buf = new StringBuffer();
-
- buf.append(documentRegion.toString());
- buf.append(commonEOL + " "); //$NON-NLS-1$
-
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- buf.append(textRegion.toString());
- buf.append(", "); //$NON-NLS-1$
- }
- buf.append(commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private void compareResult(String actual, String filename) throws IOException {
- String result = createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
deleted file mode 100644
index 1c4b700d8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 143] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70,
-[143, 188] (<%@ include file="./cssjspfragment.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
deleted file mode 100644
index 49ab4db96..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
+++ /dev/null
@@ -1,9 +0,0 @@
-[0, 70] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70,
-[70, 115] (<%@ include file="./cssjspfragment.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
deleted file mode 100644
index 06f5e7c8b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 97] (float : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[97, 98] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[98, 101] (
- )
- ContextRegion--> S: 0-3,
-[101, 120] (border-${XXX}-color)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19,
-[120, 126] ( : red)
- ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 129] (
-)
- ContextRegion--> S: 0-2,
-[129, 130] (})
- ContextRegion--> RBRACE: 0-1,
-[130, 132] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
deleted file mode 100644
index 6e4a6ec3a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 10] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[10, 14] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[14, 28] (float : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[28, 29] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[29, 32] (
- )
- ContextRegion--> S: 0-3,
-[32, 51] (border-${XXX}-color)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19,
-[51, 57] ( : red)
- ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6,
-[57, 58] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[58, 60] (
-)
- ContextRegion--> S: 0-2,
-[60, 61] (})
- ContextRegion--> RBRACE: 0-1,
-[61, 63] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
deleted file mode 100644
index f36aaa355..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 97] (color : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[97, 98] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[98, 101] (
- )
- ContextRegion--> S: 0-3,
-[101, 126] (border-color : <%= YYY %>)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 129] (
-)
- ContextRegion--> S: 0-2,
-[129, 130] (})
- ContextRegion--> RBRACE: 0-1,
-[130, 132] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
deleted file mode 100644
index 29b6482c3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 10] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[10, 14] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[14, 28] (color : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[28, 29] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[29, 32] (
- )
- ContextRegion--> S: 0-3,
-[32, 57] (border-color : <%= YYY %>)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25,
-[57, 58] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[58, 60] (
-)
- ContextRegion--> S: 0-2,
-[60, 61] (})
- ContextRegion--> RBRACE: 0-1,
-[61, 63] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
deleted file mode 100644
index cf760e600..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.puge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 89] (${XXX})
- ContextRegion--> FOREIGN_ELEMENT: 0-6,
-[89, 90] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[90, 93] (
- )
- ContextRegion--> S: 0-3,
-[93, 111] (border-color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18,
-[111, 112] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[112, 114] (
-)
- ContextRegion--> S: 0-2,
-[114, 115] (})
- ContextRegion--> RBRACE: 0-1,
-[115, 117] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
deleted file mode 100644
index 1d40579d3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 6] (.puge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[6, 10] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[10, 16] (${XXX})
- ContextRegion--> FOREIGN_ELEMENT: 0-6,
-[16, 17] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[17, 20] (
- )
- ContextRegion--> S: 0-3,
-[20, 38] (border-color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18,
-[38, 39] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[39, 41] (
-)
- ContextRegion--> S: 0-2,
-[41, 42] (})
- ContextRegion--> RBRACE: 0-1,
-[42, 44] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
deleted file mode 100644
index ddd99933b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-[0, 71] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/71,
-[71, 100] (<%--
-jsp
-comment
---%>
-)
- ContextRegion--> COMMENT: 0-27/29,
-[100, 103] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[103, 107] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[107, 130] (background-color : blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23,
-[130, 131] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[131, 133] (
-)
- ContextRegion--> S: 0-2,
-[133, 134] (})
- ContextRegion--> RBRACE: 0-1,
-[134, 136] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
deleted file mode 100644
index 83fff303b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 31] (
-<%--
-jsp
-comment
---%>
-)
- ContextRegion--> S: 0-2, ContextRegion--> COMMENT: 2-29/31,
-[31, 34] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[34, 38] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[38, 61] (background-color : blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23,
-[61, 62] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[62, 64] (
-)
- ContextRegion--> S: 0-2,
-[64, 65] (})
- ContextRegion--> RBRACE: 0-1,
-[65, 67] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
deleted file mode 100644
index 23ac7c0e1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 76] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[76, 80] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[80, 111] (border-${XXX} : 0px, solid, red)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31,
-[111, 112] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[112, 114] (
-)
- ContextRegion--> S: 0-2,
-[114, 115] (})
- ContextRegion--> RBRACE: 0-1,
-[115, 117] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
deleted file mode 100644
index 671d71d32..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 7] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[7, 11] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[11, 42] (border-${XXX} : 0px, solid, red)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31,
-[42, 43] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[43, 45] (
-)
- ContextRegion--> S: 0-2,
-[45, 46] (})
- ContextRegion--> RBRACE: 0-1,
-[46, 48] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
deleted file mode 100644
index c2678fb63..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
deleted file mode 100644
index de5f2acbb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp
deleted file mode 100644
index 709b113fa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-[0, 71] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/71,
-[71, 134] (<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-)
- ContextRegion--> CSS_JSP_SCRIPTLET: 0-61/63,
-[134, 171] (<%@ include file="./styles.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-35/37,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf
deleted file mode 100644
index bdb584bcc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf
+++ /dev/null
@@ -1,8 +0,0 @@
-[0, 63] (<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-)
- ContextRegion--> CSS_JSP_SCRIPTLET: 0-61/63,
-[63, 100] (<%@ include file="./styles.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-35/37,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
deleted file mode 100644
index 19723c594..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
deleted file mode 100644
index a86aee580..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
deleted file mode 100644
index b00d5b45e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
- float : ${XXX};
- border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
deleted file mode 100644
index 238ad9ee1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
- float : ${XXX};
- border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
deleted file mode 100644
index 38ddb8cad..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
- color : ${XXX};
- border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
deleted file mode 100644
index 5e638360e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
- color : ${XXX};
- border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
deleted file mode 100644
index 18709a8b0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.puge {
- ${XXX};
- border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
deleted file mode 100644
index 4f03d5a57..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
+++ /dev/null
@@ -1,4 +0,0 @@
-.puge {
- ${XXX};
- border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
deleted file mode 100644
index 2e39e577e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-<%--
-jsp
-comment
---%>
-H1 {
- background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
deleted file mode 100644
index e98a25199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<%--
-jsp
-comment
---%>
-H1 {
- background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
deleted file mode 100644
index 01b344e6f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-H1 {
- border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
deleted file mode 100644
index 0216ce5fb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-H1 {
- border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp
deleted file mode 100644
index bfaf6295f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-<%@ include file="./styles.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf
deleted file mode 100644
index 8abadc747..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf
+++ /dev/null
@@ -1,2 +0,0 @@
-<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-<%@ include file="./styles.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 99c433120..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.core.tests" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
deleted file mode 100644
index bfdd67375..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version = "1.0" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglib_1_2.dtd">
-<taglib>
- <tlib-version>1.1</tlib-version>
- <jsp-version>1.1</jsp-version>
- <uri>tagdependent</uri>
- <short-name>tagdependent</short-name>
- <description>
- This tag library demonstrates tagdependent tag handling
- using its "code" tag.
- </description>
- <tag>
- <name>code</name>
- <tag-class>com.example.tagdep.CodeTag</tag-class>
- <body-content>tagdependent</body-content>
- <attribute>
- <name>fontName</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <name>bold</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <name>italic</name>
- <type>boolean</type>
- </attribute>
- </tag>
- <small-icon>browser_editor.gif</small-icon>
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/JSPTranslatorPersistenceTest/Test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/JSPTranslatorPersistenceTest/Test1.jsp
deleted file mode 100644
index acffdad50..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/JSPTranslatorPersistenceTest/Test1.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-
-<%
-String test = "hello";
-test.toString();
-%>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project
deleted file mode 100644
index 96a356a71..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>batchvalidation</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/batchvalidation/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/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/batchvalidation/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0957ef8b0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/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>batchvalidation</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/batchvalidation/WebContent/header.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/header.jspf
deleted file mode 100644
index 36b72309d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/header.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
-<%= i %>
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp
deleted file mode 100644
index 5ab5b55b5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<% i am broken %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp
deleted file mode 100644
index afafcd1be..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<% i am hungry %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath
deleted file mode 100644
index d5aec8fe2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Tomcat 5.5.9"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
deleted file mode 100644
index 80341f8f1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>test-jar</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 167796c4c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:16:26 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0bb9d1797..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="test-jar">
- <wb-resource deploy-path="/" source-path="/src"/>
-<property name="ear_libraries_processed" value="true"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fd534a952..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.utility"/>
- <fixed facet="jst.java"/>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/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/bug183756/test-jar/bin/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
deleted file mode 100644
index af3a82be7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>test</short-name>
- <uri>http://foo.com/testtags</uri>
- <description>Test Tag Library</description>
-
-
- <tag>
- <name>test</name>
- <tag-class>com.foo.TestTag</tag-class>
- <body-content>empty</body-content>
- <description>
- test
- </description>
- </tag>
-
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
deleted file mode 100644
index 7cf9d8824..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
+++ /dev/null
@@ -1,15 +0,0 @@
-Êþº¾???2?,??com/foo/TestTag??#javax/servlet/jsp/tagext/TagSupport?<init>?()V?Code
-?? ???LineNumberTable?LocalVariableTable?this?Lcom/foo/TestTag;?
-doStartTag?()I?
-Exceptions??javax/servlet/jsp/JspException ?? ??? pageContext?Ljavax/servlet/jsp/PageContext;
-????javax/servlet/jsp/PageContext ???getOut?()Ljavax/servlet/jsp/JspWriter;??
-TAG WORKED
-? ?"?!?javax/servlet/jsp/JspWriter ?#?$?write?(Ljava/lang/String;)V
-??& ???(?java/lang/Exception?
-StackMapTable?
-SourceFile? TestTag.java?!???????????????/?????*·?±????
-???????? ??? ????? ?
-????????????????\?????*´?¶?¶?§?L*·?%¬???? ??'??
-???????
-?? ??? ??? ????? ?
-???)????O?'???*????+
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/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/bug183756/test-jar/src/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
deleted file mode 100644
index af3a82be7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>test</short-name>
- <uri>http://foo.com/testtags</uri>
- <description>Test Tag Library</description>
-
-
- <tag>
- <name>test</name>
- <tag-class>com.foo.TestTag</tag-class>
- <body-content>empty</body-content>
- <description>
- test
- </description>
- </tag>
-
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
deleted file mode 100644
index 951882c60..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.foo;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-public class TestTag extends TagSupport {
-
- public int doStartTag() throws JspException {
- try {
- pageContext.getOut().write("TAG WORKED");
- } catch (Exception e) {
-
- }
- return super.doStartTag();
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
deleted file mode 100644
index edb36ca0c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
deleted file mode 100644
index eb5941633..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>test-war</name>
- <comment></comment>
- <projects>
- <project>test-jar</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 84f2b1999..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:08:40 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 43db39ab9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Apr 24 11:08:46 BST 2007
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_01/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v4.1/owners=jst.web\:2.3
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 2c1da55d5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="test-war">
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/test-jar/test-jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <property name="context-root" value="test-war"/>
- <property name="java-output-path" value="build/classes"/>
-<property name="web_app_libraries_processed" value="true"/>
-<property name="ear_libraries_processed" value="true"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index dd3b08413..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v4.1"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.web" version="2.3"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/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/bug183756/test-war/src/main/webapp/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 47cea3c49..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID">
- <display-name>test-war</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/bug183756/test-war/src/main/webapp/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
deleted file mode 100644
index d3f943691..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://foo.com/testtags" prefix="test" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-</head>
-<body>
-Before Tag
-<test:test/>
-After Tag
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp
deleted file mode 100644
index 9b89ce07b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/css" pageEncoding="UTF-8"%>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp
deleted file mode 100644
index ac2daa51a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page %>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp
deleted file mode 100644
index 652ebe719..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="javascript" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp
deleted file mode 100644
index 382b355f0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp
deleted file mode 100644
index 10c772410..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="application/rdf+xml; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp
deleted file mode 100644
index 14a2df629..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/xml; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_107338</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/bug_107338/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/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/bug_107338/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml
deleted file mode 100644
index d03194ce9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/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>107338</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/bug_107338/WebContent/test107338.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
deleted file mode 100644
index 060f5d1b2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-<%
- int i = 0;
-%><%=i%><%
-
-%>
-</script> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
deleted file mode 100644
index 4600e2b0b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_08"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
deleted file mode 100644
index 770dfe43c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_109721</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 34906a0e5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +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>
- TagTest</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>*.jsp</url-pattern>
- <include-prelude>/header.jspf</include-prelude>
- </jsp-property-group></jsp-config>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
deleted file mode 100644
index 4dc2f5bd9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp
deleted file mode 100644
index 5d094dc1a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.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>
-<!-- note: the directive for bean exists in header.jspf as specified in the web.xml file -->
-<bean:define id="foo" ></bean:define>
-<%=alpha%>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
deleted file mode 100644
index 2a08dbaa7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-e</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/bug_118251-e/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/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/bug_118251-e/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index fbabe44db..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
- <tlibversion>1.2</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>libtags</shortname>
- <uri>http://nothing.com/libtags</uri>
- <tag>
- <name>ihaveattrs</name>
- <tagclass>nothing.taglib.ihaveattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>ireqattrs</name>
- <tagclass>nothing.taglib.ireqattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>emptyme</name>
- <tagclass>nothing.taglib.emptyme</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
-</taglib> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc80d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/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/bug_118251-e/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f0192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e725031..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
deleted file mode 100644
index e616adeb0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<libtags:ireqattrs><jsp:attribute name="name"></jsp:attribute></libtags:ireqattrs>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
deleted file mode 100644
index 22e550ecb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-f</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/bug_118251-f/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/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/bug_118251-f/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
deleted file mode 100644
index 1d5f5d40c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="Web Content/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="Web Content/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
deleted file mode 100644
index 5041b27e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-g</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/bug_118251-g/Web Content/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/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/bug_118251-g/Web Content/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
deleted file mode 100644
index 48030320d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The accompanying jar contains a TLD with a URI specified in
-it as well as a big long file that should slow down the
-taglib indexing.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_107338</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/bug_126377/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/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/bug_126377/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/web.xml
deleted file mode 100644
index ecdb74832..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/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>127377</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/bug_126377/WebContent/test126377_error.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_error.jsp
deleted file mode 100644
index 14a721c89..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_error.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-<script language="JavaScript>
-<!--
- // some JavaScript here
- <% imtrue = true;
- // more scriptlet here
- %>
- // more JavaScript here
--->
-</script>
-</head>
-<body>
-<!--
-<%
-boolean imtrue2 = imtrue;
-%>
--->
-
-<!--
-before if
-<% if (imtrue3) { %>
-after if
-before else
-<% } else { %>
-after else
-<% } %>
--->
-
-
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp
deleted file mode 100644
index 57da683ee..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-<script language="JavaScript>
-<!--
- // some JavaScript here
- <% boolean imtrue = true;
- // more scriptlet here
- %>
- // more JavaScript here
--->
-</script>
-</head>
-<body>
-<!--
-<%
-boolean imtrue2 = imtrue;
-%>
--->
-
-<!--
-before if
-<% if (imtrue2) { %>
-after if
-before else
-<% } else { %>
-after else
-<% } %>
--->
-
-
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
deleted file mode 100644
index ac7bfe413..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_148717</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 76ed56f40..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="bug_148717">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="bug_148717"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index eead6ed01..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="1.4"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/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/bug_148717/WebContent/WEB-INF/lib/internal.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
deleted file mode 100644
index ebad27b52..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 18536698d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" 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>prj119576_c</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>
- <taglib>
- <taglib-uri>http://example.com/external-uri</taglib-uri>
- <taglib-location>/WEB-INF/lib/internal.jar</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.project
deleted file mode 100644
index e3720e751..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_87351</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/bug_150794/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/WebContent/WEB-INF/web.xml
deleted file mode 100644
index bf80a5beb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/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>bug_87351</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/bug_150794/WebContent/escapedQuotes.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/WebContent/escapedQuotes.jsp
deleted file mode 100644
index 0ca950224..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/WebContent/escapedQuotes.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
- pageEncoding="UTF-8"%>
-<!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=UTF-8">
-<title>Inserting title here</title>
-</head>
-<body>
-<% String name = "Joe"; %>
-<jsp:setProperty name="testBean" property="name" value="<%=\"He\\\"llo \" + name %>"/>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_150794/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
deleted file mode 100644
index b63ab41fd..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
deleted file mode 100644
index 1db7a0050..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_174042</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf
deleted file mode 100644
index 363810814..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
deleted file mode 100644
index 6935c8865..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file="includeme.jspf"%>
- <%= id3 + alpha %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +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 com.nitin;
-
-public class TestBean {
-
- public TestBean() {
- }
-
- String dummyProperty = null;
-
- public String getDummyProperty() {
- return dummyProperty;
- }
-
- public void setDummyProperty(String dummyProperty) {
- this.dummyProperty = dummyProperty;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
deleted file mode 100644
index b63ab41fd..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
deleted file mode 100644
index 30509bf4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_178443</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
deleted file mode 100644
index 4292126c3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-
-
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
deleted file mode 100644
index bdda8a5fa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ include file="includeme.jspf"%>
-<% %>
-
-<bean:define id="beta"/>
-
- <%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +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 com.nitin;
-
-public class TestBean {
-
- public TestBean() {
- }
-
- String dummyProperty = null;
-
- public String getDummyProperty() {
- return dummyProperty;
- }
-
- public void setDummyProperty(String dummyProperty) {
- this.dummyProperty = dummyProperty;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
deleted file mode 100644
index add958d99..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry combineaccessrules="false" kind="src" path="/j"/>
- <classpathentry combineaccessrules="false" kind="src" path="/k"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
deleted file mode 100644
index 30509bf4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_178443</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
deleted file mode 100644
index 57efa607f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-<% %>
-
-<bean:define id="beta"/>
-
- <%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
+++ /dev/null
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
deleted file mode 100644
index d9b754cf3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ 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/bug_87351/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
deleted file mode 100644
index e3720e751..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_87351</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/bug_87351/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/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/bug_87351/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
deleted file mode 100644
index bf80a5beb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/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>bug_87351</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/bug_87351/WebContent/ihaveerrors.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
deleted file mode 100644
index 3baff4b7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% String this is broken %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.classpath
deleted file mode 100644
index 0387c74fa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.project
deleted file mode 100644
index ea463d301..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>delos</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/.jsdtscope b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/.jsdtscope
deleted file mode 100644
index f40dd98e2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/.jsdtscope
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
- <attributes>
- <attribute name="hide" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 291d8e9ce..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Sep 16 02:28:46 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index b2decb25f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="delos">
- <wb-resource deploy-path="/" source-path="/WebContent"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <property name="context-root" value="delos"/>
- <property name="java-output-path"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 00884a1b7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v6.0"/>
- <fixed facet="jst.web"/>
- <fixed facet="jst.java"/>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.web" version="2.5"/>
- <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.container b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.name b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/META-INF/MANIFEST.MF
deleted file mode 100644
index e24cb69eb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: delos; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: javax.servlet.jsp;bundle-version="[2.0.0,3.0.0)",
- javax.servlet;bundle-version="[2.4.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/1.jsp
deleted file mode 100644
index f6ab37dea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/1.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="/TestServlet"></jsp:include>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/WEB-INF/web.xml
deleted file mode 100644
index c2cbaca7f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
- <display-name>TestTomcat</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>
- <servlet>
- <description></description>
- <display-name>TestServlet</display-name>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>testtomcat.servlet.TestServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/TestServlet</url-pattern>
- </servlet-mapping>
-</web-app> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/src/testtomcat/servlet/TestServlet.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/src/testtomcat/servlet/TestServlet.java
deleted file mode 100644
index 3808f1b1b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/delos/src/testtomcat/servlet/TestServlet.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package testtomcat.servlet;
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet implementation class TestServlet
- */
-public class TestServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- /**
- * @see HttpServlet#HttpServlet()
- */
- public TestServlet() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
deleted file mode 100644
index 233be1d2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <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/j/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
deleted file mode 100644
index 63bc5f54d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>j</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/jspErrorProject.zip b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zip
deleted file mode 100644
index ebc7d9767..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
deleted file mode 100644
index 233be1d2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <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/k/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
deleted file mode 100644
index 304ac0bb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>k</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/prj119576_a/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_a</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/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/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
deleted file mode 100644
index af232736b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_a" 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>prj119576_a</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/prj119576_a/WebContent/body.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
deleted file mode 100644
index 55549b4dc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "taglib.jspf" %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
deleted file mode 100644
index 58db5bdca..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ include file = "body.jsp" %>
-<%@ include file = "body1.jsp" %>
-<sample:code/>
-<% java.util.Date bodyDate = headerDate; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
deleted file mode 100644
index a539fd633..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<% java.util.Date headerDate = null; %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
deleted file mode 100644
index 6c2d86f1e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
deleted file mode 100644
index 4cdb54229..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
+++ /dev/null
@@ -1,12 +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>
-<%="Hello, World!"%>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_a</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/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/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0ba8bed92..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_b" 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>prj119576_b</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/prj119576_b/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
deleted file mode 100644
index 828d2409d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file = "body1.jsp" %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
deleted file mode 100644
index eecf27e29..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
deleted file mode 100644
index 349f4b235..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_c</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/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/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 73560f865..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" 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>prj119576_c</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/prj119576_c/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
deleted file mode 100644
index 6aa228952..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file = "header.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
deleted file mode 100644
index 71c73cf10..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@include file = "body1.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
deleted file mode 100644
index 503c7a0b9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
deleted file mode 100644
index db32f9f45..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.classpath
deleted file mode 100644
index 5fb681cc8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.project
deleted file mode 100644
index da021e9b4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_178443</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>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/META-INF/MANIFEST.MF
deleted file mode 100644
index 31502b221..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: TestIterationTags
-Bundle-SymbolicName: testIterationTags
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: testiterationtags.Activator
-Require-Bundle: javax.servlet.jsp;bundle-version="2.0.0",
- javax.servlet;bundle-version="2.5.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/plain.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/plain.tld
deleted file mode 100644
index 828e0a94a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/plain.tld
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
-<tlibversion>1.2</tlibversion>
-<jspversion>1.1</jspversion>
-<shortname>plain</shortname>
-<uri>http://eclipse.org/plain</uri>
-<tag>
-<name>simple</name>
-<tagclass>org.eclipse.SimpleTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-</attribute>
-</tag>
-<tag>
-<name>loop</name>
-<tagclass>org.eclipse.LoopTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-</attribute>
-</tag>
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 5aa6dcac0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/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>testIterationTags</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/testIterationTags/WebContent/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test.jsp
deleted file mode 100644
index b1fc6f177..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="/WEB-INF/plain.tld" prefix="plain" %>
-<!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>
-<!-- Should generate an error since continue; can't be used in this construct -->
-<plain:simple>
-<% if(true) continue; %>
-</plain:simple>
-
-<plain:loop>
-<% if(true) continue; %>
-</plain:loop>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test_missing_end_tag.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test_missing_end_tag.jsp
deleted file mode 100644
index 2b4603c8c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/test_missing_end_tag.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="/WEB-INF/plain.tld" prefix="plain" %>
-<!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>
-
-<!-- Missing end tag for plain:loop -->
-<plain:loop>
-<% if(true) continue; %>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/LoopTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/LoopTag.java
deleted file mode 100644
index c644898cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/LoopTag.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse;
-
-public class LoopTag implements javax.servlet.jsp.tagext.IterationTag {
-
- public int doAfterBody() throws javax.servlet.jsp.JspException {
- return 0;
- }
-
- public int doEndTag() throws javax.servlet.jsp.JspException {
- return 0;
- }
-
- public int doStartTag() throws javax.servlet.jsp.JspException {
- return 0;
- }
-
- public javax.servlet.jsp.tagext.Tag getParent() {
- return null;
- }
-
- public void release() {
- }
-
- public void setPageContext(javax.servlet.jsp.PageContext pc) {
- }
-
- public void setParent(javax.servlet.jsp.tagext.Tag t) {
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/SimpleTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/SimpleTag.java
deleted file mode 100644
index e1adb540b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/SimpleTag.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse;
-
-public class SimpleTag implements javax.servlet.jsp.tagext.Tag {
-
- public int doEndTag() throws javax.servlet.jsp.JspException {
- return 0;
- }
-
- public int doStartTag() throws javax.servlet.jsp.JspException {
- return 0;
- }
-
- public Tag getParent() {
- return null;
- }
-
- public void release() {
- }
-
- public void setPageContext(javax.servlet.jsp.PageContext pc) {
- }
-
- public void setParent(javax.servlet.jsp.tagext.Tag t) {
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
deleted file mode 100644
index f3634481f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="web stuff/WEB-INF/lib/struts.jar"/>
- <classpathentry kind="output" path="web stuff/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
deleted file mode 100644
index 45399cdcb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testLoadTaglibs</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/testLoadTaglibs/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/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/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml
deleted file mode 100644
index e8d332769..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/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>testLoadTaglibs</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/testLoadTaglibs/web stuff/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp
deleted file mode 100644
index 29650a495..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.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">
-<%@taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
- <logic:empty/>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
deleted file mode 100644
index e73f83243..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-xmlns:logic="http://jakarta.apache.org/struts/tags-logic">
-
-<logic:empty/>
-
-</jsp:root> \ 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 0d9154b1e..000000000
--- 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 1d65c9b80..000000000
--- 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 254272e1c..000000000
--- 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 7e573802d..000000000
--- 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 14b695f8a..000000000
--- 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 14b695f8a..000000000
--- 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 8e983ea5b..000000000
--- 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 bac1d470d..000000000
--- 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 dd1a10af8..000000000
--- 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 b5be153ef..000000000
--- 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 14b695f8a..000000000
--- 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 14b695f8a..000000000
--- 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 909af098a..000000000
--- 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/testTranslatorMessagesWithIncludes/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project
deleted file mode 100644
index 147f01134..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testTranslatorMessagesWithIncludes</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/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld
deleted file mode 100644
index 53c815a5a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>input</short-name>
-
- <description>
- </description>
-
-
- <!-- HTML Text TAG -->
- <tag>
- <name>text</name>
- <tag-class>test.taglib.Text</tag-class>
- <body-content>empty</body-content>
- <description>
- Tag lib to show validation error.
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
-
-
-
-
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 1990ad793..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +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>test1</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/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf
deleted file mode 100644
index b2faa536c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf
+++ /dev/null
@@ -1 +0,0 @@
-topmargin=0 onLoad="loadPage();" onUnload="unloadPage();" \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp
deleted file mode 100644
index fd7297503..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
- <%@page import="java.util.Calendar"%>
-<%@ taglib uri="/WEB-INF/input.tld" prefix="input" %>
-<HTML>
-
-<HEAD>
-
-</HEAD>
-
-
-
-<BODY>
-
-<p>
- The problem in both cases is a missing equals sign after the percent. However the include file=is
- highlighed instead of the actual error
-
-
-
- <%@ include file="commonEventHandlers.jspf"%>
- </p>
-
- <p>
-
-
- <input:text name="<% Calendar.DAY_OF_MONTH %>" />
- </p>
- <p>
- <input:text name="<% Calendar.DAY_OF_MONTH %>" />
-
-
-
-</p>
-
-</BODY>
-</HTML>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme
+++ /dev/null
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 bd9e429e1..000000000
--- 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 aacc716f0..000000000
--- 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 8d045d090..000000000
--- 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 84754547d..000000000
--- 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 68074bb5a..000000000
--- 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/testavailable1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
deleted file mode 100644
index 8d5f4fb88..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" exported="false" kind="src" path="/testavailable2"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testavailable1</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/testavailable1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/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/testavailable1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testavailable1</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/testavailable2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/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/testavailable2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
deleted file mode 100644
index a335f6a37..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testcache1</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/testcache1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/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/testcache1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.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="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
deleted file mode 100644
index 274293f5a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testcache2</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/testcache2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/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/testcache2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +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>
- test1</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>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project
deleted file mode 100644
index 5f2075ae0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.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/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/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/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index 749285c87..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
- <tlibversion>1.2</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>libtags</shortname>
- <uri>http://nothing.com/libtags</uri>
- <tag>
- <name>ihaveattrs</name>
- <tagclass>nothing.taglib.ihaveattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>ireqattrs</name>
- <tagclass>nothing.taglib.ireqattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>emptyme</name>
- <tagclass>nothing.taglib.emptyme</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
- <tag>
- <name>emptybodycontent</name>
- <tagclass>nothing.taglib.emptyme</tagclass>
- <bodycontent>empty</bodycontent>
- </tag>
-</taglib> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc80d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/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/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp
deleted file mode 100644
index f0e834745..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/nonemptyinlinetag.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">
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptybodycontent>i should have an empty body</libtags:emptybodycontent>
-<libtags:emptyme>nothing</libtags:emptyme>
-<libtags:emptybodycontent />
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f0192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.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">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e725031..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
deleted file mode 100644
index 18acb7162..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<%-- Make sure that attributes can be defined using jsp:attribute --%>
-<libtags:ireqattrs><jsp:attribute name="name"></jsp:attribute></libtags:ireqattrs>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
+++ /dev/null
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 5f2075ae0..000000000
--- 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 254272e1c..000000000
--- 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 62ebcc80d..000000000
--- 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 acfff810a..000000000
--- 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 c259359ee..000000000
--- 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 c93e4aefa..000000000
--- 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 efb7d7401..000000000
--- 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 e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspdirectives/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f00..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d693..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index c4cbf9633..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the 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.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 42878d223..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = jspencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = testfiles/,\
- test.xml
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
deleted file mode 100644
index eea9f1fc3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Encoding Tests Plug-in \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 54097e04e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
- public static Test suite() {
- return new JSPEncodingTestSuite();
- }
-
- public JSPEncodingTestSuite() {
- super("JSP Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public JSPEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public JSPEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public JSPEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 7fdecd2ac..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static JSPEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
-
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public JSPEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index 16777c1ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public JSPEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = JSPEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testdefect4205wpsjsp() throws IOException {
- String filename = fileLocation + "defect_4205_wps.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testJSPEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true,
- * it appears incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "testUTF16.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16WithJapaneseChars() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16leXmlStyle() throws IOException {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 00791d7fb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.StringTokenizer;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fCharset;
- private String fContentType;
- private String fContentTypeValue;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
- private String fLanguage;
-
- private void doTestFile(String filename, String expectedName) throws Exception {
- doTestFile(filename, expectedName, null, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- JSPHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new JSPHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
-
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
-
- String foundContentType = getContentType();
- if (expectedContentType == null) {
- assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
- }
- else {
- assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- public void testNormalNonDefault() throws Exception {
- String filename = fileLocation + "NormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8");
- }
-
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * This method should be exactly the same as what is in
- * JSPResourceEncodingDetector
- *
- * @param contentType
- */
- private void parseContentTypeValue(String contentType) {
- /*
- * Based partially on
- * org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterImpl
- * .getMimeTypeFromContentTypeValue(String) , divides the full value
- * into segments according to ';', assumes the first specifies the
- * content type itself if it has no '=', and that the remainder are
- * parameters which may specify a charset
- */
-
- String cleanContentTypeValue = StringUtils.stripNonLetterDigits(contentType);
- /* Break the mime header into the main value and its parameters, separated by ';' */
- StringTokenizer tokenizer = new StringTokenizer(cleanContentTypeValue, ";"); //$NON-NLS-1$
- int tLen = tokenizer.countTokens();
- if (tLen == 0)
- return;
- String[] tokens = new String[tLen];
- int j = 0;
- while (tokenizer.hasMoreTokens()) {
- tokens[j] = tokenizer.nextToken();
- j++;
- }
-
- int firstParameter = 0;
- if (tokens[0].indexOf('=') == -1) {
- /*
- * no equal sign in the first segment, so assume it indicates a
- * content type properly
- */
- fContentType = tokens[0].trim();
- firstParameter = 1;
- }
- /*
- * now handle parameters as name=value pairs, looking for "charset"
- * specifically
- */
- Pattern equalPattern = Pattern.compile("\\s*=\\s*"); //$NON-NLS-1$
- for (int i = firstParameter; i < tokens.length; i++) {
- String[] pair = equalPattern.split(tokens[i]);
- if (pair.length < 2)
- continue;
- if (pair[0].trim().equals("charset")) { //$NON-NLS-1$
- fCharset = pair[1].trim();
- }
- }
-
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws Exception {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = null;
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
-
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- else if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fXMLDecEncodingName = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fPageEncodingValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fLanguage = valueToken.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws Exception {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testMinimalPageDirective() throws Exception {
- String filename = fileLocation + "minimalPageDirective.jsp";
- doTestFile(filename, null, null, "text/html");
- }
-
- public void testIllFormed() throws Exception {
- String filename = fileLocation + "testIllFormed.jsp";
- doTestFile(filename, null);
- }
-
- public void testIllFormed2() throws Exception {
- String filename = fileLocation + "testIllFormed2.jsp";
- doTestFile(filename, "UTF-8");
- }
-
- public void testIllformedNormalNonDefault() throws Exception {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8", null, "text/html");
- }
-
- public void testEmptyFile() throws Exception {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirective() throws Exception {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalPageDirectiveWithXMLDecl() throws Exception {
- String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
- doTestFile(filename, "ISO-8859-1", null, "text/html");
- }
-
-
- public void testNoPageDirectiveAtFirst() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirectiveInLargeFile() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
- }
-
- public void testNormalCaseWithNeither() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3", null, "text/html");
- }
-
- public void testUTF16le() throws Exception {
- String filename = fileLocation + "utf16le.jsp";
- doTestFile(filename, "UTF-16LE", null, "text/html");
- }
-
- public void testUTF16be() throws Exception {
- String filename = fileLocation + "utf16be.jsp";
- doTestFile(filename, "UTF-16BE", null, "text/html");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.zzRefill(JSPHeadTokenizer.java:359)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.primGetNextToken(JSPHeadTokenizer.java:598)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.getNextToken(JSPHeadTokenizer.java:254)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
- */
-
- public void testUTF16BOM() throws Exception {
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=243735
-// String filename = fileLocation + "utf16BOM.jsp";
-// dotestfile(filename, "utf-16", null, null);
- }
-
- public void testUTF16leXmlStyle() throws Exception {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFile(filename, "UTF-16LE", null, null);
- }
-
- public String getLanguage() {
- return fLanguage;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index a532152d9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
- super.doTest(expectedContentType, filePath, expectedException);
-
- IFile file = (IFile) getTestProject().findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
- checkResults(expectedJSPContentType, streamJSPContentType);
-
-
- String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
- checkResults(expectedJSPContentType, fileJSPContentType);
-
-
- }
-
- private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
- if (expectedJSPContentType == null) {
- assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
- }
- else {
- assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
- }
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
- }
- public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
- }
- public void testFile79() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
- }
-
-
- public void testFile90() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le.jsp", null, "text/html");
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16be.jsp", null, "text/html");
- }
-
- public void testFile105() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16BOM.jsp", null, null);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le_xmlStyle.jsp", null, null);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 8ed692ec2..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
-
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75a3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15e7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d5d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76ce8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e681a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248fe7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba82..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6a8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_‹‹Ž‹</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_‹‹Ž‹()== null ? "NULL" : selColBeanRow12Bean.getTEST2_‹‹Ž‹().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_Š‰</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_Š‰()== null ? "NULL" : selColBeanRow12Bean.getTEST2_Š‰().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_‰‰Ž‰</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_‰‰Ž‰()== null ? "NULL" : selColBeanRow12Bean.getTEST2_‰‰Ž‰().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_ŽŽŽŽ</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_ŽŽŽŽ()== null ? "NULL" : selColBeanRow12Bean.getTEST2_ŽŽŽŽ().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cfad..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652ab..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f45..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次:<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e304..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b49b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f15..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff9c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 76569028b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f50..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a0802..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042be..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981c0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f49..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684f9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958c4..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a4a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b73..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c1804..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a77..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3bcc..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636fca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c89..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850f8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e81783..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 6ee242e58..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e691612..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d94..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc37..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378b5..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbec6..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f6e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 35860beaa..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
- <accessrules>
- <accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
- <accessrule kind="accessible" pattern="org/w3c/dom/stylesheets/**/*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.core.tests/.cvsignore b/tests/org.eclipse.wst.css.core.tests/.cvsignore
deleted file mode 100644
index 9e9eed998..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
-javaCompiler.csscoretests.jar.args
diff --git a/tests/org.eclipse.wst.css.core.tests/.project b/tests/org.eclipse.wst.css.core.tests/.project
deleted file mode 100644
index 34797db86..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c6296e3c7..000000000
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: csscoretests.jar
-Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.core.tests.format,
- org.eclipse.wst.css.core.tests.format.testfiles,
- org.eclipse.wst.css.core.tests.model,
- org.eclipse.wst.css.core.tests.source,
- org.eclipse.wst.css.core.tests.testfiles,
- org.eclipse.wst.css.core.tests.testfiles.results,
- org.eclipse.wst.css.core.tests.util
-Require-Bundle: org.eclipse.wst.css.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit;bundle-version=3.8.2
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.core.tests/about.html b/tests/org.eclipse.wst.css.core.tests/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.wst.css.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the 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.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
deleted file mode 100644
index d5f389779..000000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- csscoretests.jar,\
- src/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- testfiles/
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.properties b/tests/org.eclipse.wst.css.core.tests/plugin.properties
deleted file mode 100644
index b6f9a81cf..000000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = CSS Core Tests Plug-in \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
deleted file mode 100644
index b40159318..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.core.tests.format.TestCleanupProcessorCSS;
-import org.eclipse.wst.css.core.tests.format.TestFormatProcessorCSS;
-import org.eclipse.wst.css.core.tests.model.CSSCharsetRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFaceRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFamilyTest;
-import org.eclipse.wst.css.core.tests.model.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSPageRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleSheetTest;
-import org.eclipse.wst.css.core.tests.model.TestCSSDecl;
-import org.eclipse.wst.css.core.tests.source.CSSSelectorTest;
-import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-import org.eclipse.wst.css.core.tests.stylesheets.StyleSheetTest;
-import org.eclipse.wst.css.core.tests.testfiles.CSSModelLoadTest;
-
-
-public class CSSAllTests extends TestSuite {
- public static Test suite() {
- TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
- addSourceTests(suite);
- addModelTests(suite);
-
- suite.addTestSuite(CSSCorePreferencesTest.class);
- suite.addTestSuite(StyleSheetTest.class);
- return suite;
- }
-
- private static void addSourceTests(TestSuite suite) {
- suite.addTestSuite(CSSSourceParserTest.class);
- suite.addTestSuite(CSSTextParserTest.class);
- suite.addTestSuite(CSSSelectorTest.class);
- suite.addTestSuite(CSSUrlTest.class);
- }
-
- private static void addModelTests(TestSuite suite) {
- suite.addTestSuite(CSSStyleSheetTest.class);
- suite.addTestSuite(CSSCharsetRuleTest.class);
- suite.addTestSuite(CSSImportRuleTest.class);
- suite.addTestSuite(CSSStyleRuleTest.class);
- suite.addTestSuite(CSSMediaRuleTest.class);
- suite.addTestSuite(CSSPageRuleTest.class);
- suite.addTestSuite(CSSFontFaceRuleTest.class);
- suite.addTestSuite(CSSFontFamilyTest.class);
- suite.addTestSuite(TestFormatProcessorCSS.class);
- suite.addTestSuite(TestCleanupProcessorCSS.class);
- suite.addTestSuite(TestCSSDecl.class);
- suite.addTestSuite(CSSModelLoadTest.class);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
deleted file mode 100644
index 86ad6b898..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CSSCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, CSSCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, CSSCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.CASE_IDENTIFIER, "2");
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
- pluginSetPreferenceInt(node, CSSCorePreferenceNames.CASE_PROPERTY_NAME);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceInt(IEclipsePreferences node, String prefKey) {
- int originalValue = node.getInt(prefKey, -999);
- int expectedValue = -888;
- node.putInt(prefKey, expectedValue);
- int foundValue = node.getInt(prefKey, -999);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if (originalValue == -999)
- node.remove(prefKey);
- else
- node.putInt(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForCSS.ContentTypeID_CSS);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForCSS.ContentTypeID_CSS);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- CSSDocumentLoader loader = new CSSDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
deleted file mode 100644
index edb47a272..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author pavery
- */
-public class CSSCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new CSSCoreTestSuite();
- }
-
- public CSSCoreTestSuite() {
- super("CSS Core Tests");
-
- addTest(CSSAllTests.suite());
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
deleted file mode 100644
index 19dc51656..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCoreTestsPlugin extends Plugin {
- // The shared instance.
- private static CSSCoreTestsPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public CSSCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.css.core.tests.CSSModelTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CSSCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java
deleted file mode 100644
index 2c1746664..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-public class ProjectUtil {
-
- /**
- * Creates a simple project.
- *
- * @param name -
- * the name of the project
- * @param location -
- * the location of the project, or null if the default of
- * "/name" within the workspace is to be used
- * @param natureIds -
- * an array of natures IDs to set on the project, null if none
- * should be set
- * @return
- */
- public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = CSSCoreTestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = CSSCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return file;
- }
-
- /**
- * @param rootEntry - avoid trailing separators
- * @param fullTargetPath
- */
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @param entryname
- * path relative to TEST plugin starting w/ a "/" (eg.
- * "/testfiles/bugnumber/struts-logic.tld")
- * @param fullPath
- * path relative to junit test workpace (eg.
- * "/myruntimeproj/struts-logic.tld")
- * @return
- */
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return file[0];
- }
-
- public static IProject createProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
deleted file mode 100644
index 1e53c7f18..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestCleanupProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private CleanupProcessorCSS fCleanupProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- fCleanupProcessor = new CleanupProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestCleanupProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void cleanupAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- fCleanupProcessor.cleanupModel(beforeModel);
-
- ByteArrayOutputStream cleanedupBytes = new ByteArrayOutputStream();
- beforeModel.save(cleanedupBytes); // "beforeModel" should now be
- // after the cleanup processor
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String cleanedupContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(cleanedupBytes.toByteArray(), UTF_8);
- assertTrue("Cleanup document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(cleanedupContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG166909urlCaseCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(true);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug166909-urlcase.css", "testfiles/bug166909-urlcase-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-
- public void testBug218993NoFormatCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(false);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug218993-noformat.css", "testfiles/bug218993-noformat-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
deleted file mode 100644
index 0098020a8..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
+++ /dev/null
@@ -1,179 +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.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestFormatProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private FormatProcessorCSS formatProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- public TestFormatProcessorCSS(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- formatProcessor = new FormatProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestFormatProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- formatProcessor.formatModel(beforeModel);
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String formattedContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(formattedContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG73990SelectorFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/BUG73990_selector_unformatted.css", "testfiles/BUG73990_selector_formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add extra semicolons.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG111569extraSemicolonFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug111569-extrasemicolon.css", "testfiles/bug111569-extrasemicolon-formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add space between selector and
- * attribute selectors <code>input[type="hidden"]</code> would be
- * wrongly formatted as<code>input [type="hidden"]</code> instead of
- * being left alone.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG146198attributeSpecifierFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug146198-attributespecifier.css", "testfiles/bug146198-attributespecifier-formatted.css");
- }
-
- public void testBUG110539multipleClassFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug110539-multipleclass.css", "testfiles/bug110539-multipleclass-formatted.css");
- }
-
- public void testBUG248465combinedPseudoClass() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug248465-combined-pseudo-classes.css", "testfiles/bug248465-combined-pseudo-classes-fmt.css");
- }
-
- public void testBUG196476selectorPseudoclassesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug196476-selector-pseudo-classes.css", "testfiles/bug196476-selector-pseudo-classes-fmt.css");
- }
-
- /**
- * file should not change after format
- */
- public void testBUG163315SlashBeforePrimative1() throws UnsupportedEncodingException, IOException, CoreException {
- //
- formatAndAssertEquals("testfiles/bug163315-slash_before_primative_1.css", "testfiles/bug163315-slash_before_primative_1.css");
- }
-
- /**
- * space after / should be removed
- */
- public void testBUG163315SlashBeforePrimative2() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug163315-slash_before_primative_2.css", "testfiles/bug163315-slash_before_primative_1.css");
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
deleted file mode 100644
index 6da6ff707..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Class as selector */
-H1.pastoral {
- color: #00FF00
-}
-
-/* ID as selector */
-#z98y {
- letter-spacing: 0.3em
-}
-
-H1#z98y {
- letter-spacing: 0.5em
-}
-
-/* Contextual selectors */
-DIV P {
- font: small sans-serif
-}
-
-.reddish H1 {
- color: red
-}
-
-#x78y CODE {
- background: blue
-}
-
-DIV.sidenote H1 {
- font-size: large
-}
-
-/* Anchor pseudo-classes */
-A:link {
- color: red
-} /* unvisited link */
-A:visited {
- color: blue
-} /* visited links */
-A:active {
- color: lime
-} /* active links */ /* Pseudo-class combined with normal class */
-A.external:visited {
- color: blue
-}
-
-/* 'first-line' pseudo-element */
-P:first-line {
- font-variant: small-caps
-}
-
-/* 'first-letter' pseudo-element */
-P:first-letter {
- font-size: 200%;
- float: left
-}
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter {
- color: purple
-}
-
-P.initial:first-letter {
- color: red
-}
-
-/* Multiple pseudo-elements */
-P {
- color: red;
- font-size: 12pt
-}
-
-P:first-letter {
- color: green;
- font-size: 200%
-}
-
-P:first-line {
- color: blue
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
deleted file mode 100644
index ed52c9395..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Class as selector */
-H1.pastoral { color: #00FF00 }
-
-/* ID as selector */
-#z98y { letter-spacing: 0.3em }
-H1#z98y { letter-spacing: 0.5em }
-
-/* Contextual selectors */
-DIV P { font: small sans-serif }
-.reddish H1 { color: red }
-#x78y CODE { background: blue }
-DIV.sidenote H1 { font-size: large }
-
-/* Anchor pseudo-classes */
-A:link { color: red } /* unvisited link */
-A:visited { color: blue } /* visited links */
-A:active { color: lime } /* active links */
-
-/* Pseudo-class combined with normal class */
-A.external:visited { color: blue }
-
-/* 'first-line' pseudo-element */
-P:first-line { font-variant: small-caps }
-
-/* 'first-letter' pseudo-element */
-P:first-letter { font-size: 200%; float: left }
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter { color: purple }
-P.initial:first-letter { color: red }
-
-/* Multiple pseudo-elements */
-P { color: red; font-size: 12pt }
-P:first-letter { color: green; font-size: 200% }
-P:first-line { color: blue }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
deleted file mode 100644
index 537e7b502..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
- color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
- color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
- border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
- border-top: 0px;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
deleted file mode 100644
index fe5073f93..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
-color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
-color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
-border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
-border-top: 0px;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
deleted file mode 100644
index c66e6e9d5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.sitemaplev1 {
- font-family: Verdana;
- font-size: 12px;
- line-height: 17px;
- color: #666666;
- font-weight: bold;
- text-decoration: none;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
deleted file mode 100644
index c8e307d6e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.sitemaplev1{font-family:Verdana;font-size:12px;line-height:17px;
-color:#666666;font-weight:bold;
-text-decoration:none;} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
deleted file mode 100644
index 55ad1ca26..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
- width: 98%;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
deleted file mode 100644
index 72c1dbdaa..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
-width: 98%;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css
deleted file mode 100644
index 8dd838090..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-.test {
- font: 11px/18px Verdana, Arial;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css
deleted file mode 100644
index 2ce3c757a..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-.test {
- font: 11px/ 18px Verdana, Arial;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
deleted file mode 100644
index 60dea46dd..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: url(mixedCase/projectLogo.gif);
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
deleted file mode 100644
index dfd0aaa58..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: URL(mixedCase/projectLogo.gif);
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css
deleted file mode 100644
index d745f61af..000000000
--- 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 a83df3fda..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css
+++ /dev/null
@@ -1,6 +0,0 @@
-#block:after { content: "."; }
-div.content #block:after { content: "."; }
-#block::after {content: "."; }
-div span.fix.clear { clear: both; }
-div span.fix.clear:after { content: both; }
-div:after { content: "."; } \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
deleted file mode 100644
index cd8d95c10..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@charset "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- text-align: left;
- z-index: 2;
-}
-
-
-#context {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
deleted file mode 100644
index 26768016b..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- TEXT-ALIGN: LEFT;
- z-index: 2;
-}
-
-
-#CONTEXT {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css
deleted file mode 100644
index 336e6f439..000000000
--- 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 401e0969e..000000000
--- 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/model/AbstractModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
deleted file mode 100644
index 433334a6b..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-public class AbstractModelTest extends TestCase {
- protected ICSSModel fModel = null;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
- fModel = FileUtil.createModel();
- }
-
- protected void tearDown() throws Exception {
- if (fModel != null) {
- fModel.releaseFromEdit();
- fModel = null;
- }
- super.tearDown();
- }
-
- protected ICSSModel getModel() {
- return fModel;
- }
-
- protected ICSSStyleSheet getStyleSheet() {
- return (ICSSStyleSheet) fModel.getDocument();
- }
-
- class PrimitiveNumber {
- short type;
- float value;
-
- PrimitiveNumber(short newType, float newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- class PrimitiveString {
- short type;
- String value;
-
- PrimitiveString(short newType, String newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- /* for int, float */
- protected void checkPrimitiveNumber(CSSValue actual, PrimitiveNumber expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getFloatValue(expected.type), 0);
- }
-
- /* for string */
- protected void checkPrimitiveString(CSSValue actual, PrimitiveString expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getStringValue());
- }
-
- /* for counter */
- protected void checkPrimitiveCounter(CSSValue actual, String identifier, String listStyle, String separator) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_COUNTER, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Counter counter = ((CSSPrimitiveValue) actual).getCounterValue();
- assertEquals(identifier, counter.getIdentifier());
- assertEquals(listStyle, counter.getListStyle());
- assertEquals(separator, counter.getSeparator());
- }
-
- /* for rect */
- protected void checkPrimitiveRect(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RECT, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Rect rect = ((CSSPrimitiveValue) actual).getRectValue();
- CSSPrimitiveValue value;
- Object expected;
- value = rect.getTop();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getRight();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getBottom();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getLeft();
- expected = expectedArray[3];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
- /* for rgb */
- protected void checkPrimitiveRgb(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RGBCOLOR, ((CSSPrimitiveValue) actual).getPrimitiveType());
- RGBColor color = ((CSSPrimitiveValue) actual).getRGBColorValue();
- CSSPrimitiveValue value;
- Object expected;
- value = color.getRed();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getGreen();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getBlue();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
deleted file mode 100644
index dfb4abe74..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-public class CSSCharsetRuleTest extends AbstractModelTest {
- private final String RULE = "@charset \"iso-8859-1\";";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- CSSCharsetRule newRule = doc.createCSSCharsetRule();
- newRule.setEncoding("iso-8859-1");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
deleted file mode 100644
index babf77275..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSFontFaceRuleTest extends AbstractModelTest {
- public void testInsertRule() {
- final String RULE = "@font-face { font-family: \"Swiss 721\"; src: url(swiss721.pfr); /* The expanded Swiss 721 */ font-stretch: expanded; }";
- CSSStyleSheet sheet = getStyleSheet();
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSFontFaceRule);
-
- CSSStyleDeclaration declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- CSSValue value;
- CSSPrimitiveValue primitiveValue;
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_STRING, primitiveValue.getPrimitiveType());
- assertEquals("Swiss 721", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_URI, primitiveValue.getPrimitiveType());
- assertEquals("swiss721.pfr", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("font-stretch");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_IDENT, primitiveValue.getPrimitiveType());
- assertEquals("expanded", primitiveValue.getStringValue());
- }
-
- public void _testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(4, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Swiss 721"));
-
- value = declaration.getPropertyCSSValue("src");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "swiss721blk.pfr"));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 800));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 900));
- }
-
- public void _testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(6, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Palatino"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Times New Roman"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(4), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "New York"));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(6), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Utopia"));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(8), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://somewhere/free/font"));
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 100));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 200));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-variant");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "all"));
- }
-
- public void _testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(5, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(4, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Alabama Italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.fonts.org/A/alabama-italic"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truetype"));
-
- value = declaration.getPropertyCSSValue("panose-1");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(10, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(3), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(5), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(7), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 9));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
- checkPrimitiveNumber(valueList.item(9), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Alabama"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(5, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "oblique"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java
deleted file mode 100644
index e6ce0d552..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-
-public class CSSFontFamilyTest extends AbstractModelTest {
-
- private static final String FONT_FAMILY = "font-family";
-
- public void testFontFamilies() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFamilyTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList rules = sheet.getCssRules();
- assertEquals(4, rules.getLength());
-
- // Rule 1: No whitespace
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // Rule 1: No whitespace
- rule = rules.item(0);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Courier"));
-
- // Rule 2: Single whitespace
- rule = rules.item(1);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Courier New"));
-
- // Rule 3: In quotes
- rule = rules.item(2);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Courier New"));
-
- // Rule 4: Tabs and spaces all over
- rule = rules.item(3);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Comic Sans"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
deleted file mode 100644
index a22eb8d68..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSImportRuleTest extends AbstractModelTest {
-
- public void testInsertRuleDoubleQuote() {
- checkInsert("@import \"dummy.css\";", "dummy.css", null);
- }
-
- public void testInsertRuleSingleQuote() {
- checkInsert("@import \'dummy.css\';", "dummy.css", null);
- }
-
- public void testInsertRuleUrlNoQuote() {
- checkInsert("@import url(dummy.css);", "dummy.css", null);
- }
-
- public void testInsertRuleUrlDoubleQuote() {
- checkInsert("@import url(\"dummy.css\");", "dummy.css", null);
- }
-
- public void testInsertRuleUrlSingleQuote() {
- checkInsert("@import url(\'dummy.css\');", "dummy.css", null);
- }
-
- public void testInsertRuleMedia1() {
- checkInsert("@import url(\"dummy.css\") media1;", "dummy.css", new String[]{"media1"});
- }
-
- public void testInsertRuleMedia2() {
- checkInsert("@import url(\'dummy.css\') media1, media2;", "dummy.css", new String[]{"media1", "media2"});
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSImportRule newRule = doc.createCSSImportRule();
- newRule.setHref("dummy.css");
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals("dummy.css", importRule.getHref());
- MediaList mediaList = importRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@import url(\"dummy.css\") media1, media2;", importRule.getCssText());
- }
-
- private void checkInsert(String ruleString, String href, String[] media) {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(ruleString, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
-
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals(href, importRule.getHref());
-
- if (media != null) {
- assertEquals(media.length, importRule.getMedia().getLength());
- for (int i = 0; i < media.length; i++) {
- assertEquals(media[i], importRule.getMedia().item(i));
- }
- }
-
- assertEquals(ruleString, importRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
deleted file mode 100644
index 08f28400a..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSMediaRuleTest extends AbstractModelTest {
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSMediaRule newRule = doc.createCSSMediaRule();
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSMediaRule);
- CSSMediaRule mediaRule = (CSSMediaRule) rule;
-
- MediaList mediaList = mediaRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@media media1, media2 {" + FileUtil.commonEOL + "}", mediaRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
deleted file mode 100644
index 429bc0275..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSPageRuleTest extends AbstractModelTest {
- public void testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, (float) 8.5));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 11));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 2));
- }
-
- public void testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "auto"));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 10));
- }
-
- public void testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":left", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
- }
-
- public void testInsertText4() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 4
-
- rule = ruleList.item(3);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":right", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
- }
-
- public void testInsertText5() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 5
-
- rule = ruleList.item(4);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("narrow", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 9));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 18));
- }
-
- public void testInsertText6() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 6
-
- rule = ruleList.item(5);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("rotated", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "landscape"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
deleted file mode 100644
index 589662eaf..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSStyleRuleTest extends AbstractModelTest {
- public void testInsertTextNumbers() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(20, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("NUMBER");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_NUMBER, 123.456f));
-
- // 02
- value = declaration.getPropertyCSSValue("PERCENTAGE");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 123.456f));
-
- // 03
- value = declaration.getPropertyCSSValue("EMS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EMS, 123.456f));
-
- // 04
- value = declaration.getPropertyCSSValue("EXS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EXS, 123.456f));
-
- // 05
- value = declaration.getPropertyCSSValue("PX");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, +123.456f));
- value = declaration.getPropertyCSSValue("PX2");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, -123f));
-
-
-
- // 06
- value = declaration.getPropertyCSSValue("CM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 123.456f));
-
- // 07
- value = declaration.getPropertyCSSValue("MM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MM, 123.456f));
-
- // 08
- value = declaration.getPropertyCSSValue("IN");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 123.456f));
-
- // 09
- value = declaration.getPropertyCSSValue("PT");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PT, 123.456f));
-
- // 10
- value = declaration.getPropertyCSSValue("PC");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PC, 123.456f));
-
- // 11
- value = declaration.getPropertyCSSValue("DEG");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DEG, -123.456f));
-
- // 12
- value = declaration.getPropertyCSSValue("RAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_RAD, 123.456f));
-
- // 13
- value = declaration.getPropertyCSSValue("GRAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_GRAD, 123.456f));
-
- // 14
- value = declaration.getPropertyCSSValue("MS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MS, 123.456f));
-
- // 15
- value = declaration.getPropertyCSSValue("S");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_S, 123.456f));
-
- // 16
- value = declaration.getPropertyCSSValue("HZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_HZ, 123.456f));
-
- // 17
- value = declaration.getPropertyCSSValue("KHZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_KHZ, 123.456f));
-
- // 18
- value = declaration.getPropertyCSSValue("DIMENSION");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DIMENSION, -123.456f));
-
- // 19
- value = declaration.getPropertyCSSValue("INTEGER");
- checkPrimitiveNumber(value, new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 123));
- }
-
- public void testInsertTextStrings() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(11, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("STRING");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "string"));
-
- // 02
- value = declaration.getPropertyCSSValue("URI");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.ibm.com/"));
-
- // 03
- value = declaration.getPropertyCSSValue("IDENT");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "left"));
-
- // 04
- value = declaration.getPropertyCSSValue("HASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_HASH, "#abcdef"));
-
- // 05
- value = declaration.getPropertyCSSValue("URANGE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_URANGE, "U+20A7"));
-
- // 06
- value = declaration.getPropertyCSSValue("SLASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_SLASH, "/"));
-
- // 07
- value = declaration.getPropertyCSSValue("COMMA");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-
- // 08
- value = declaration.getPropertyCSSValue("INHERIT_PRIMITIVE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE, "inherit"));
-
- // 09
- value = declaration.getPropertyCSSValue("ATTR");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_ATTR, "KEY"));
-
- // 10
- value = declaration.getPropertyCSSValue("FORMAT");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truedoc"));
-
- // 11
- value = declaration.getPropertyCSSValue("LOCAL");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Excelsior Roman"));
- }
-
- public void testInsertTextFunctions() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("COUNTER");
- checkPrimitiveCounter(value, "par-num", "upper-roman", null);
-
- value = declaration.getPropertyCSSValue("RECT");
- checkPrimitiveRect(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 12), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 34), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 56), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 78)});
-
- value = declaration.getPropertyCSSValue("RGBCOLOR");
- checkPrimitiveRgb(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 255), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 128), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 0)});
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
deleted file mode 100644
index c23ceb4a3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-public class CSSStyleSheetTest extends AbstractModelTest {
- private final static String RULE_H1 = "H1 { color : red; }";
- private final static String RULE_H2 = "H2 { color : red; }";
- private final static String RULE_H3 = "H3 { color : red; }";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule;
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H2, rule.getCssText());
- rule = ruleList.item(2);
- assertEquals(RULE_H3, rule.getCssText());
-
- }
-
- public void testDeleteRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList;
- CSSRule rule;
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H3, rule.getCssText());
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
-
- sheet.deleteRule(0);
-
- try {
- sheet.deleteRule(0);
- }
- catch (DOMException e) {
- assertEquals(DOMException.INDEX_SIZE_ERR, e.code);
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
deleted file mode 100644
index e6fc9ae28..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory;
-import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class TestCSSDecl extends TestCase {
- // commenting out this test because decl.setCssText() is not an implemented method
-// public void testDecl() {
-// CSSPropertyContext context = new CSSPropertyContext();
-// ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
-// context.initialize(decl);
-// decl.setCssText(getString() != null ? getString() : "");//$NON-NLS-1$
-// }
-// private String getString() {
-// return "body {}";
-// }
-
- public void testStandaloneCSSDecl() {
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=202615
- CSSPropertyContext context = new CSSPropertyContext();
- ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
- context.initialize(decl);
- String cssText = decl.getCssText();
- assertEquals("standalone css node was not initialized", "", cssText); //$NON-NLS-1$ //$NON-NLS-2$
-
- context.setMargin("auto"); //$NON-NLS-1$
- context.setColor("red"); //$NON-NLS-1$
- context.setBorder("thick"); //$NON-NLS-1$
- context.applyFull(decl);
- cssText = decl.getCssText();
- String expected = "color: red; border: thick; margin: auto"; //$NON-NLS-1$
- assertEquals("standalone css node's properties were not set as expected", expected, cssText); //$NON-NLS-1$
- }
-
- public void testCSSStyleDeclItem() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemMODE_DECLARATION() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemSTYLE_SHEET() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_STYLESHEET);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSModel() {
-
- ICSSModel model = FileUtil.createModel();
-
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(getHTMLDocumentText());
-
- IStructuredDocumentRegion region = structuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- /**
- * To test https://bugs.eclipse.org/298111
- */
- public void testInsertPropertyInExistingRule() {
- ICSSModel model = FileUtil.createModel();
- try {
- String originalDocument =
- "@CHARSET \"ISO-8859-1\";\r\n" +
- ".test {\r\n" +
- "}";
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(originalDocument);
-
- IndexedRegion indexedRegion = model.getIndexedRegion(28);
- assertTrue("Indexed region should be an ICSSStyleRule", indexedRegion instanceof ICSSStyleRule);
- ICSSStyleRule rule = (ICSSStyleRule)indexedRegion;
- ICSSStyleDeclaration declaration = (ICSSStyleDeclaration)rule.getStyle();
- declaration.setProperty("color", "#008040", null);
- CSSPropertyContext context = new CSSPropertyContext(declaration);
- context.applyModified(declaration);
- String newDocument = structuredDocument.get();
- String expectedNewDocument =
- "@CHARSET \"ISO-8859-1\";\r\n" +
- ".test {\r\n" +
- "\tcolor: #008040\r\n" +
- "}";
-
- assertEquals("The updated CSS document does not equal the expected", expectedNewDocument, newDocument);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private String getHTMLDocumentText() {
- String text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n" +
- "<HTML><HEAD>\r\n" +
- "<META http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\r\n" +
- "<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\r\n" +
- "<TITLE></TITLE>\r\n" +
- "<STYLE type=\"text/css\">\r\n" +
- "<!--\r\n" +
- "BODY{\r\n" +
- " color : teal;\r\n" +
- " background-color: #FFFF99;\r\n" +
- "}\r\n" +
- "H1{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 10px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 10px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H2{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 7px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 7px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H3{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 4px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 4px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "HR{\r\n" +
- " color : teal;\r\n" +
- " height: 3px;\r\n" +
- "}\r\n" +
- "P{\r\n" +
- " color : teal;\r\n" +
- "}\r\n" +
- "TH{\r\n" +
- " color: #FFFFCC;\r\n" +
- " background-color : teal;\r\n" +
- "}\r\n" +
- "TD{\r\n" +
- " color : black;\r\n" +
- " background-color : white;\r\n" +
- "}\r\n" +
- "-->\r\n" +
- "</STYLE>\r\n" +
- "</HEAD><BODY>\r\n" +
- "<H1>Heading 1 Heading 1</H1>\r\n" +
- "<H2>Heading 2 Heading 2</H2>\r\n" +
- "<H3>Heading 3 Heading 3</H3>\r\n" +
- "<HR>\r\n" +
- "<P>Normal Text</P>\r\n" +
- "<P style=\"color : white; background-color : teal;\">Normal Text with inline style</P>\r\n" +
- "<HR>\r\n" +
- "<TABLE border=\"1\">\r\n" +
- " <TBODY>\r\n" +
- " <TR>\r\n" +
- " <TH colspan=\"3\">Header Cell of Table</TH>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " </TBODY>\r\n" +
- "</TABLE>\r\n" +
- "</BODY></HTML>";
- return text;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
deleted file mode 100644
index 3d643d29e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,858 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class CSSSelectorTest extends TestCase {
- public void testSelector01() {
- ICSSSelectorList list = createSelectorList("H1, H2, H3");
- checkSelectorList(list, "H1, H2, H3", 3, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H2", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- // see 214416 Dot char is not escaped in XML10Names.jFlex
- // for complications leading to this test being changed.
- public void testSelector02() {
- ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
- checkSelectorList(list, "H\\\\, H\\1, H3", 3, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H\\\\", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H\\1", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- public void testSelector03() {
- ICSSSelectorList list = createSelectorList("H1.pastoral");
- checkSelectorList(list, "H1.pastoral", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.pastoral", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral"});
- }
-
- public void testSelector04() {
- ICSSSelectorList list = createSelectorList("P.pastoral.marine");
- checkSelectorList(list, "P.pastoral.marine", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.pastoral.marine", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral", "marine"});
- }
-
- public void testSelector05() {
- ICSSSelectorList list = createSelectorList("*.warning");
- checkSelectorList(list, "*.warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector06() {
- ICSSSelectorList list = createSelectorList(".warning");
- checkSelectorList(list, ".warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector07() {
- ICSSSelectorList list = createSelectorList("*[lang=fr]");
- checkSelectorList(list, "*[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector08() {
- ICSSSelectorList list = createSelectorList("[lang=fr]");
- checkSelectorList(list, "[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector09() {
- ICSSSelectorList list = createSelectorList("*#myid");
- checkSelectorList(list, "*#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector10() {
- ICSSSelectorList list = createSelectorList("#myid");
- checkSelectorList(list, "#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector11() {
- ICSSSelectorList list = createSelectorList("H1#z98y");
- checkSelectorList(list, "H1#z98y", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1#z98y", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"z98y"});
- }
-
- public void testSelector12() {
- ICSSSelectorList list = createSelectorList("H1 EM");
- checkSelectorList(list, "H1 EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1 EM", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector13() {
- ICSSSelectorList list = createSelectorList("DIV * P");
- checkSelectorList(list, "DIV * P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV * P", 5, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector14() {
- ICSSSelectorList list = createSelectorList("DIV P *[href]");
- checkSelectorList(list, "DIV P *[href]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV P *[href]", 5, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"href"});
- }
-
- public void testSelector15() {
- ICSSSelectorList list = createSelectorList("BODY > P");
- checkSelectorList(list, "BODY > P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "BODY > P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "BODY", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector16() {
- ICSSSelectorList list = createSelectorList("DIV OL>LI P");
- checkSelectorList(list, "DIV OL > LI P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV OL > LI P", 7, 4, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "OL", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "LI", false, 0, 0, 0, 0);
-
- item = selector.getItem(5);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(6);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector17() {
- ICSSSelectorList list = createSelectorList("MATH + P");
- checkSelectorList(list, "MATH + P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "MATH + P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "MATH", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector18() {
- ICSSSelectorList list = createSelectorList("H1.opener + H2");
- checkSelectorList(list, "H1.opener + H2", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.opener + H2", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"opener"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
- }
-
- public void testSelector19() {
- ICSSSelectorList list = createSelectorList("EXAMPLE[notation=decimal]");
- checkSelectorList(list, "EXAMPLE[notation=decimal]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "EXAMPLE[notation=decimal]", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "EXAMPLE", false, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"notation=decimal"});
- }
-
- public void testSelector20() {
- ICSSSelectorList list = createSelectorList("SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]");
- checkSelectorList(list, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "SPAN", false, 2, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"hello=\"Cleveland\"", "goodbye=\"Columbus\""});
- }
-
- public void testSelector21() {
- ICSSSelectorList list = createSelectorList("DIV > P:first-child");
- checkSelectorList(list, "DIV > P:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV > P:first-child", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector22() {
- ICSSSelectorList list = createSelectorList("P:first-child EM");
- checkSelectorList(list, "P:first-child EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P:first-child EM", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector23() {
- ICSSSelectorList list = createSelectorList("* > A:first-child");
- checkSelectorList(list, "* > A:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "* > A:first-child", 3, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector24() {
- ICSSSelectorList list = createSelectorList("A:link");
- checkSelectorList(list, "A:link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:link", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector25() {
- ICSSSelectorList list = createSelectorList(":link");
- checkSelectorList(list, ":link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ":link", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector26() {
- ICSSSelectorList list = createSelectorList("A:focus:hover");
- checkSelectorList(list, "A:focus:hover", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:focus:hover", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 2);
- checkSimpleSelectorPseudoNames(item, new String[]{"focus", "hover"});
- }
-
- public void testSelector27() {
- ICSSSelectorList list = createSelectorList("HTML:lang(de) > Q");
- checkSelectorList(list, "HTML:lang(de) > Q", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "HTML:lang(de) > Q", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "HTML", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"lang(de)"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "Q", false, 0, 0, 0, 0);
- }
-
- public void testSelector28() {
- ICSSSelectorList list = createSelectorList("P > A:link, A.external:visited");
- checkSelectorList(list, "P > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P > A:link", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector29() {
- ICSSSelectorList list = createSelectorList("P#hoge98 + *:hover > A:link, A.external:visited");
- checkSelectorList(list, "P#hoge98 + *:hover > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P#hoge98 + *:hover > A:link", 5, 10202, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"hoge98"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"hover"});
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector30() {
- ICSSSelectorList list = createSelectorList("H1.123");
- checkSelectorList(list, "H1.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.123", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector31() {
- ICSSSelectorList list = createSelectorList("P.123.456");
- checkSelectorList(list, "P.123.456", 1, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.123.456", 1, 201, 2);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123", "456"});
- }
-
- public void testSelector32() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector33() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector34() {
- ICSSSelectorList list = createSelectorList("H1.1x3");
- checkSelectorList(list, "H1.1x3", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.1x3", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- }
-
- public void testSelector35() {
- ICSSSelectorList list = createSelectorList("H2.123#46");
- checkSelectorList(list, "H2.123#46", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H2.123#46", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- checkSimpleSelectorIDs(item, new String[]{"46"});
- }
-
- public void testSelector36() {
- ICSSSelectorList list = createSelectorList("H3.1x3#4t2");
- checkSelectorList(list, "H3.1x3#4t2", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H3.1x3#4t2", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- checkSimpleSelectorIDs(item, new String[]{"4t2"});
- }
-
- public void testSelector37() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector38() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector39() {
- ICSSSelectorList list = createSelectorList(".123f567");
- checkSelectorList(list, ".123f567", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123f567", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123f567"});
- }
-
- // Bug 221504: whitespace preceding a selector separator was causing selectors
- // to be merged
- public void testSelector40() {
- ICSSSelectorList list = createSelectorList("h1.fix , h2.fix, h3.fix , div#container");
- checkSelectorList(list, "h1.fix, h2.fix, h3.fix, div#container", 4, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "h1.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "h2.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h2", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(2);
- checkSelector(selector, "h3.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h3", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(3);
- checkSelector(selector, "div#container", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "div", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[] {"container"});
- }
-
- private void checkSelectorList(ICSSSelectorList list, String formattedSource, int nSelectors, int nErrors) {
- assertEquals(formattedSource, list.getString());
- assertEquals(nSelectors, list.getLength());
- assertEquals(nErrors, list.getErrorCount());
- }
-
- private void checkSelector(ICSSSelector selector, String formattedSource, int items, int specificity, int nErrors) {
- assertEquals(formattedSource, selector.getString());
- assertEquals(items, selector.getLength());
- assertEquals(specificity, selector.getSpecificity());
- assertEquals(nErrors, selector.getErrorCount());
- }
-
- private void checkSimpleSelector(ICSSSelectorItem selector, String formattedSource, boolean isUniversal, int nAttributes, int nClasses, int nIds, int nPseudoNames) {
- assertTrue(selector instanceof ICSSSimpleSelector);
- assertEquals(formattedSource, ((ICSSSimpleSelector) selector).getName());
- assertEquals(isUniversal, ((ICSSSimpleSelector) selector).isUniversal());
- assertEquals(nAttributes, ((ICSSSimpleSelector) selector).getNumOfAttributes());
- assertEquals(nClasses, ((ICSSSimpleSelector) selector).getNumOfClasses());
- assertEquals(nIds, ((ICSSSimpleSelector) selector).getNumOfIDs());
- assertEquals(nPseudoNames, ((ICSSSimpleSelector) selector).getNumOfPseudoNames());
- }
-
- private void checkSimpleSelectorAttributes(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfAttributes();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getAttribute(i));
- }
- }
-
- private void checkSimpleSelectorClasses(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfClasses();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getClass(i));
- }
- }
-
- private void checkSimpleSelectorIDs(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfIDs();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getID(i));
- }
- }
-
- private void checkSimpleSelectorPseudoNames(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfPseudoNames();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getPseudoName(i));
- }
- }
-
- private void checkSelectorCombinator(ICSSSelectorItem combinator, String formattedSource, int combinatorType) {
- assertTrue(combinator instanceof ICSSSelectorCombinator);
- assertEquals(formattedSource, ((ICSSSelectorCombinator) combinator).getString());
- assertEquals(combinatorType, ((ICSSSelectorCombinator) combinator).getCombinatorType());
- }
-
- private ICSSSelectorList createSelectorList(String str) {
- return new CSSSelectorListImpl(str);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
deleted file mode 100644
index 5c1e58bb0..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/**
- *
- */
-public class CSSSourceParserTest extends TestCase {
- public void testSourceOpen1() throws IOException {
- sourceParserTest("sample01.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen2() throws IOException {
- sourceParserTest("sample02.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen3() throws IOException {
- sourceParserTest("sample03.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen4() throws IOException {
- sourceParserTest("sample04.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen5() throws IOException {
- sourceParserTest("sample05.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen6() throws IOException {
- sourceParserTest("sample06.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen7() throws IOException {
- sourceParserTest("sample07.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen8() throws IOException {
- sourceParserTest("sample08.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend1() throws IOException {
- sourceParserTest("sample01.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend2() throws IOException {
- sourceParserTest("sample02.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend3() throws IOException {
- sourceParserTest("sample03.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend4() throws IOException {
- sourceParserTest("sample04.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend5() throws IOException {
- sourceParserTest("sample05.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend6() throws IOException {
- sourceParserTest("sample06.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend7() throws IOException {
- sourceParserTest("sample07.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend8() throws IOException {
- sourceParserTest("sample08.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert1() throws IOException {
- sourceParserTest("sample01.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert2() throws IOException {
- sourceParserTest("sample02.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert3() throws IOException {
- sourceParserTest("sample03.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert4() throws IOException {
- sourceParserTest("sample04.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert5() throws IOException {
- sourceParserTest("sample05.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert6() throws IOException {
- sourceParserTest("sample06.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert7() throws IOException {
- sourceParserTest("sample07.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert8() throws IOException {
- sourceParserTest("sample08.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- private void sourceParserTest(String filename, String mode) throws IOException {
- ICSSModel model = null;
- if (mode.equals(MODE_OPEN)) {
- model = readModelOpen(filename);
- }
- else if (mode.equals(MODE_APPEND)) {
- model = readModelAppend(filename);
- }
- else if (mode.equals(MODE_INSERT)) {
- model = readModelInsert(filename);
- }
- String result = dumpRegions(model.getStructuredDocument());
- compareResult(result, "CSSSourceParserTest-" + filename); //$NON-NLS-1$
- closeModel(model);
- }
-
- private ICSSModel readModelOpen(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.replaceText(null, 0, 0, source);
-
- return model;
- }
-
- private ICSSModel readModelAppend(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- document.replaceText(null, i, 0, source.substring(i, i + 1));
- }
-
- return model;
- }
-
- private ICSSModel readModelInsert(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- int textIndex = source.length() - i - 1;
- document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
- }
-
- return model;
- }
-
- private void closeModel(ICSSModel model) {
- model.releaseFromEdit();
- }
-
- private String dumpRegions(IStructuredDocument document) {
- StringBuffer buf = new StringBuffer();
- buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
- return buf.toString();
- }
-
- private String dumpRegions(IStructuredDocumentRegion region) {
- StringBuffer buf = new StringBuffer();
- do {
- buf.append(dumpOneRegion(region));
- region = region.getNext();
- }
- while (region != null);
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
- StringBuffer buf = new StringBuffer();
- buf.append(documentRegion.toString());
- buf.append(FileUtil.commonEOL + " "); //$NON-NLS-1$
-
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- buf.append(textRegion.toString());
- buf.append(", "); //$NON-NLS-1$
- }
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results"; //$NON-NLS-1$
- private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
- private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
- private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
deleted file mode 100644
index 019546f24..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-
-
-public class CSSTextParserTest extends TestCase {
- public void testText1() throws IOException {
- textParserTest("sample01.css"); //$NON-NLS-1$
- }
-
- public void testText2() throws IOException {
- textParserTest("sample02.css"); //$NON-NLS-1$
- }
-
- public void testText3() throws IOException {
- textParserTest("sample03.css"); //$NON-NLS-1$
- }
-
- public void testText4() throws IOException {
- textParserTest("sample04.css"); //$NON-NLS-1$
- }
-
- public void testText5() throws IOException {
- textParserTest("sample05.css"); //$NON-NLS-1$
- }
-
- public void testText6() throws IOException {
- textParserTest("sample06.css"); //$NON-NLS-1$
- }
-
- public void testText7() throws IOException {
- textParserTest("sample07.css"); //$NON-NLS-1$
- }
-
- public void testText8() throws IOException {
- textParserTest("sample08.css"); //$NON-NLS-1$
- }
-
- private void textParserTest(String filename) throws IOException {
- String source = createString(filename); //$NON-NLS-1$
- CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, source);
- String result = dumpRegions(parser.getTokenList());
- compareResult(result, "CSSTextParserTest-" + filename); //$NON-NLS-1$
- }
-
- private String createString(String filename) throws FileNotFoundException, IOException {
- return FileUtil.createString(FILES_DIR, filename);
- }
-
- private String dumpRegions(List tokens) {
- StringBuffer buf = new StringBuffer();
- Iterator i = tokens.iterator();
- while (i.hasNext()) {
- buf.append(dumpOneRegion((CSSTextToken) i.next()));
- }
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(CSSTextToken token) {
- StringBuffer buf = new StringBuffer();
-
- buf.append("["); //$NON-NLS-1$
- buf.append(token.image);
- buf.append("] "); //$NON-NLS-1$
- buf.append(token.kind);
- buf.append(" - "); //$NON-NLS-1$
- buf.append(token.start);
- buf.append(", "); //$NON-NLS-1$
- buf.append(token.length);
-
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results";
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
deleted file mode 100644
index 0e28259f5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-public class CSSUrlTest extends TestCase {
-
- /**
- * Declaration: without quotes
- */
- public void testDeclaration1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: without quotes, with surrounded space
- */
- public void testDeclaration2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url( white space.gif );"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with single quote
- */
- public void testDeclaration3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\'white space.gif\');"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with double quote
- */
- public void testDeclaration4() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\"white space.gif\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: two urls
- */
- public void testDeclaration5() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif); list-style-image: url(style image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Style rule: two urls
- */
- public void testStyleRule1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("LI { background-image: url(white space.gif);\r\nlist-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: without quotes
- */
- public void testSomeRules1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("@import url(white space.css);LI { background-image: url(white space.gif);list-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(3, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[2].getType());
- assertEquals("style image.gif", urls[2].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: Two urls but parenthesis are missed, so concatenated url
- * is identified. By adding parenthesis, urls are corrected.
- */
- public void testFixError1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("background-image: url(white space.gif; list-style-image: urlstyle image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif; list-style-image: urlstyle image.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 37, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 61, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: Two urls but parenthesis are missed, so
- * concatenated url is identified. By adding parenthesis, urls are
- * corrected.
- */
- public void testFixError2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("@import url(white space.css;LI { background-image: urlwhite space.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css;LI { background-image: urlwhite space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 27, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 55, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule: Url has only one quote, so it is not identified as url. By
- * removing quote, url is corrected.
- */
- public void testFixError3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________0123456789012345678901234567890
- document.set("@import url(white space.css\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(0, urls.length);
-
- // correct url
- document.replaceText(null, 27, 1, ""); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- }
-
-
- private UrlInfo[] pickupUrl(IStructuredDocument document) {
- List urls = new ArrayList();
- IStructuredDocumentRegion documentRegion = document.getFirstStructuredDocumentRegion();
- while (documentRegion != null) {
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- String type = textRegion.getType();
- if (type.equals(CSSRegionContexts.CSS_URI) || type.equals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI)) {
- urls.add(new UrlInfo(type, documentRegion.getFullText(textRegion)));
- }
- }
- documentRegion = documentRegion.getNext();
- }
- return (UrlInfo[]) urls.toArray(new UrlInfo[urls.size()]);
- }
-
- private class UrlInfo {
- UrlInfo(String type, String url) {
- fType = type;
- fUrl = CSSUtil.extractUriContents(url);
- }
-
- String getType() {
- return fType;
- }
-
- String getUrl() {
- return fUrl;
- }
-
- private String fType;
- private String fUrl;
-
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java
deleted file mode 100644
index 70ead8989..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.stylesheets;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleRule;
-
-public class StyleSheetTest extends TestCase {
-
- public static final String PROJECT_NAME = "testImports";
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
- ProjectUtil.createSimpleProject(PROJECT_NAME, null, new String[] {});
- ProjectUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Tests for cycles in imports. If a cycle is encountered, we should not get stuck
- * in a loop or re-import the stylesheet.
- * @throws Exception
- */
- public void testImportCycle() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/cycle0.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 3 rules supplied stylesheet.", list.getLength() == 3);
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- // Check that the rules are imported, it would start with the last imported stylesheet's rules and move up
- assertEquals("Style rules are not equal.", ((CSSStyleRule) rule).getSelectorText(), "#cycle" + (2-i));
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests the simple case of a basic @import or a stylesheet
- * @throws Exception
- */
- public void testSimpleImport() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/site.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- String[] rules = new String[] {"#content", "a", "a:hover"};
- assertTrue("There should be a total of 3 rules supplied stylesheet.", list.getLength() == rules.length);
-
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- CSSStyleRule style = (CSSStyleRule)rule;
- assertEquals("Selector text did not match.", rules[i], style.getSelectorText().trim());
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests for the import of a non-existent stylesheet
- * @throws Exception
- */
- public void testNonExistentImport() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/importDNE.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 1 rule.", list.getLength() == 1);
- CSSRule rule = list.item(0);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.IMPORTRULE_NODE);
- assertEquals("Stylesheet reference is different than expected.", ((CSSImportRule) rule).getHref(), "thisfiledoesntexist.css");
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests that imports can be resolved using the various syntaxes for import.
- * <ul>
- * <li>@import url("example.css");</li>
- * <li>@import url(example.css);</li>
- * <li>@import "example.css";</li>
- * </ul>
- * @throws Exception
- */
- public void testImportMethods() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/importMethods.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 3 rules.", list.getLength() == 3);
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- CSSStyleRule style = (CSSStyleRule)rule;
- assertEquals("Selector text did not match.", "#content", style.getSelectorText().trim());
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests for the import of a stylesheet in a parent directory
- * @throws Exception
- */
- public void testImportFromParentDirectory() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/style/sub.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 1 rule.", list.getLength() == 1);
- CSSRule rule = list.item(0);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- assertEquals("Stylesheet reference is different than expected.", ((CSSStyleRule) rule).getSelectorText(), "#content");
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
deleted file mode 100644
index 09bd076c1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
- font-family: "Swiss 721";
- src: url("swiss721blk.pfr"); /* Swiss 721 black */
- font-style: normal, italic;
- font-weight: 800,900; /* note the interesting problem that
- the 900 weight italic doesnft exist */
-}
-
-@font-face {
- src: local("Palatino"),
- local("Times New Roman"),
- local("New York"),
- local("Utopia"),
- url("http://somewhere/free/font");
- font-family: serif;
- font-weight: 100, 200, 300, 400, 500;
- font-style: normal;
- font-variant: normal;
- font-size: all
-}
-
-@font-face {
- src: local("Alabama Italic"),
- url(http://www.fonts.org/A/alabama-italic) format("truetype");
- panose-1: 2 4 5 2 5 4 5 9 3 3;
- font-family: Alabama, serif;
- font-weight: 300, 400, 500;
- font-style: italic, oblique;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css
deleted file mode 100644
index f6c785f32..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css
+++ /dev/null
@@ -1,15 +0,0 @@
-a.c {
- font-family: Courier;
-}
-
-a.cn {
- font-family: Courier New;
-}
-
-a.qcn {
- font-family: "Courier New";
-}
-
-a.cs {
- font-family: Comic Sans ;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
deleted file mode 100644
index 24d300641..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.css.core.tests.testfiles;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class CSSModelLoadTest extends TestCase {
- private static final String HTML4_CSS = "html4.css";
-
- public CSSModelLoadTest() {
- super("CSS Model Loading Suite");
- }
-
- public void testLoadCSSfromStream() throws UnsupportedEncodingException, IOException {
- InputStream input = null;
-
- input = CSSModelLoadTest.class.getResourceAsStream(HTML4_CSS);
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(HTML4_CSS, input, null);
- assertNotNull(model);
- assertTrue("IStructuredModel was not a ICSSModel", model instanceof ICSSModel);
- assertTrue("contents are incomplete", model.getStructuredDocument().get().indexOf("Basic HTML style information") > 4);
- model.releaseFromEdit();
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
deleted file mode 100644
index b977f2cc5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@page {size: 8.5in 11in;margin: 2cm}
-
-@page {
- size: auto; /* auto is the initial value */
- margin: 10%;
-}
-
-@page :left {
- margin-left: 4cm;
- margin-right: 3cm;
-}
-@page :right {
- margin-left: 3cm;
- margin-right: 4cm;
-}
-
-@page narrow {size: 9cm 18cm}@page rotated {size: landscape} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
deleted file mode 100644
index 0d205a2e0..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* primitive values */
-NUMBERS {
- NUMBER: 123.456;
- PERCENTAGE: 123.456%;
- EMS: 123.456em;
- EXS: 123.456ex;
- PX: 123.456px;
- PX2: -123px;
- CM: 123.456cm;
- MM: 123.456mm;
- IN: 123.456in;
- PT: 123.456pt;
- PC: 123.456pc;
- DEG: -123.456deg;
- RAD: 123.456rad;
- GRAD: 123.456grad;
- MS: 123.456ms;
- S: 123.456s;
- HZ: 123.456Hz;
- KHZ: 123.456kHz;
- DIMENSION: -123.456zzz;
- INTEGER: 123;
-}
-
-STRINGS {
- STRING: "string";
- URI: URL("http://www.ibm.com/");
- IDENT: left;
- HASH: #abcdef;
- URANGE: U+20A7;
- SLASH: /;
- COMMA: ,;
- INHERIT_PRIMITIVE: inherit;
- ATTR: attr(KEY);
- FORMAT: format("truedoc");
- LOCAL: local("Excelsior Roman");
-}
-
-FUNCTIONS {
- COUNTER: counter(par-num, upper-roman);
- RECT: rect(12, 34, 56, 78);
- RGBCOLOR: rgb(255, 128, 0);
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
deleted file mode 100644
index c84d84f86..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Basic HTML style information.
- */
-html,
-address,
-blockquote,listing,
-body, dd, div,
-dl, dt, fieldset, legend,form,
-frame, frameset,
-h1, h2, h3, h4,
-h5, h6, noframes,noscript,
-ol, p, ul, center,
-dir, hr, menu, pre, plaintext, xmp { display: block }
-
-ol {counter-reset: _anonymous; list-style-type: decimal}
-ul,dir,menu {counter-reset: _anonymous; list-style-type: disc}
-li {display: list-item}
-li {counter-increment: _anonymous}
-
-head { display: none }
-table { display: table }
-tr { display: table-row }
-thead { display: table-header-group }
-tbody { display: table-row-group }
-tfoot { display: table-footer-group }
-col { display: table-column }
-colgroup { display: table-column-group }
-td, th { display: table-cell; }
-caption { display: table-caption }
-th { font-weight: bolder;}
-caption { text-align: center;horizontal-align:top }
-button, textarea,
-input, object,
-select, img { display:inline-block; }
-pre,plaintext, xmp { white-space: pre }
-h1, h2, h3, h4,
-h5, h6, b,
-strong { font-weight: bold }
-i, cite, em,dfn,
-var, address { font-style: italic }
-pre, tt, code,plaintext, xmp,
-kbd, samp { font-family: monospace }
-ol { list-style-type: decimal }
-br:before { content: "\A" }
-center { text-align: center }
-sub { vertical-align: sub }
-sup { vertical-align: super }
-u, ins { text-decoration: underline }
-input { text-decoration: none }
-button { white-space: nowrap }
-a[href] { text-decoration: underline }
-
-/*
- * styles that may be different for different user agent.
- * This part may need to move out and put into different css files.
- */
-body { line-height: 1.12em }
-h1 { font-size: 2em; margin: .67em 0 }
-h2 { font-size: 1.5em; margin: .75em 0 }
-h3 { font-size: 1.17em; margin: .83em 0 }
-h4, p,ul,
-fieldset, form,
-ol, dl, dir,
-menu { margin: 1.12em 0 }
-blockquote { margin: 1em 40px }
-h5 { font-size: .83em; margin: 1.5em 0 }
-h6 { font-size: .75em; margin: 1.67em 0 }
-blockquote { margin-left: 40px; margin-right: 40px }
-big { font-size: larger }
-small, sub, sup { font-size: smaller }
-s, strike, del { text-decoration: line-through }
-hr { border: 1px inset }
-ol, ul, dir,
-menu, dd { margin-left: 40px;border:0px }
-ol ul, ul ol,
-ul ul, ol ol { margin-top: 0; margin-bottom: 0 }
-abbr, acronym { font-variant: small-caps; letter-spacing: 0.1em }
-a[href] { color:blue;}
-select {background-color: window;font-family:sans-serif;font-size:13px;font-weight: normal;}
-textarea {border: 2px inset;font-size:13px;font-family:monospace}
-textarea,
-input {background-color: window}
-input,
-input[type=text],
-input[type=password] {border: 2px inset;font-size:13px;font-family:sans-serif;font-weight: normal;}
-/* following upcased TYPE is for workaround the WTP M2 bug of not setting default content type */
-input[TYPE=submit],input[TYPE=reset],input[TYPE=button],input[TYPE=cancel],
-button,
-input[type=button],
-input[type=reset],
-input[type=cancel],
-input[type=submit] {background-color: ButtonFace; border: 2px outset; font-size:13px;
- font-family:sans-serif;text-align: center;font-weight: normal;}
-input[type=image],
-input[type=checkbox],
-input[type=radio] {border: none }
-input[type=hidden] {border: none }
-img {border: 0px none}
-listing {font-family:monospace;font-size: medium;white-space: pre; margin: 1em 0;}
-tbody,thead,tfoot {vertical-align: middle;}
-blink {text-decoration: blink;}
-
-hr {margin: 0.5em auto 0.5em auto;}
-caption {border: 0px none;margin: 0px; padding:0px 0px 4px 0px;}
-td, th,
-table {border: 4px none;}
-button {padding: 3px 5px;text-align: center;vertical-align: middle;}
-button,textarea,input {vertical-align: text-bottom;color:black;font-style:none;}
-select {vertical-align: text-bottom;}
-input[type=image] {vertical-align: baseline;}
-li {min-height:1.2em}
-button {min-height:1.8em}
-div,tr,form {min-height:1.2em}
-table,td {min-width:1.2em;min-height:1.2em}
-
-/* nested lists have no top/bottom margins */
-ul ul, ul ol, ul dir, ul menu, ul dl,
-ol ul, ol ol, ol dir, ol menu, ol dl,
-dir ul, dir ol, dir dir, dir menu, dir dl,
-menu ul, menu ol, menu dir, menu menu, menu dl,
-dl ul, dl ol, dl dir, dl menu, dl dl {margin-top: 0; margin-bottom: 0;}
-
-/* 2 deep unordered lists use a circle */
-ol ul, ul ul, menu ul, dir ul,
-ol menu, ul menu, menu menu, dir menu,
-ol dir, ul dir, menu dir, dir dir {list-style-type: circle;}
-
-/* 3 deep (or more) unordered lists use a square */
-ol ol ul, ol ul ul, ol menu ul, ol dir ul,
-ol ol menu, ol ul menu, ol menu menu, ol dir menu,
-ol ol dir, ol ul dir, ol menu dir, ol dir dir,
-ul ol ul, ul ul ul, ul menu ul, ul dir ul,
-ul ol menu, ul ul menu, ul menu menu, ul dir menu,
-ul ol dir, ul ul dir, ul menu dir, ul dir dir,
-menu ol ul, menu ul ul, menu menu ul, menu dir ul,
-menu ol menu, menu ul menu, menu menu menu, menu dir menu,
-menu ol dir, menu ul dir, menu menu dir, menu dir dir,
-dir ol ul, dir ul ul, dir menu ul, dir dir ul,
-dir ol menu, dir ul menu, dir menu menu, dir dir menu,
-dir ol dir, dir ul dir, dir menu dir, dir dir dir { list-style-type: square;}
-
-/**
- * We do not write codes to support some elements. This part defines properties for them
- * to improve the look of these elements.
- */
-applet {border: 1px solid;}
-fieldset {border: 2px groove;}
-applet,iframe {display:inline-block; border:3px inset; }
-object {display:inline-block;border:0px none;}
-
-
-/*
- * Sets right margin to have gap between widgets.
- */
-input,textarea,button { margin-right: 2px;} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
deleted file mode 100644
index e1ac2f766..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 3] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[3, 9] ({
-
- )
- ContextRegion--> LBRACE: 0-1/6,
-[9, 21] (color: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[21, 24] (
- )
- ContextRegion--> S: 0-3,
-[24, 25] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[25, 30] (
-
- )
- ContextRegion--> S: 0-5,
-[30, 54] (background-color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-24,
-[54, 59] (
-
-)
- ContextRegion--> S: 0-5,
-[59, 60] (})
- ContextRegion--> RBRACE: 0-1,
-[60, 62] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
deleted file mode 100644
index e867c985d..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
+++ /dev/null
@@ -1,41 +0,0 @@
-[0, 23] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[23, 24] (;)
- ContextRegion--> DELIMITER: 0-1,
-[24, 26] (
-)
- ContextRegion--> S: 0-2,
-[26, 61] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[61, 62] (;)
- ContextRegion--> DELIMITER: 0-1,
-[62, 64] (
-)
- ContextRegion--> S: 0-2,
-[64, 96] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[96, 97] (;)
- ContextRegion--> DELIMITER: 0-1,
-[97, 99] (
-)
- ContextRegion--> S: 0-2,
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> UNKNOWN: 19-20, ContextRegion--> MEDIUM: 20-26, ContextRegion--> MEDIA_SEPARATOR: 26-27, ContextRegion--> MEDIUM: 27-33, ContextRegion--> MEDIA_SEPARATOR: 33-34, ContextRegion--> UNKNOWN: 34-35, ContextRegion--> MEDIUM: 35-41/42, ContextRegion--> UNKNOWN: 42-48, ContextRegion--> MEDIA_SEPARATOR: 48-49, ContextRegion--> MEDIUM: 49-55/56,
-[155, 169] (@import media6)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> UNKNOWN: 8-14,
-[169, 170] (;)
- ContextRegion--> DELIMITER: 0-1,
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
- ContextRegion--> S: 0-4, ContextRegion--> CDO: 4-8/9, ContextRegion--> COMMENT: 9-23/27, ContextRegion--> CDC: 27-30/34, ContextRegion--> COMMENT: 34-49/51,
-[221, 227] (kuso
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
deleted file mode 100644
index b057117d4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
+++ /dev/null
@@ -1,102 +0,0 @@
-[0, 29] (@import url("../sample2.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29,
-[29, 30] (;)
- ContextRegion--> DELIMITER: 0-1,
-[30, 57] (
-
-/* Sample Styles */
-
-)
- ContextRegion--> S: 0-4, ContextRegion--> COMMENT: 4-23/27,
-[57, 62] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[62, 66] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[66, 79] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[79, 80] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[80, 83] (
- )
- ContextRegion--> S: 0-3,
-[83, 120] (background-color : rgb(181, 253, 211))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, ContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[120, 121] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[121, 124] (
- )
- ContextRegion--> S: 0-3,
-[124, 143] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[143, 144] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[144, 147] (
- )
- ContextRegion--> S: 0-3,
-[147, 186] (font-family : "Heisei Mincho W3", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-39,
-[186, 188] (
-)
- ContextRegion--> S: 0-2,
-[188, 189] (})
- ContextRegion--> RBRACE: 0-1,
-[189, 193] (
-
-)
- ContextRegion--> S: 0-4,
-[193, 205] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[205, 207] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[207, 224] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[224, 225] ( )
- ContextRegion--> S: 0-1,
-[225, 226] (})
- ContextRegion--> RBRACE: 0-1,
-[226, 230] (
-
-)
- ContextRegion--> S: 0-4,
-[230, 243] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[243, 247] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[247, 255] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[255, 260] ({
- )
- ContextRegion--> LBRACE: 0-1/5,
-[260, 281] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[281, 282] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[282, 286] (
- )
- ContextRegion--> S: 0-4,
-[286, 305] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[305, 306] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[306, 310] (
- )
- ContextRegion--> S: 0-4,
-[310, 327] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[327, 330] (
- )
- ContextRegion--> S: 0-3,
-[330, 331] (})
- ContextRegion--> RBRACE: 0-1,
-[331, 333] (
-)
- ContextRegion--> S: 0-2,
-[333, 334] (})
- ContextRegion--> RBRACE: 0-1,
-[334, 336] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
deleted file mode 100644
index fdc36bf48..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
deleted file mode 100644
index fdc36bf48..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
deleted file mode 100644
index 6477cb07e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
+++ /dev/null
@@ -1,68 +0,0 @@
-[0, 12] (declaration )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12,
-[12, 16] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[16, 33] (dimension : 100ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17,
-[33, 34] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[34, 37] (
- )
- ContextRegion--> S: 0-3,
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, ContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, ContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, ContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, ContextRegion--> DECLARATION_VALUE_STRING: 44-57, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, ContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, ContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, ContextRegion--> DECLARATION_VALUE_STRING: 66-95, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96,
-[133, 134] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[134, 137] (
- )
- ContextRegion--> S: 0-3,
-[137, 151] (hash : #aabbcc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[151, 152] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[152, 155] (
- )
- ContextRegion--> S: 0-3,
-[155, 166] (ident : any)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[166, 167] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[167, 170] (
- )
- ContextRegion--> S: 0-3,
-[170, 184] (number : 99999)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-14,
-[184, 185] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[185, 188] (
- )
- ContextRegion--> S: 0-3,
-[188, 205] (percentage : 100%)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17,
-[205, 206] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[206, 209] (
- )
- ContextRegion--> S: 0-3,
-[209, 226] (string : "string")
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-17,
-[226, 227] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[227, 230] (
- )
- ContextRegion--> S: 0-3,
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[268, 269] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[269, 271] (
-)
- ContextRegion--> S: 0-2,
-[271, 272] (})
- ContextRegion--> RBRACE: 0-1,
-[272, 274] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
deleted file mode 100644
index a4879a848..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
+++ /dev/null
@@ -1,454 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 70] (@import url("../sample2.css") projection, tv)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29/30, ContextRegion--> MEDIUM: 30-40, ContextRegion--> MEDIA_SEPARATOR: 40-41/42, ContextRegion--> MEDIUM: 42-44,
-[70, 71] (;)
- ContextRegion--> DELIMITER: 0-1,
-[71, 75] (
-
-)
- ContextRegion--> S: 0-4,
-[75, 80] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[80, 87] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[87, 100] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[100, 101] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[101, 107] (
- )
- ContextRegion--> S: 0-6,
-[107, 126] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 133] (
- )
- ContextRegion--> S: 0-6,
-[133, 172] (background-color : rgb( 181, 253, 211 ))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39,
-[172, 174] (
-)
- ContextRegion--> S: 0-2,
-[174, 175] (})
- ContextRegion--> RBRACE: 0-1,
-[175, 179] (
-
-)
- ContextRegion--> S: 0-4,
-[179, 182] (UL )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[182, 189] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[189, 202] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[202, 203] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[203, 209] (
- )
- ContextRegion--> S: 0-6,
-[209, 251] (list-style-image : url("images/l_a01.gif"))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_URI: 19-42,
-[251, 252] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[252, 258] (
- )
- ContextRegion--> S: 0-6,
-[258, 287] (list-style-position : outside)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_IDENT: 22-29,
-[287, 289] (
-)
- ContextRegion--> S: 0-2,
-[289, 290] (})
- ContextRegion--> RBRACE: 0-1,
-[290, 294] (
-
-)
- ContextRegion--> S: 0-4,
-[294, 297] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[297, 304] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[304, 317] (color : white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[317, 318] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[318, 324] (
- )
- ContextRegion--> S: 0-6,
-[324, 343] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[343, 344] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[344, 350] (
- )
- ContextRegion--> S: 0-6,
-[350, 377] (border-left-color : #996666)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_HASH: 20-27,
-[377, 378] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[378, 384] (
- )
- ContextRegion--> S: 0-6,
-[384, 401] (padding-top : 0px)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[401, 402] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[402, 408] (
- )
- ContextRegion--> S: 0-6,
-[408, 427] (padding-right : 1cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19,
-[427, 428] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[428, 434] (
- )
- ContextRegion--> S: 0-6,
-[434, 452] (padding-bottom : 2)
- ContextRegion--> DECLARATION_PROPERTY: 0-14/15, ContextRegion--> DECLARATION_SEPARATOR: 15-16/17, ContextRegion--> DECLARATION_VALUE_NUMBER: 17-18,
-[452, 453] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[453, 459] (
- )
- ContextRegion--> S: 0-6,
-[459, 477] (padding-left : 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18,
-[477, 478] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[478, 484] (
- )
- ContextRegion--> S: 0-6,
-[484, 504] (border-style : solid)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-20,
-[504, 505] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[505, 511] (
- )
- ContextRegion--> S: 0-6,
-[511, 535] (border-top-width : 4.5ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24,
-[535, 536] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[536, 542] (
- )
- ContextRegion--> S: 0-6,
-[542, 566] (border-right-width : 5in)
- ContextRegion--> DECLARATION_PROPERTY: 0-18/19, ContextRegion--> DECLARATION_SEPARATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24,
-[566, 567] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[567, 573] (
- )
- ContextRegion--> S: 0-6,
-[573, 601] (border-bottom-width : 6.02mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28,
-[601, 602] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[602, 608] (
- )
- ContextRegion--> S: 0-6,
-[608, 629] (border-left-width : 7)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_NUMBER: 20-21,
-[629, 631] (
-)
- ContextRegion--> S: 0-2,
-[631, 632] (})
- ContextRegion--> RBRACE: 0-1,
-[632, 636] (
-
-)
- ContextRegion--> S: 0-4,
-[636, 646] (H1:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_PSEUDO: 2-9/10,
-[646, 653] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, ContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, ContextRegion--> DECLARATION_VALUE_STRING: 40-44,
-[697, 698] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[698, 704] (
- )
- ContextRegion--> S: 0-6,
-[704, 731] (counter-increment : chapter)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_IDENT: 20-27,
-[731, 732] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[732, 738] (
- )
- ContextRegion--> S: 0-6,
-[738, 761] (counter-reset : section)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_IDENT: 16-23,
-[761, 763] (
-)
- ContextRegion--> S: 0-2,
-[763, 764] (})
- ContextRegion--> RBRACE: 0-1,
-[764, 768] (
-
-)
- ContextRegion--> S: 0-4,
-[768, 779] (IMG:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_PSEUDO: 3-10/11,
-[779, 780] ({)
- ContextRegion--> LBRACE: 0-1,
-[780, 799] (content : attr(alt))
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19,
-[799, 800] (})
- ContextRegion--> RBRACE: 0-1,
-[800, 804] (
-
-)
- ContextRegion--> S: 0-4,
-[804, 815] (DIV.sample )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_CLASS: 3-10/11,
-[815, 822] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[822, 863] (font-family : "Robson Celtic", sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_IDENT: 31-41,
-[863, 864] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[864, 870] (
- )
- ContextRegion--> S: 0-6,
-[870, 889] (position : absolute)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_IDENT: 11-19,
-[889, 890] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[890, 896] (
- )
- ContextRegion--> S: 0-6,
-[896, 910] (left : 833.5pc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14,
-[910, 911] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[911, 917] (
- )
- ContextRegion--> S: 0-6,
-[917, 926] (top : 90%)
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9,
-[926, 927] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[927, 933] (
- )
- ContextRegion--> S: 0-6,
-[933, 946] (width : 100pt)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[946, 947] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[947, 953] (
- )
- ContextRegion--> S: 0-6,
-[953, 971] (height : 110.777px)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18,
-[971, 972] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[972, 978] (
- )
- ContextRegion--> S: 0-6,
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, ContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, ContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, ContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, ContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[1015, 1017] (
-)
- ContextRegion--> S: 0-2,
-[1017, 1018] (})
- ContextRegion--> RBRACE: 0-1,
-[1018, 1022] (
-
-)
- ContextRegion--> S: 0-4,
-[1022, 1033] (@font-face )
- ContextRegion--> FONT_FACE: 0-10/11,
-[1033, 1040] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1040, 1065] (font-family : "Swiss 721")
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-25,
-[1065, 1066] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1066, 1072] (
- )
- ContextRegion--> S: 0-6,
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_URI: 6-26/27, ContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, ContextRegion--> DECLARATION_VALUE_STRING: 34-47, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, ContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, ContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, ContextRegion--> DECLARATION_VALUE_STRING: 56-85, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86,
-[1158, 1159] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1159, 1165] (
- )
- ContextRegion--> S: 0-6,
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[1203, 1204] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1204, 1210] (
- )
- ContextRegion--> S: 0-6,
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, ContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37,
-[1247, 1249] (
-)
- ContextRegion--> S: 0-2,
-[1249, 1250] (})
- ContextRegion--> RBRACE: 0-1,
-[1250, 1254] (
-
-)
- ContextRegion--> S: 0-4,
-[1254, 1266] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[1266, 1267] ({)
- ContextRegion--> LBRACE: 0-1,
-[1267, 1284] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[1284, 1285] (})
- ContextRegion--> RBRACE: 0-1,
-[1285, 1289] (
-
-)
- ContextRegion--> S: 0-4,
-[1289, 1302] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[1302, 1309] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, ContextRegion--> SELECTOR_SEPARATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, ContextRegion--> SELECTOR_SEPARATOR: 14-15/16, ContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, ContextRegion--> SELECTOR_SEPARATOR: 18-19/20, ContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23,
-[1332, 1343] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1343, 1369] (voice-family : paul, child)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26,
-[1369, 1370] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1370, 1380] (
- )
- ContextRegion--> S: 0-10,
-[1380, 1391] (stress : 20)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-11,
-[1391, 1392] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1392, 1402] (
- )
- ContextRegion--> S: 0-10,
-[1402, 1415] (richness : 90)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_NUMBER: 11-13,
-[1415, 1416] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1416, 1426] (
- )
- ContextRegion--> S: 0-10,
-[1426, 1453] (cue-before : url("ping.au"))
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_URI: 13-27,
-[1453, 1459] (
- )
- ContextRegion--> S: 0-6,
-[1459, 1460] (})
- ContextRegion--> RBRACE: 0-1,
-[1460, 1466] (
- )
- ContextRegion--> S: 0-6,
-[1466, 1474] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1474, 1485] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1485, 1506] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[1506, 1507] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1507, 1517] (
- )
- ContextRegion--> S: 0-10,
-[1517, 1536] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[1536, 1537] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1537, 1547] (
- )
- ContextRegion--> S: 0-10,
-[1547, 1564] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[1564, 1570] (
- )
- ContextRegion--> S: 0-6,
-[1570, 1571] (})
- ContextRegion--> RBRACE: 0-1,
-[1571, 1577] (
- )
- ContextRegion--> S: 0-6,
-[1577, 1585] (P.peter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1585, 1596] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1596, 1611] (azimuth : right)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-15,
-[1611, 1612] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1612, 1622] (
- )
- ContextRegion--> S: 0-10,
-[1622, 1642] (elevation : -0.36rad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20,
-[1642, 1643] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1643, 1653] (
- )
- ContextRegion--> S: 0-10,
-[1653, 1666] (pitch : 210Hz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[1666, 1672] (
- )
- ContextRegion--> S: 0-6,
-[1672, 1673] (})
- ContextRegion--> RBRACE: 0-1,
-[1673, 1679] (
- )
- ContextRegion--> S: 0-6,
-[1679, 1686] (P.goat )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-6/7,
-[1686, 1697] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1697, 1712] (volume : x-soft)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_IDENT: 9-15,
-[1712, 1713] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1713, 1723] (
- )
- ContextRegion--> S: 0-10,
-[1723, 1741] (elevation : 66grad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18,
-[1741, 1742] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1742, 1752] (
- )
- ContextRegion--> S: 0-10,
-[1752, 1767] (pitch : 0.17kHz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15,
-[1767, 1773] (
- )
- ContextRegion--> S: 0-6,
-[1773, 1774] (})
- ContextRegion--> RBRACE: 0-1,
-[1774, 1776] (
-)
- ContextRegion--> S: 0-2,
-[1776, 1777] (})
- ContextRegion--> RBRACE: 0-1,
-[1777, 1781] (
-
-)
- ContextRegion--> S: 0-4,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
deleted file mode 100644
index 1ff309321..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
+++ /dev/null
@@ -1,19 +0,0 @@
-[0, 18] (a.newWindow /* */ )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-11/12, ContextRegion--> COMMENT: 12-17/18,
-[18, 25] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[25, 77] (background-image: url(../images/test.png) !important)
- ContextRegion--> DECLARATION_PROPERTY: 0-16, ContextRegion--> DECLARATION_SEPARATOR: 16-17/18, ContextRegion--> DECLARATION_VALUE_URI: 18-41/42, ContextRegion--> CSS_DECLARATION_VALUE_IMPORTANT: 42-52,
-[77, 78] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[78, 80] (
-)
- ContextRegion--> S: 0-2,
-[80, 81] (})
- ContextRegion--> RBRACE: 0-1,
-[81, 83] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
deleted file mode 100644
index 403a43564..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
+++ /dev/null
@@ -1,29 +0,0 @@
-[H1] SELECTOR_ELEMENT_NAME - 0, 2
-[ ] S - 2, 1
-[{] LBRACE - 3, 1
-[
-
- ] S - 4, 5
-[color] DECLARATION_PROPERTY - 9, 5
-[:] DECLARATION_SEPARATOR - 14, 1
-[ ] S - 15, 1
-[white] DECLARATION_VALUE_IDENT - 16, 5
-[
- ] S - 21, 3
-[;] DECLARATION_DELIMITER - 24, 1
-[
-
- ] S - 25, 5
-[background-color] DECLARATION_PROPERTY - 30, 16
-[ ] S - 46, 1
-[:] DECLARATION_SEPARATOR - 47, 1
-[ ] S - 48, 1
-[black] DECLARATION_VALUE_IDENT - 49, 5
-[
-
-] S - 54, 5
-[}] RBRACE - 59, 1
-[
-] S - 60, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
deleted file mode 100644
index 34f6047fb..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
+++ /dev/null
@@ -1,73 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("hoge.css")] URI - 8, 15
-[;] DELIMITER - 23, 1
-[
-] S - 24, 2
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[/* comment */] COMMENT - 34, 13
-[ ] S - 47, 1
-[url(hoge.css)] URI - 48, 13
-[;] DELIMITER - 61, 1
-[
-] S - 62, 2
-[@import] IMPORT - 64, 7
-[ ] S - 71, 1
-["hoge.css"] STRING - 72, 10
-[ ] S - 82, 1
-[/* comment */] COMMENT - 83, 13
-[;] DELIMITER - 96, 1
-[
-] S - 97, 2
-[@IMPORT] IMPORT - 99, 7
-[ ] S - 106, 1
-['hoge.css'] STRING - 107, 10
-[ ] S - 117, 1
-[,] undefined - 118, 1
-[media1] MEDIUM - 119, 6
-[,] MEDIA_SEPARATOR - 125, 1
-[media2] MEDIUM - 126, 6
-[,] MEDIA_SEPARATOR - 132, 1
-[,] undefined - 133, 1
-[media3] MEDIUM - 134, 6
-[ ] S - 140, 1
-[m] undefined - 141, 1
-[e] undefined - 142, 1
-[d] undefined - 143, 1
-[i] undefined - 144, 1
-[a] undefined - 145, 1
-[4] undefined - 146, 1
-[,] MEDIA_SEPARATOR - 147, 1
-[media5] MEDIUM - 148, 6
-[ ] S - 154, 1
-[@import] IMPORT - 155, 7
-[ ] S - 162, 1
-[m] undefined - 163, 1
-[e] undefined - 164, 1
-[d] undefined - 165, 1
-[i] undefined - 166, 1
-[a] undefined - 167, 1
-[6] undefined - 168, 1
-[;] DELIMITER - 169, 1
-[
-
-] S - 170, 4
-[<!--] CDO - 174, 4
-[ ] S - 178, 1
-[/* hogehoge */] COMMENT - 179, 14
-[
-
-] S - 193, 4
-[-->] CDC - 197, 3
-[
-
-] S - 200, 4
-[/* comment 2 */] COMMENT - 204, 15
-[
-] S - 219, 2
-[kuso] SELECTOR_ELEMENT_NAME - 221, 4
-[
-] S - 225, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
deleted file mode 100644
index 3a3e11cd9..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
+++ /dev/null
@@ -1,124 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("../sample2.css")] URI - 8, 21
-[;] DELIMITER - 29, 1
-[
-
-] S - 30, 4
-[/* Sample Styles */] COMMENT - 34, 19
-[
-
-] S - 53, 4
-[BODY] SELECTOR_ELEMENT_NAME - 57, 4
-[ ] S - 61, 1
-[{] LBRACE - 62, 1
-[
- ] S - 63, 3
-[color] DECLARATION_PROPERTY - 66, 5
-[ ] S - 71, 1
-[:] DECLARATION_SEPARATOR - 72, 1
-[ ] S - 73, 1
-[black] DECLARATION_VALUE_IDENT - 74, 5
-[;] DECLARATION_DELIMITER - 79, 1
-[
- ] S - 80, 3
-[background-color] DECLARATION_PROPERTY - 83, 16
-[ ] S - 99, 1
-[:] DECLARATION_SEPARATOR - 100, 1
-[ ] S - 101, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 102, 4
-[181] DECLARATION_VALUE_NUMBER - 106, 3
-[,] DECLARATION_VALUE_OPERATOR - 109, 1
-[ ] DECLARATION_VALUE_S - 110, 1
-[253] DECLARATION_VALUE_NUMBER - 111, 3
-[,] DECLARATION_VALUE_OPERATOR - 114, 1
-[ ] DECLARATION_VALUE_S - 115, 1
-[211] DECLARATION_VALUE_NUMBER - 116, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 119, 1
-[;] DECLARATION_DELIMITER - 120, 1
-[
- ] S - 121, 3
-[text-align] DECLARATION_PROPERTY - 124, 10
-[ ] S - 134, 1
-[:] DECLARATION_SEPARATOR - 135, 1
-[ ] S - 136, 1
-[center] DECLARATION_VALUE_IDENT - 137, 6
-[;] DECLARATION_DELIMITER - 143, 1
-[
- ] S - 144, 3
-[font-family] DECLARATION_PROPERTY - 147, 11
-[ ] S - 158, 1
-[:] DECLARATION_SEPARATOR - 159, 1
-[ ] S - 160, 1
-["Heisei Mincho W3"] DECLARATION_VALUE_STRING - 161, 18
-[,] DECLARATION_VALUE_OPERATOR - 179, 1
-[ ] DECLARATION_VALUE_S - 180, 1
-[serif] DECLARATION_VALUE_IDENT - 181, 5
-[
-] S - 186, 2
-[}] RBRACE - 188, 1
-[
-
-] S - 189, 4
-[@page] PAGE - 193, 5
-[ ] S - 198, 1
-[:left] CSS_PAGE_SELECTOR - 199, 5
-[ ] S - 204, 1
-[{] LBRACE - 205, 1
-[ ] S - 206, 1
-[margin-left] DECLARATION_PROPERTY - 207, 11
-[ ] S - 218, 1
-[:] DECLARATION_SEPARATOR - 219, 1
-[ ] S - 220, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 221, 3
-[ ] S - 224, 1
-[}] RBRACE - 225, 1
-[
-
-] S - 226, 4
-[@media] MEDIA - 230, 6
-[ ] S - 236, 1
-[aural] MEDIUM - 237, 5
-[ ] S - 242, 1
-[{] LBRACE - 243, 1
-[
- ] S - 244, 3
-[P] SELECTOR_ELEMENT_NAME - 247, 1
-[.heidi] SELECTOR_CLASS - 248, 6
-[ ] S - 254, 1
-[{] LBRACE - 255, 1
-[
- ] S - 256, 4
-[azimuth] DECLARATION_PROPERTY - 260, 7
-[ ] S - 267, 1
-[:] DECLARATION_SEPARATOR - 268, 1
-[ ] S - 269, 1
-[center-left] DECLARATION_VALUE_IDENT - 270, 11
-[;] DECLARATION_DELIMITER - 281, 1
-[
- ] S - 282, 4
-[elevation] DECLARATION_PROPERTY - 286, 9
-[ ] S - 295, 1
-[:] DECLARATION_SEPARATOR - 296, 1
-[ ] S - 297, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 298, 7
-[;] DECLARATION_DELIMITER - 305, 1
-[
- ] S - 306, 4
-[pause] DECLARATION_PROPERTY - 310, 5
-[ ] S - 315, 1
-[:] DECLARATION_SEPARATOR - 316, 1
-[ ] S - 317, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 318, 4
-[ ] DECLARATION_VALUE_S - 322, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 323, 4
-[
- ] S - 327, 3
-[}] RBRACE - 330, 1
-[
-] S - 331, 2
-[}] RBRACE - 333, 1
-[
-] S - 334, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
deleted file mode 100644
index 5d5d2e607..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[ ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[ ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[ ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[ ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[ ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[ ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[ ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[ ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[ ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[ ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[ ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[ ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[ ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[ ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[ ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[ ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[ ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[ ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[ ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[ ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[ ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[ ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[ ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[ ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[ ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[ ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[ ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[ ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[ ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[ ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[ ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[ ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[ ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[ ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[ ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[ ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[ ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[ ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[ ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[ ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[ ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[ ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[ ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[ ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[ ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[ ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[ ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[ ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[ ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[ ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[ ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[ ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[ ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[ ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[ ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[ ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[ ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1