Skip to main content
summaryrefslogtreecommitdiffstats
blob: 8d56bf123106b36d2500ce698aab18586092427d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
/*******************************************************************************
 * Copyright (c) 2000, 2004 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.wst.wsdl.binding.soap;

import org.eclipse.wst.wsdl.ExtensibilityElement;

/**
 * <!-- begin-user-doc -->
 * A representation of the model object '<em><b>Fault</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse <em>Use</em>}</li>
 *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI <em>Namespace URI</em>}</li>
 *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles <em>Encoding Styles</em>}</li>
 * </ul>
 * </p>
 *
 * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPFault()
 * @model 
 * @generated
 */
public interface SOAPFault extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPFault {

} // SOAPFault

Back to the top

dth: 0.0%;'/> -rw-r--r--tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs28
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF39
-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.java77
-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.html148
-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.java221
-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/AttrValueTest.java71
-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.java144
-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.java691
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCustomTagTest.java102
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java267
-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.java208
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java229
-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_310085/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/test310085.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.classpath6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.project17
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/test326193.jsp29
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/src/.keepme0
-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/jspx_javaVariable_includes/.classpath7
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.project33
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authAdmin.jspf14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authCheck.jspf13
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/index.jspx22
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test1.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test2.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test3.jsp6
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/src/.keepme0
-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/testDynamicAttributes/.classpath9
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/.project30
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/foo.tld18
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/web.xml12
-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.tld36
-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/default.jspx14
-rw-r--r--tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/iterationTester.jsp13
-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/testIterationTags/src/org/eclipse/UberLoopTag.java5
-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.java372
-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.jspbin718 -> 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.jst.jsp.ui.tests/.classpath9
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.cvsignore8
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.project28
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs80
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF55
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/build.properties26
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gifbin187 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gifbin207 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gifbin155 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gifbin204 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gifbin337 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gifbin338 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java363
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java508
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java44
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java45
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java97
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java36
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java26
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java436
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java67
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java624
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java140
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java367
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java31
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java28
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java265
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java305
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java34
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java70
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java201
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/plugin.properties17
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/plugin.xml69
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/TestJSPContentAssistComputers.zipbin138923 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zipbin4812 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zipbin8266 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zipbin73152 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zipbin137492 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java169
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java121
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java43
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java82
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java102
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java144
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java136
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java400
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java55
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java29
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java612
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java139
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/breakpointproviders/BreakpointProvidersTest.java45
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java231
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java263
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java119
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java438
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java449
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp27
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource38
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp41
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin37
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin39
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin40
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java157
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java312
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java124
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java73
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java171
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java357
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java390
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java59
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java104
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java1134
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java286
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java360
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java951
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java98
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java1798
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java204
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java305
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp8099
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp9
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp8
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java130
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java242
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java303
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java86
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java47
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java166
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java395
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java187
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java71
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java52
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java49
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java206
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java59
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java36
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java256
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java496
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/test.xml115
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles.zipbin134960 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld642
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jarbin498051 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp1
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp2
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd353
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd39
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd219
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd53
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd33
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd4
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd21
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd39
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd219
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd53
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd33
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd4
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd21
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd39
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd223
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd46
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd53
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd33
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod103
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod71
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod80
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod248
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd3609
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod184
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd154
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd21
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd3216
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod160
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd189
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd160
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/RemoveAndAddBackCommentEndTag/Test1.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd1196
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/badattributenames.jsp9
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.html14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/build/classes/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/.project22
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/lib/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/web.xml12
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495-fmt.jsp32
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495.jsp29
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1-fmt.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1.jsp13
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2-fmt.jsp17
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2.jsp16
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3-fmt.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3.jsp14
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4-fmt.jsp24
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4.jsp23
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/src/.keepme0
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java332
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/EclipseTextTestSuite.java50
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java161
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/text.tests/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java82
-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.java68
-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.java186
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css81
-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/format/testfiles/comments-fmt.css12
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments.css15
-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/CSSMetaModelTest.java125
-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.java206
-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.xml14
-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/contentassist/ProposalInfo.java43
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/contentassist/TestCSSContentAssistComputers.java378
-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/contentassist/test1.css11
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test2.css0
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test3.css5
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test4.css9
-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.MF24
-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.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.java317
-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.MF30
-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.java39
-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.java61
-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/contentassist/TestEmbededCSSContentAssistComputers.java401
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/contentassist/TestHTMLContentAssistComputers.java393
-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.html.ui.tests/testresources/contentassist/test0.html0
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/contentassist/test1.html27
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/contentassist/test2.html2
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/contentassist/test3.html47
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/contentassist/test4.html13
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/testresources/contentassist/test5.xhtml13
-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.MF17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/OSGI-INF/l10n/bundle.properties3
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/about.html28
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/build.properties8
-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.java23
-rw-r--r--tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java553
-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.MF29
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/OSGI-INF/l10n/bundle.properties3
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/about.html28
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties10
-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.java36
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/format/FormattingTests.java346
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/internal/ProjectUtil.java154
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/internal/StringUtils.java101
-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.java160
-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.jsdt.web.ui.tests/testFiles/formatting/test0.html12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test1.jsp13
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test10-fmt.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test10.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test11-fmt.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test11.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test12-fmt.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test12.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test13-fmt.html14
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test13.html12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test14-fmt.html15
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test14.html12
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test2-fmt.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test2.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test3.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test4-fmt.html17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test4.html17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test5-fmt.html17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test5.html17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test6-fmt.html14
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test6.html14
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test7-fmt.html17
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test7.html18
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test8-fmt.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test8.html16
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test9-fmt.html18
-rw-r--r--tests/org.eclipse.wst.jsdt.web.ui.tests/testFiles/formatting/test9.html19
-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.java71
-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/Accessor.java332
-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/TestRegionList.java443
-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.java102
-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/Accessor.java332
-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/catalog1.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml16
-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/delegateAndRewrite/catalog11.xml41
-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/data/xsd/xmlcatalog11.xsd231
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/plugin.xml29
-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.java191
-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.java221
-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.xml29
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMDocumentCacheTestProject.zipbin2103 -> 0 bytes-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/testfiles/GlobalCMDocumentCacheTestSchema.xsd5
-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.java81
-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/cache/GlobalCMDocumentCacheTest.java140
-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.java522
-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.java399
-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/nested-endtag-fmt.xml8
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag.xml8
-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.xml29
-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.xml9
-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.xml38
-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.xml30
-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/range/TestRangeCompare.java58
-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/ZippedTest.java106
-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.zipbin165010 -> 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.cssbin38 -> 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.jspbin718 -> 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.java242
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java113
-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.java485
-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.java48
-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/contentassist/TestXMLContentAssistComputers.java348
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentmodel/TestInferredContentModel.java70
-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/TestValidateAgainstDTD/simple.dtd2
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/TestValidateAgainstDTD/simple.xml3
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/Schema1.xsd162
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/test1.xml33
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/test2.xml5
-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.java460
-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/base64Binary/Test.xsd7
-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
2375 files changed, 0 insertions, 142546 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 ced98506e..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-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\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
- - 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\
-\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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation 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 0694124cf..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="3.3.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). 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
- (&quot;EPL&quot;). 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, &quot;Program&quot; 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 Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). 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>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <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>
- <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>
- <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>
-</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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></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 dcc0feb5e..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "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\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
- - 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\
-\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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation 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 dda04d725..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="3.3.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.wst.dtd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.catalog.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). 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
- (&quot;EPL&quot;). 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, &quot;Program&quot; 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 Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). 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>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <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>
- <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>
- <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>
-</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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></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 bdcbad775..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.500.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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.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 b0ea8f5ed..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 Web Tools Platform
-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 f7ca97044..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,77 +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.AttrValueTest;
-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(AttrValueTest.class, "JSP Attribute 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 c313202a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,148 +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 847d8d7c6..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 429e7a02c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.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.contentmodel.tld.CMDocumentFactoryTLD;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMElementDeclarationImpl;
-import org.eclipse.jst.jsp.core.internal.provisional.JSP20Namespace;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-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.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.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);
- }
-
- public void testDynamicAttributes() throws Exception {
- final String testName = "testDynamicAttributes";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(testName);
- if (!project.exists()) {
- project = BundleResourceUtil.createSimpleProject(testName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace(TESTFILES_PATHSTRING + "testDynamicAttributes", "/testDynamicAttributes");
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
- CMDocumentFactoryTLD factory = new CMDocumentFactoryTLD();
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/"+ testName + "/"));
- assertEquals("There should only be one taglib record", 1, records.length);
- CMDocument document = factory.createCMDocument(records[0]);
- CMNamedNodeMap elements = document.getElements();
- assertNotNull("No elements for the CM Document", elements);
- CMNode node = elements.getNamedItem("bar");
- assertTrue("Node must be a CMElementDeclarationImpl", node instanceof CMElementDeclarationImpl);
- assertEquals("Dynamic attributes must be set to 'true'", "true", ((CMElementDeclarationImpl) node).getDynamicAttributes());
- }
-}
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/AttrValueTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/AttrValueTest.java
deleted file mode 100644
index f19cf5e21..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/AttrValueTest.java
+++ /dev/null
@@ -1,71 +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.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-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.xml.core.internal.parser.ContextRegionContainer;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class AttrValueTest extends TestCase {
-
- private static final String[] VALUES = {"<<Previous", "<page>", "Next>>"};
-
- public void testAttributeValue() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
-
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
-
- document.setText(this, "<button value=\""+ VALUES[0] +"\"></button><button value=\"" + VALUES[1] + "\"></button><button value=\"" + VALUES[2] + "\"></button>");
-
- IDOMDocument dom = model.getDocument();
- NodeList nodes = dom.getElementsByTagName("button");
- assertTrue("Must be 3 button elements in the document.", nodes.getLength() == 3);
-
- for (int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
- Node attr = node.getAttributes().getNamedItem("value");
- assertTrue("Attribute 'value' not present.", attr != null && attr.getNodeValue().length() > 0);
- assertEquals("Attribute values are not equal", VALUES[i], attr.getNodeValue());
- }
- }
-
- public void testEmbeddedTagValue() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
-
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
-
- document.setText(this, "<a href=\"<c:out value='test.html'></c:out>\">Test</a>");
-
- IDOMDocument dom = model.getDocument();
- NodeList nodes = dom.getElementsByTagName("a");
- assertTrue("Must be 1 anchor element in the document.", nodes.getLength() == 1);
- IStructuredDocumentRegion region = document.getFirstStructuredDocumentRegion();
- ITextRegion embeddedRegion = region.getRegionAtCharacterOffset(9);
- assertTrue("The attribute is not a ContextRegionContainer", embeddedRegion instanceof ContextRegionContainer);
- Node node = nodes.item(0);
- Node attr = node.getAttributes().getNamedItem("href");
- assertEquals("Attribute values are not equal", "<c:out value='test.html'></c:out>", attr.getNodeValue());
- }
-
-}
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 587e27d79..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
+++ /dev/null
@@ -1,144 +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.modelhandler.ModelHandlerForJSP;
-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);
- ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-
- 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);
- ModelHandlerForJSP.ensureTranslationAdapterFactory(model);
-
- 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 f94a6fa0d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,691 +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.ArrayList;
-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.taglib.CustomTag;
-import org.eclipse.jst.jsp.core.internal.taglib.TaglibHelper;
-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.sse.core.internal.provisional.text.IStructuredDocument;
-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();
- }
- }
-
- public void testTaglibHelperWrongHierarchy() 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);
- TaglibHelper helper = new TaglibHelper(project);
- IFile testFile = project.getFile("/WebContent/iterationTester.jsp");
- assertTrue("iterationTester.jsp is not accessible", testFile.isAccessible());
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(testFile);
- IStructuredDocument doc = model.getStructuredDocument();
- CustomTag tag = helper.getCustomTag("plain:list", doc, null, new ArrayList());
- assertFalse("plain:list should not be an IterationTag", tag.isIterationTag());
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- public void testTaglibHelperUnresolvedSupertype() 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);
- TaglibHelper helper = new TaglibHelper(project);
- IFile testFile = project.getFile("/WebContent/iterationTester.jsp");
- assertTrue("iterationTester.jsp is not accessible", testFile.isAccessible());
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(testFile);
- IStructuredDocument doc = model.getStructuredDocument();
- CustomTag tag = helper.getCustomTag("plain:uberloop", doc, null, new ArrayList());
- assertTrue("plain:uberloop should be an IterationTag", tag.isIterationTag());
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- public void test_javaVariableIncludes() throws Exception {
- String testFolderName = "jspx_javaVariable_includes";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testFolderName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testFolderName, "/" + testFolderName);
-
- waitForBuildAndValidation(project);
-
- ValidationFramework.getDefault().validate(new IProject[]{project}, true, false, new NullProgressMonitor());
-
- assertNoProblemMarkers(project.getFile("/WebContent/test1.jsp"));
- assertNoProblemMarkers(project.getFile("/WebContent/index.jspx"));
-
- // clean up if we got to the end
- project.delete(true, true, null);
- }
-
- private void assertNoProblemMarkers(IFile file) throws CoreException {
- assertTrue("sample test file does not exist", file.isAccessible());
- IMarker[] markers = file.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));
- }
- assertEquals("Problem markers reported found \n" + markerText, 0, markers.length);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCustomTagTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCustomTagTest.java
deleted file mode 100644
index d317ee4c9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCustomTagTest.java
+++ /dev/null
@@ -1,102 +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 junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.jst.jsp.core.tests.validation.ReporterForTest;
-import org.eclipse.jst.jsp.core.tests.validation.ValidationContextForTest;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JSPJavaTranslatorCustomTagTest extends TestCase {
-
- static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";//$NON-NLS-1$
-// private static byte[] creationLock = new byte[0];
-
- public JSPJavaTranslatorCustomTagTest() {
- }
-
- public JSPJavaTranslatorCustomTagTest(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");//$NON-NLS-1$
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, wtp_autotest_noninteractive);
- }
-
- /**
- * Tests jsp translation when custom tag used
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=310085
- *
- * @throws Exception
- */
- public void test_310085() throws Exception {
- String projectName = "bug_310085"; //$NON-NLS-1$
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);//$NON-NLS-1$ //$NON-NLS-2$
- IFile file = project.getFile("WebContent/test310085.jsp");//$NON-NLS-1$
- assertTrue(file.exists());
-
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- helper.setURI(file.getFullPath().toString());
- validator.validate(helper, reporter);
-
- assertTrue("Found JSP Java problem for custom tag "+reporter.getMessages().size(), reporter.getMessages().isEmpty());//$NON-NLS-1$
-
- }
-
- /**
- * Tests jsp translation when custom tag used
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=326193
- *
- * @throws Exception
- */
- public void test_326193() throws Exception {
- String projectName = "bug_326193"; //$NON-NLS-1$
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName); //$NON-NLS-1$ //$NON-NLS-2$
- IFile file = project.getFile("WebContent/test326193.jsp"); //$NON-NLS-1$
- 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 for empty end tag in xml comment in script", reporter.getMessages().isEmpty());//$NON-NLS-1$
-
- }
- }
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 7b0f8fc45..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPTranslatorPersistenceTest.java
+++ /dev/null
@@ -1,267 +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());
- }
-
- public void testTranslationsDeepEqual() throws Exception {
- String outFileName = "testTranslationTextComparison.obj";
-
- JSPTranslator originalTranslator = writeTranslator("Test1.jsp", outFileName);
- JSPTranslator externalizedTranslator = (JSPTranslator)readObject(outFileName);
-
- assertEquals("The original translation should be deeply equal to the restored externalized translation",
- originalTranslator, externalizedTranslator);
- }
-
- /**
- * <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 52d171d41..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
+++ /dev/null
@@ -1,208 +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);
- }
-
- public void testELConditional() throws Exception {
- if (!ResourcesPlugin.getWorkspace().getRoot().getProject("testIterationTags").exists()) {
- BundleResourceUtil.createSimpleProject("testIterationTags", null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject("testIterationTags").exists());
-
-
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath1 = "/testIterationTags/WebContent/default.jspx";
- IFile file1 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
- assertTrue(file1.exists());
-
- helper.setURIs(new String[]{filePath1});
-
- validator.validate(helper, reporter);
- assertTrue("expected jsp errors were not found in both files: " + reporter.getMessages().size(), reporter.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 6caba40bc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPDirectiveValidatorTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 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.validation;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-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.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCoreMessages;
-import org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;
-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.sse.core.internal.util.Sorter;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-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.validation.core.ValidationMessage;
-
-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 testIncludeDirectiveXML() throws Exception {
- String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"+
- "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" version=\"2.0\">\n"+
- "<jsp:directive.include file=\"missing.jspf\"/>\n";
- runNegativeTest("/"+ getName() + "/test.jsp", contents, new JSPBatchValidator(), "Fragment \"missing.jspf\" was not found at expected path /testIncludeDirectiveXML/missing.jspf");
- }
-
- public void testIncludeDirective2() throws Exception {
- String contents = "<%@include file=\"missing.jspf\"%>\n";
- runNegativeTest("/"+ getName() + "/test.jsp", contents, new JSPBatchValidator(), "Fragment \"missing.jspf\" was not found at expected path /testIncludeDirective2/missing.jspf");
- }
-
- public void testIncludeAction() throws Exception {
- String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"+
- "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" version=\"2.0\">\n"+
- "<jsp:include page=\"missing.jspf\"/>\n";
- runNegativeTest("/"+ getName() + "/test.jsp", contents, new JSPBatchValidator(), "Fragment \"missing.jspf\" was not found at expected path /testIncludeAction/missing.jspf");
- }
-
- 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
- }
- }
-
- /**
- * The purpose of a validator is to generate messages. Let us make sure the expected messages are generated.
- * @param filePath
- * @param content
- * @param validator
- * @param expectedProblemMessages
- * @throws Exception
- */
- protected void runNegativeTest(String filePath, String content, AbstractValidator validator, String expectedProblemMessages) throws Exception {
- IPath path = new Path (filePath);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0));
- if (!project.exists()) {
- BundleResourceUtil.createSimpleProject(path.segment(0), null, new String[]{JavaCore.NATURE_ID});
- }
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- file.create(new ByteArrayInputStream(content.getBytes("utf8")), true, null);
- ValidationResult result = validator.validate(file, IResourceDelta.ADDED, new ValidationState(), new NullProgressMonitor());
- assertEquals(expectedProblemMessages, sortMessages(result.getReporter(new NullProgressMonitor()).getMessages()));
- }
-
- static class ValidatorMessageSorter extends Sorter {
- /* (non-Javadoc)
- * @see org.eclipse.wst.sse.core.internal.util.Sorter#compare(java.lang.Object, java.lang.Object)
- */
- public boolean compare(Object elementOne, Object elementTwo) {
- if (elementOne instanceof ValidationMessage)
- return ((ValidationMessage) elementTwo).getMessage().compareTo(((ValidationMessage) elementOne).getMessage()) > 0;
- return ((IMessage) elementTwo).getOffset() > ((IMessage) elementOne).getOffset();
- }
- }
-
- /**
- * @param messages
- * @return
- */
- private String sortMessages(List messages) {
- Object[] sorted = new ValidatorMessageSorter().sort(messages.toArray());
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < sorted.length; i++) {
- if (sorted[i] instanceof ValidationMessage)
- s.append(((ValidationMessage) sorted[i]).getMessage());
- else
- s.append(((IMessage) sorted[i]).getText());
- }
- return s.toString();
- }
-}
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_310085/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/.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_310085/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/.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_310085/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/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_310085/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/WEB-INF/web.xml
deleted file mode 100644
index d03194ce9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/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_310085/WebContent/test310085.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/test310085.jsp
deleted file mode 100644
index 605007ab6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_310085/WebContent/test310085.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>
-<% String name; %>
-<A HREF ='<portlet:actionURL><portlet:param name="<%=name%>" value="<%=name%>"/></portlet:actionURL>'>reset</A>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.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_326193/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/.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_326193/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/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_326193/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/WEB-INF/web.xml
deleted file mode 100644
index d03194ce9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/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_326193/WebContent/test326193.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/test326193.jsp
deleted file mode 100644
index 9df245759..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/WebContent/test326193.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-
- <script type="text/javascript">
- <!--
-
-
- /*
- *
- */
- function invokeAutoAssign() {
-
- hideAllMenus();
- if(confirm('<scheduler:getString locale="locale1" key="INVOKE_AUTOASSIGN_CONFIRM_MSG" argument="<%= 5 %>" val="6/>j" />')) {
- document.form.<scheduler:getconstant key="ID_PARAM" />.value =9;
- }
- }
-
-
- //-->
- </script>
- </head>
- <body onload="javascript:initialize();" class="<jsp:getProperty name="dayCellBean" property="bodyClass" />">
- <div></div>
- </body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_326193/src/.keepme
+++ /dev/null
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/jspx_javaVariable_includes/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.classpath
deleted file mode 100644
index 8020cb130..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.project
deleted file mode 100644
index ca04082be..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jspx_javaVariable_includes</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>
- <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/testfiles/jspx_javaVariable_includes/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5c279b1b3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue May 25 18:37:19 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d632fff2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: javax.servlet,javax.servlet.jsp
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: jspx_javaVariable_includes; singleton:=true
-Bundle-Version: 1.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 2e8ee1cc4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +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>jspx_javaVariable_includes</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>index.jspx</welcome-file>
- </welcome-file-list>
-</web-app> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authAdmin.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authAdmin.jspf
deleted file mode 100644
index 573190caa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authAdmin.jspf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
- <jsp:directive.include file="authCheck.jspf"/>
-
- <jsp:output omit-xml-declaration="true" doctype-root-element="HTML"
- doctype-system="http://www.w3.org/TR/html4/loose.dtd"
- doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
- <jsp:directive.page contentType="text/html;charset=UTF-8" />
- <jsp:scriptlet>
- // Nothing
- </jsp:scriptlet>
-</jsp:root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authCheck.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authCheck.jspf
deleted file mode 100644
index 40e20b474..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/include/authCheck.jspf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-
- <jsp:output omit-xml-declaration="true" doctype-root-element="HTML"
- doctype-system="http://www.w3.org/TR/html4/loose.dtd"
- doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
- <jsp:directive.page contentType="text/html;charset=UTF-8" />
- <jsp:scriptlet>
- boolean authenticated = true;
- </jsp:scriptlet>
-</jsp:root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/index.jspx b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/index.jspx
deleted file mode 100644
index 5d7efa5d2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/index.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ice="http://www.icesoft.com/icefaces/component">
- <jsp:directive.include file="include/authAdmin.jspf"/>
-
- <jsp:output omit-xml-declaration="true" doctype-root-element="HTML"
- doctype-system="http://www.w3.org/TR/html4/loose.dtd"
- doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
- <jsp:directive.page contentType="text/html;charset=UTF-8" />
- <html>
- <head>
- <title>119576</title>
- </head>
- <body>
- <jsp:scriptlet>
- out.println("Variable authenticated is " + authenticated);
- </jsp:scriptlet>
- </body>
- </html>
-</jsp:root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test1.jsp
deleted file mode 100644
index 24bd3c080..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test1.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page import="java.sql.*" contentType="text/html; charset=ISO-8859-2"%>
-<!doctype html public "-//w3c//dtd html 3.2//en">
-<%@ include file="/test2.jsp" %>
-<%
-variable1="test2";
-%>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test2.jsp
deleted file mode 100644
index 545d6be92..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page import="java.sql.*" contentType="text/html; charset=ISO-8859-2"%>
-<%@ include file="test3.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test3.jsp
deleted file mode 100644
index ac374e100..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/WebContent/test3.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page import="java.sql.*" contentType="text/html; charset=ISO-8859-2"%>
-<!doctype html public "-//w3c//dtd html 3.2//en">
-<%
-String variable1 = "test";
-%>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspx_javaVariable_includes/src/.keepme
+++ /dev/null
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/testDynamicAttributes/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/.classpath
deleted file mode 100644
index e831395b1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/" />
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry 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/testDynamicAttributes/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/.project
deleted file mode 100644
index 58fc0f63e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testDynamicAttributes</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.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/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/testDynamicAttributes/WebContent/WEB-INF/foo.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/foo.tld
deleted file mode 100644
index c8516febb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/foo.tld
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<taglib 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-jsptaglibrary_2_0.xsd"
- version="2.0">
-
- <tlib-version>1.0</tlib-version>
- <short-name>foo</short-name>
- <uri>http://foo</uri>
- <tag>
- <description>Test Dynamic Attributes</description>
- <name>bar</name>
- <tag-class>foo.Bar</tag-class>
- <body-content>empty</body-content>
- <dynamic-attributes>true</dynamic-attributes>
- </tag>
-
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 6b45a6477..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testDynamicAttributes/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +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>testDynamicAttributes</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> \ No newline at end of file
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 95ce12b36..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/WEB-INF/plain.tld
+++ /dev/null
@@ -1,36 +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>
-<tag>
-<name>list</name>
-<tagclass>java.util.List</tagclass>
-<bodycontent>JSP</bodycontent>
-</tag>
-<tag>
-<name>uberloop</name>
-<tagclass>org.eclipse.UberLoopTag</tagclass>
-<bodycontent>JSP</bodycontent>
-</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/default.jspx b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/default.jspx
deleted file mode 100644
index 7d4d4c31d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/default.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<html
- xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:c="http://java.sun.com/jsp/jstl/core" >
- <jsp:directive.page contentType="text/html;charset=UTF-8" />
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Page</title>
- </head>
- <body>
- <c:if test="${pageContext.request.requestURI != null}">
- <c:out value=" foo "/>
- </c:if>
- </body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/iterationTester.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/iterationTester.jsp
deleted file mode 100644
index f9d5328c6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/WebContent/iterationTester.jsp
+++ /dev/null
@@ -1,13 +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>
-
-</body>
-</html>
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/testIterationTags/src/org/eclipse/UberLoopTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/UberLoopTag.java
deleted file mode 100644
index 76234d1e1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testIterationTags/src/org/eclipse/UberLoopTag.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse;
-
-public class UberLoopTag extends LoopTag {
-
-}
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 8784ffdc6..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.500.qualifier
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 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 Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 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 282073df7..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 Web Tools Platform
-Bundle-Name.0 = JSP Encoding Tests Plug-in \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 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 00ae8002d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.StringTokenizer;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- boolean DEBUG = false;
- private String fCharset;
- private String fContentType;
- private String fContentTypeValue;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
- private String fLanguage;
-
- private void doTestFile(String filename, String expectedName) throws Exception {
- doTestFile(filename, expectedName, null, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- try {
- doTestFile(JSPEncodingTestsPlugin.getTestReader(filename), expectedName, finalTokenType, expectedContentType);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename +"\"");
- }
- }
-
- private void doTestFile(Reader fileReader, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- JSPHeadTokenizer tokenizer = null;
- tokenizer = new JSPHeadTokenizer(fileReader);
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
-
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
-
- String foundContentType = getContentType();
- if (expectedContentType == null) {
- assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
- }
- else {
- assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- public void testNormalNonDefault() throws Exception {
- String filename = fileLocation + "NormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8");
- }
-
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * This method should be exactly the same as what is in
- * JSPResourceEncodingDetector
- *
- * @param contentType
- */
- private void parseContentTypeValue(String contentType) {
- /*
- * Based partially on
- * org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterImpl
- * .getMimeTypeFromContentTypeValue(String) , divides the full value
- * into segments according to ';', assumes the first specifies the
- * content type itself if it has no '=', and that the remainder are
- * parameters which may specify a charset
- */
-
- String cleanContentTypeValue = StringUtils.stripNonLetterDigits(contentType);
- /* Break the mime header into the main value and its parameters, separated by ';' */
- StringTokenizer tokenizer = new StringTokenizer(cleanContentTypeValue, ";"); //$NON-NLS-1$
- int tLen = tokenizer.countTokens();
- if (tLen == 0)
- return;
- String[] tokens = new String[tLen];
- int j = 0;
- while (tokenizer.hasMoreTokens()) {
- tokens[j] = tokenizer.nextToken();
- j++;
- }
-
- int firstParameter = 0;
- if (tokens[0].indexOf('=') == -1) {
- /*
- * no equal sign in the first segment, so assume it indicates a
- * content type properly
- */
- fContentType = tokens[0].trim();
- firstParameter = 1;
- }
- /*
- * now handle parameters as name=value pairs, looking for "charset"
- * specifically
- */
- Pattern equalPattern = Pattern.compile("\\s*=\\s*"); //$NON-NLS-1$
- for (int i = firstParameter; i < tokens.length; i++) {
- String[] pair = equalPattern.split(tokens[i]);
- if (pair.length < 2)
- continue;
- if (pair[0].trim().equals("charset")) { //$NON-NLS-1$
- fCharset = pair[1].trim();
- }
- }
-
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws Exception {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = null;
- fContentTypeValue = null;
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
-
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- else if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fXMLDecEncodingName = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fPageEncodingValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fLanguage = valueToken.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws Exception {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testMinimalPageDirective() throws Exception {
- String filename = fileLocation + "minimalPageDirective.jsp";
- doTestFile(filename, null, null, "text/html");
- }
-
- public void testIllFormed() throws Exception {
- String filename = fileLocation + "testIllFormed.jsp";
- doTestFile(filename, null);
- }
-
- public void testIllFormed2() throws Exception {
- String filename = fileLocation + "testIllFormed2.jsp";
- doTestFile(filename, "UTF-8");
- }
-
- public void testIllformedNormalNonDefault() throws Exception {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8", null, "text/html");
- }
-
- public void testEmptyFile() throws Exception {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirective() throws Exception {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalPageDirectiveWithXMLDecl() throws Exception {
- String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
- doTestFile(filename, "ISO-8859-1", null, "text/html");
- }
-
-
- public void testNoPageDirectiveAtFirst() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirectiveInLargeFile() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
- }
-
- public void testNormalCaseWithNeither() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3", null, "text/html");
- }
-
- public void testUTF16le() throws Exception {
- String filename = fileLocation + "utf16le.jsp";
- doTestFile(filename, "UTF-16LE", null, "text/html");
- }
-
- public void testUTF16be() throws Exception {
- String filename = fileLocation + "utf16be.jsp";
- doTestFile(filename, "UTF-16BE", null, "text/html");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.zzRefill(JSPHeadTokenizer.java:359)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.primGetNextToken(JSPHeadTokenizer.java:598)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.getNextToken(JSPHeadTokenizer.java:254)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
- */
-
- public void testUTF16BOM() throws Exception {
- /*String filename = fileLocation + "utf16BOM.jsp";
- ZippedTest test = new ZippedTest();
- test.setUp();
- IFile file = test.getFile(filename);
- assertNotNull(file);
- Reader fileReader = new FileReader(file.getLocationURI().getPath());
- doTestFile(fileReader, "UTF-16", null, null);
- test.shutDown();*/
- }
-
- public void testUTF16leXmlStyle() throws Exception {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFile(filename, "UTF-16LE", null, null);
- }
-
- public String getLanguage() {
- return fLanguage;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index 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 324c9fb84..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.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
deleted file mode 100644
index e27fad027..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="text.tests"/>
- <classpathentry kind="src" path="jface.text.tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore b/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
deleted file mode 100644
index 3a5e93254..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.jst.jsp.ui.tests_1.0.0.jar
-jspuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.project b/tests/org.eclipse.jst.jsp.ui.tests/.project
deleted file mode 100644
index 71a50f1c0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.ui.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.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c89219cfd..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,55 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true
-Bundle-Version: 1.0.500.qualifier
-Bundle-ClassPath: jspuitests.jar
-Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.ui.tests,
- org.eclipse.jst.jsp.ui.tests.contentassist,
- org.eclipse.jst.jsp.ui.tests.contentassist.testfiles,
- org.eclipse.jst.jsp.ui.tests.contentdescription,
- org.eclipse.jst.jsp.ui.tests.document,
- org.eclipse.jst.jsp.ui.tests.examples,
- org.eclipse.jst.jsp.ui.tests.format,
- org.eclipse.jst.jsp.ui.tests.model,
- org.eclipse.jst.jsp.ui.tests.modelquery,
- org.eclipse.jst.jsp.ui.tests.other,
- org.eclipse.jst.jsp.ui.tests.pagedirective,
- org.eclipse.jst.jsp.ui.tests.partitioning,
- org.eclipse.jst.jsp.ui.tests.partitioning.testfiles.jsp,
- org.eclipse.jst.jsp.ui.tests.registry,
- org.eclipse.jst.jsp.ui.tests.search,
- org.eclipse.jst.jsp.ui.tests.threaded,
- org.eclipse.jst.jsp.ui.tests.util,
- org.eclipse.jst.jsp.ui.tests.validation,
- org.eclipse.jst.jsp.ui.tests.viewer
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.jst.jsp.ui,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
- org.eclipse.wst.css.core,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.ui,
- com.ibm.icu,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.validation,
- org.eclipse.core.commands,
- org.eclipse.core.expressions
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/about.html b/tests/org.eclipse.jst.jsp.ui.tests/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
deleted file mode 100644
index 973969899..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-bin.includes = plugin.xml,\
- testfiles.zip,\
- test.xml,\
- projecttestfiles/,\
- testfiles/,\
- jspuitests.jar,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- text.tests/,\
- jface.text.tests/
-jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/,\
- text.tests/,\
- jface.text.tests/
-output.jspuitests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif
deleted file mode 100644
index ecd1be568..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif
deleted file mode 100644
index 865279725..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif
deleted file mode 100644
index e47777b5a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif
deleted file mode 100644
index 28a3785aa..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif
deleted file mode 100644
index 16f4e2517..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif
deleted file mode 100644
index 161e3f594..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
deleted file mode 100644
index 1d6e3947c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian Plesner Hansen (plesner@quenta.org) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextStore;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
- * Generic test of simple character pair matchers
- *
- * @since 3.3
- */
-public abstract class AbstractPairMatcherTest extends TestCase {
-
- /**
- * Constructs a new character pair matcher.
- *
- * @param chars the characters to match
- * @return the character pair matcher
- */
- protected abstract ICharacterPairMatcher createMatcher(final String chars);
-
- /**
- * Returns the partitioning treated by the matcher.
- *
- * @return the partition
- */
- protected abstract String getDocumentPartitioning();
-
- public AbstractPairMatcherTest(String name) {
- super(name);
- }
-
- public AbstractPairMatcherTest() {
- super();
- }
-
- /* --- T e s t s --- */
-
- /** Tests that the test case reader works */
- public void testTestCaseReader() {
- performReaderTest("#( )%", 3, 0, "( )");
- performReaderTest("%( )#", 0, 3, "( )");
- performReaderTest("( )%", 3, -1, "( )");
- performReaderTest("#%", 0, 0, "");
- }
-
- /**
- * Very simple checks.
- *
- * @throws BadLocationException
- */
- public void testSimpleMatchSameMatcher() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, "#( )%");
- performMatch(matcher, "#[ ]%");
- performMatch(matcher, "#{ }%");
- performMatch(matcher, "(% )#");
- performMatch(matcher, "[% ]#");
- performMatch(matcher, "{% }#");
- matcher.dispose();
- }
-
- /**
- * Very simple checks.
- *
- * @throws BadLocationException
- */
- public void testSimpleMatchDifferentMatchers() throws BadLocationException {
- performMatch("()[]{}", "#( )%");
- performMatch("()[]{}", "#[ ]%");
- performMatch("()[]{}", "#{ }%");
- performMatch("()[]{}", "(% )#");
- performMatch("()[]{}", "[% ]#");
- performMatch("()[]{}", "{% }#");
- }
-
- /**
- * Close matches.
- *
- * @throws BadLocationException
- */
- public void testCloseMatches() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, "#()%");
- performMatch(matcher, "(%)#");
- performMatch(matcher, "#(())%");
- performMatch(matcher, "(%())#");
- performMatch(matcher, "((%)#)");
- performMatch(matcher, "(#()%)");
- matcher.dispose();
- }
-
-
- /**
- * Checks of simple situations where no matches should be found.
- *
- * @throws BadLocationException
- */
- public void testIncompleteMatch() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, "(% ");
- performMatch(matcher, "%( )");
- performMatch(matcher, "( % )");
- performMatch(matcher, "( %)");
- performMatch(matcher, "%");
- matcher.dispose();
- }
-
- /**
- * Test that it doesn't match across different partitions.
- *
- * @throws BadLocationException
- */
- public void testPartitioned() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, "(% |a a| )#");
- performMatch(matcher, "#( |a a| )%");
- performMatch(matcher, "|b #( )% b|");
- performMatch(matcher, "( |b )% b|");
- performMatch(matcher, "(% |b ) b|");
- performMatch(matcher, "|a ( a| )%");
- performMatch(matcher, "|a (% a| )");
- performMatch(matcher, "|c #( c| ) ( |c )% c|");
- performMatch(matcher, "|c (% c| ) ( |c )# c|");
- performMatch(matcher, "(% |a ) a| |b ) b| |c ) c| )#");
- matcher.dispose();
- }
-
- /**
- * Test that it works properly next to partition boundaries.
- *
- * @throws BadLocationException
- */
- public void testTightPartitioned() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, "(|b)%b|");
- performMatch(matcher, "(%|b)b|");
- performMatch(matcher, "|a(a|)%");
- performMatch(matcher, "|a(%a|)");
- performMatch(matcher, "|c#(c|)(|c)%c|");
- performMatch(matcher, "|c(%c|)(|c)#c|");
- performMatch(matcher, "(%|a)a||b)b||c)c|)#");
- matcher.dispose();
- }
-
- /** Test that nesting works properly */
- public void testNesting() {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- performMatch(matcher, " ( #( ( ( ) ) ( ) )% ) ");
- performMatch(matcher, " ( (% ( ( ) ) ( ) )# ) ");
- performMatch(matcher, " ( #( { ( ) } [ ] )% ) ");
- performMatch(matcher, " ( (% { ( ) } [ ] )# ) ");
- performMatch(matcher, " ( ( #{ ( ) }% [ ] ) ) ");
- performMatch(matcher, " ( ( {% ( ) }# [ ] ) ) ");
- performMatch(matcher, "a(b#(c(d(e)f)g(h)i)%j)k");
- performMatch(matcher, "a(b(%c(d(e)f)g(h)i)#j)k");
- performMatch(matcher, "a(b#(c{d(e)f}g[h]i)%j)k");
- performMatch(matcher, "a(b(%c{d(e)f}g[h]i)#j)k");
- performMatch(matcher, "a(b(c#{d(e)f}%g[h]i)j)k");
- performMatch(matcher, "a(b(c{%d(e)f}#g[h]i)j)k");
- matcher.dispose();
- }
-
- /**
- * Test a few boundary conditions.
- *
- * * @throws BadLocationException
- */
- public void testBoundaries() throws BadLocationException {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}");
- final StringDocument doc= new StringDocument("abcdefghijkl");
- assertNull(matcher.match(null, 0));
- assertNull(matcher.match(doc, -1));
- assertNull(matcher.match(doc, doc.getLength() + 1));
- matcher.dispose();
- }
-
- public void testBug156426() {
- final ICharacterPairMatcher matcher= createMatcher("()[]{}<>");
- performMatch(matcher, " #( a < b )% ");
- performMatch(matcher, " (% a < b )# ");
- performMatch(matcher, " #( a > b )% ");
- performMatch(matcher, " (% a > b )# ");
- matcher.dispose();
- }
-
- /* --- U t i l i t i e s --- */
-
- /**
- * Checks that the test case reader reads the test case as specified.
- *
- * @param testString the string to test
- * @param expectedPos the expected position
- * @param expectedMatch the expected match
- * @param expectedString the expected string
- */
- private void performReaderTest(String testString, int expectedPos, int expectedMatch, String expectedString) {
- TestCase t0= createTestCase(testString);
- assertEquals(expectedPos, t0.fPos);
- assertEquals(expectedMatch, t0.fMatch);
- assertEquals(expectedString, t0.fString);
- }
-
- /**
- * Checks that the given matcher matches the input as specified.
- *
- * @param matcher the matcher
- * @param testCase the test string
- */
- protected void performMatch(final ICharacterPairMatcher matcher, final String testCase) {
- final TestCase test= createTestCase(testCase);
- matcher.clear();
- final IRegion region= matcher.match(test.getDocument(), test.fPos);
- if (test.fMatch == -1) {
- // if no match point has been specified there should be
- // no match
- if (region != null) System.out.println(region.getOffset());
- assertNull(region);
- } else {
- assertNotNull(region);
- final boolean isForward= test.fPos > test.fMatch;
- assertEquals(isForward, matcher.getAnchor() == ICharacterPairMatcher.RIGHT);
- // If the match is forward, the curser is one character
- // after the start of the match, so we need to count one
- // step backwards
- final int offset= isForward ? test.getOffset() : test.getOffset() - 1;
- final int length= isForward ? test.getLength() : test.getLength() + 1;
- assertEquals(length, region.getLength());
- assertEquals(offset, region.getOffset());
- }
- }
-
- private void performMatch(final String delims, final String testCase) {
- final ICharacterPairMatcher matcher= createMatcher(delims);
- performMatch(matcher, testCase);
- matcher.dispose();
- }
-
- /**
- * Creates a text case from a string. In the given string a '%' represents the position of the
- * cursor and a '#' represents the position of the expected matching character.
- *
- * @param str the string for which to create the test case
- * @return the created test case
- */
- public TestCase createTestCase(String str) {
- int pos= str.indexOf("%");
- assertFalse(pos == -1);
- int match= str.indexOf("#");
- // account for the length of the first position marker,
- // if there is one
- if (match != -1 && match < pos) pos -= 1;
- if (pos < match) match -= 1;
- final String stripped= str.replaceAll("%", "").replaceAll("#", "");
- return new TestCase(stripped, pos, match);
- }
-
- private class TestCase {
-
- public final String fString;
- public final int fPos, fMatch;
-
- public TestCase(String string, int pos, int match) {
- fString= string;
- fPos= pos;
- fMatch= match;
- }
-
- public IDocument getDocument() {
- return new StringDocument(fString);
- }
-
- public int getLength() {
- return Math.abs(fPos - fMatch);
- }
-
- public int getOffset() {
- if (fPos > fMatch) return fMatch;
- return fPos;
- }
-
- }
-
- private class StringDocument extends Document {
-
- public StringDocument(String str) {
- this.setTextStore(new StringTextStore(str));
- this.set(str);
- final IDocumentPartitioner part= createPartitioner();
- this.setDocumentPartitioner(getDocumentPartitioning(), part);
- part.connect(this);
- }
-
- }
-
- private static class StringTextStore implements ITextStore {
-
- private String fString;
-
- public StringTextStore(final String str) {
- fString= str;
- }
-
- public char get(int offset) {
- return fString.charAt(offset);
- }
-
- public String get(int offset, int length) {
- return fString.substring(offset, offset + length);
- }
-
- public int getLength() {
- return fString.length();
- }
-
- public void replace(int offset, int length, String text) {
- throw new UnsupportedOperationException();
- }
-
- public void set(String text) {
- fString= text;
- }
-
- }
-
- private static String DEFAULT_PARTITION= IDocument.DEFAULT_CONTENT_TYPE;
-
- private static IDocumentPartitioner createPartitioner() {
- final RuleBasedPartitionScanner scan= new RuleBasedPartitionScanner();
- final List/*<IPredicateRule>*/ rules= new ArrayList/*<IPredicateRule>*/();
- rules.add(new SingleLineRule("|a", "a|", new Token("a")));
- rules.add(new SingleLineRule("|b", "b|", new Token("b")));
- rules.add(new SingleLineRule("|c", "c|", new Token("c")));
- scan.setPredicateRules((IPredicateRule[]) rules.toArray(new IPredicateRule[rules.size()]));
- scan.setDefaultReturnToken(new Token(DEFAULT_PARTITION));
- return new FastPartitioner(scan, new String[] { DEFAULT_PARTITION, "a", "b", "c" });
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java
deleted file mode 100644
index 361e701d4..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-/**
- * Tests for DefaultUndoManager. Changed from the JFace original to creates
- * and test against a structured document.
- */
-public abstract class AbstractUndoManagerTest extends TestCase {
-
- /** The maximum undo level. */
- private static final int MAX_UNDO_LEVEL= 256;
-
- /** The shell. */
- private Shell fShell;
- /** The text viewer. */
- private ITextViewer fTextViewer;
- /** The undo manager. */
- private IUndoManager fUndoManager;
-
- private static final int LOOP_COUNT= 20;
-
- //--- Static data sets for comparing scenarios - obtained from capturing random data ---
- /** Original document */
- private static final String INITIAL_DOCUMENT_CONTENT= "+7cyg:/F!T4KnW;0+au$t1G%(`Z|u'7'_!-k?<c\"2Y.]CwsO.r";
- /** Replacement string */
- private static final String [] REPLACEMENTS= { ">", "F", "M/r-*", "-", "bl", "", "}%/#", "", "k&", "f", "\\g", "c!x", "TLG-", "NPO", "Rp9u", "", "X", "W(", ")z", "oe", "", "h*", "t", "I", "X=N>", "2yt", "&Z", "2)W=", ":K", "P9S", "s8t8o", "", "", "5{7", "%", "", "v3", "Wz", "sH", "3c", "8", "ol", ",6$", "94[#", ".~", "n", ">", "9", "W", ",(FW", "Q", "^", "Bq", "$", "re", "", "9", "8[", "Mx", "4b", "$6", "F", "8s]", "o", "-", "E&6", "S\\", "/", "z.a", "4ai", "b", ")", "", "l", "VU", "7M+Ql", "xZ?x", "xx", "lc", "b", "A", "!", "4pSU", "", "{J", "H", "l>_", "n&9", "", "&`", ";igQxq", "", ">", ";\"", "k\\`]G", "o{?", "", "K", "_6", "="};
- /** Position/offset pairs */
- private static final int [] POSITIONS= { 18, 2, 43, 1, 3, 2, 28, 3, 35, 1, 23, 5, 32, 2, 30, 1, 22, 1, 37, 0, 23, 3, 43, 2, 46, 1, 17, 1, 36, 6, 17, 5, 30, 4, 25, 1, 2, 2, 30, 0, 37, 3, 28, 1, 30, 2, 20, 5, 33, 1, 29, 1, 15, 2, 21, 2, 24, 4, 38, 3, 8, 0, 33, 2, 15, 2, 25, 0, 8, 2, 20, 3, 43, 2, 44, 1, 44, 2, 32, 2, 40, 2, 32, 3, 12, 2, 38, 3, 33, 2, 46, 0, 13, 3, 45, 0, 16, 2, 3, 2, 44, 0, 48, 0, 18, 5, 7, 6, 7, 3, 40, 0, 9, 1, 16, 3, 28, 3, 36, 1, 35, 2, 0, 3, 6, 1, 10, 4, 14, 2, 15, 3, 33, 1, 36, 0, 37, 0, 4, 3, 31, 3, 33, 3, 11, 3, 20, 2, 25, 3, 4, 3, 7, 3, 17, 0, 3, 1, 31, 3, 34, 1, 21, 0, 33, 1, 17, 4, 9, 1, 26, 3, 2, 3, 12, 1, 26, 3, 9, 5, 5, 0, 31, 3, 0, 3, 12, 1, 1, 1, 3, 0, 39, 0, 9, 2, 2, 0, 28, 2};
-
- private static final boolean DEBUG= false;
-
-
- /*
- * @see TestCase#TestCase(String)
- */
- public AbstractUndoManagerTest(final String name) {
- super(name);
- }
-
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() {
- fShell= new Shell();
- fUndoManager= createUndoManager(MAX_UNDO_LEVEL);
- fTextViewer= new TextViewer(fShell, SWT.NONE);
- fTextViewer.setUndoManager(fUndoManager);
- fUndoManager.connect(fTextViewer);
- }
-
- abstract protected IUndoManager createUndoManager(int maxUndoLevel);
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() {
- fUndoManager.disconnect();
- fUndoManager= null;
- fShell.dispose();
- fShell= null;
- fTextViewer= null;
- }
-
- /**
- * Test for line delimiter conversion.
- */
- public void testConvertLineDelimiters() {
- final String original= "a\r\nb\r\n";
- final IDocument document= createDocument(original);
- fTextViewer.setDocument(document);
-
- try {
- document.replace(1, 2, "\n");
- document.replace(3, 2, "\n");
- } catch (BadLocationException e) {
- assertTrue(false);
- }
-
- assertTrue(fUndoManager.undoable());
- fUndoManager.undo();
- assertTrue(fUndoManager.undoable());
- fUndoManager.undo();
-
- final String reverted= document.get();
-
- assertEquals(original, reverted);
- }
-
- /**
- * Randomly applies document changes.
- */
- public void testRandomAccess() {
- final int RANDOM_STRING_LENGTH= 50;
- final int RANDOM_REPLACE_COUNT= 100;
-
- assertTrue(RANDOM_REPLACE_COUNT >= 1);
- assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
- String original= createRandomString(RANDOM_STRING_LENGTH);
- final IDocument document= createDocument(original);
- fTextViewer.setDocument(document);
-
- doChange(document, RANDOM_REPLACE_COUNT);
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
-
- final String reverted= document.get();
- assertEquals(original, reverted);
- }
-
- private void doChange(IDocument document, int count) {
- try {
- String before= document.get();
-
- if (DEBUG)
- System.out.println(before);
-
- Position [] positions= new Position[count];
- String [] strings= new String[count];
- for (int i= 0; i < count; i++) {
- final Position position= createRandomPositionPoisson(document.getLength());
- final String string= createRandomStringPoisson();
- document.replace(position.getOffset(), position.getLength(), string);
- positions[i]= position;
- strings[i]= string;
- }
-
- if (DEBUG) {
- System.out.print("{ ");
- for (int i=0; i<count; i++) {
- System.out.print(positions[i].getOffset());
- System.out.print(", ");
- System.out.print(positions[i].getLength());
- System.out.print(", ");
- }
- System.out.println(" }");
- System.out.print("{ ");
- for (int i=0; i<count; i++) {
- System.out.print("\"");
- System.out.print(strings[i]);
- System.out.print("\", ");
- }
- System.out.println(" }");
- }
- } catch (BadLocationException e) {
- assertTrue(false);
- }
- }
-
- // repeatable test case for comparing success/failure among different tests
- private void doRepeatableChange(IDocument document) {
- assertTrue(POSITIONS.length >= (2 * REPLACEMENTS.length));
- try {
- for (int i= 0; i < REPLACEMENTS.length; i++) {
- int offset= POSITIONS[i*2];
- int length= POSITIONS[i*2+1];
- if (document.getLength() > offset + length)
- document.replace(offset, length, REPLACEMENTS[i]);
- else
- document.replace(0,0, REPLACEMENTS[i]);
- }
- } catch (BadLocationException e) {
- assertTrue(false);
- }
- }
-
- public void testLoopRandomAccessAsCompound() {
- int i= 0;
- while (i < LOOP_COUNT) {
- fUndoManager.reset();
- testRandomAccessAsCompound();
- i++;
- }
- }
-
- public void testLoopRandomAccess() {
- int i= 0;
- while (i < LOOP_COUNT) {
- fUndoManager.reset();
- testRandomAccess();
- i++;
- }
- }
-
- public void testLoopRandomAccessAsUnclosedCompound() {
- int i= 0;
- while (i < LOOP_COUNT) {
- fUndoManager.reset();
- testRandomAccessAsUnclosedCompound();
- i++;
- }
- }
-
- public void testLoopConvertLineDelimiters() {
- int i= 0;
- while (i < LOOP_COUNT) {
- fUndoManager.reset();
- testConvertLineDelimiters();
- i++;
- }
- }
-
- public void testLoopRandomAccessWithMixedCompound() {
- int i= 0;
- while (i < LOOP_COUNT) {
- fUndoManager.reset();
- testRandomAccessWithMixedCompound();
- i++;
- }
- }
-
- public void testRandomAccessAsCompound() {
- final int RANDOM_STRING_LENGTH= 50;
- final int RANDOM_REPLACE_COUNT= 100;
-
- assertTrue(RANDOM_REPLACE_COUNT >= 1);
- assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
- String original= createRandomString(RANDOM_STRING_LENGTH);
- final IDocument document= createDocument(original);
- fTextViewer.setDocument(document);
-
- fUndoManager.beginCompoundChange();
- doChange(document, RANDOM_REPLACE_COUNT);
- fUndoManager.endCompoundChange();
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
- assertTrue(!fUndoManager.undoable());
-
- final String reverted= document.get();
-
- assertEquals(original, reverted);
- }
-
- /**
- * Test case for https://bugs.eclipse.org/bugs/show_bug.cgi?id=88172
- */
- public void testRandomAccessAsUnclosedCompound() {
-
- final int RANDOM_STRING_LENGTH= 50;
- final int RANDOM_REPLACE_COUNT= 100;
-
- assertTrue(RANDOM_REPLACE_COUNT >= 1);
- assertTrue(RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
- String original= createRandomString(RANDOM_STRING_LENGTH);
- final IDocument document= createDocument(original);
- fTextViewer.setDocument(document);
-
- fUndoManager.beginCompoundChange();
- doChange(document, RANDOM_REPLACE_COUNT);
- // do not close the compound.
- // fUndoManager.endCompoundChange();
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
- assertTrue(!fUndoManager.undoable());
-
- final String reverted= document.get();
-
- assertEquals(original, reverted);
- }
-
- public void testRandomAccessWithMixedCompound() {
-
- final int RANDOM_STRING_LENGTH= 50;
- final int RANDOM_REPLACE_COUNT= 10;
- final int NUMBER_COMPOUNDS= 5;
- final int NUMBER_ATOMIC_PER_COMPOUND= 3;
-
- assertTrue(RANDOM_REPLACE_COUNT >= 1);
- assertTrue(NUMBER_COMPOUNDS * (1 + NUMBER_ATOMIC_PER_COMPOUND) * RANDOM_REPLACE_COUNT <= MAX_UNDO_LEVEL);
-
- String original= createRandomString(RANDOM_STRING_LENGTH);
- final IDocument document= createDocument(original);
- fTextViewer.setDocument(document);
-
- for (int i= 0; i < NUMBER_COMPOUNDS; i++) {
- fUndoManager.beginCompoundChange();
- doChange(document, RANDOM_REPLACE_COUNT);
- fUndoManager.endCompoundChange();
- assertTrue(fUndoManager.undoable());
- for (int j= 0; j < NUMBER_ATOMIC_PER_COMPOUND; j++) {
- doChange(document, RANDOM_REPLACE_COUNT);
- assertTrue(fUndoManager.undoable());
- }
- }
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
- assertTrue(!fUndoManager.undoable());
-
- final String reverted= document.get();
-
- assertEquals(original, reverted);
- }
-
- public void testRepeatableAccess() {
- assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
- final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
- fTextViewer.setDocument(document);
-
- doRepeatableChange(document);
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
-
- final String reverted= document.get();
-
- assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
- }
-
- public void testRepeatableAccessAsCompound() {
- assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
- final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
- fTextViewer.setDocument(document);
-
- fUndoManager.beginCompoundChange();
- doRepeatableChange(document);
- fUndoManager.endCompoundChange();
-
- assertTrue(fUndoManager.undoable());
- fUndoManager.undo();
- // with a single compound, there should be only one undo
- assertFalse(fUndoManager.undoable());
-
- final String reverted= document.get();
-
- assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
- }
-
- public void testRepeatableAccessAsUnclosedCompound() {
- assertTrue(REPLACEMENTS.length <= MAX_UNDO_LEVEL);
-
- final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
- fTextViewer.setDocument(document);
-
- fUndoManager.beginCompoundChange();
- doRepeatableChange(document);
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
-
- final String reverted= document.get();
-
- assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
- }
-
- public void testRepeatableAccessWithMixedAndEmptyCompound() {
- assertTrue(REPLACEMENTS.length + 2 <= MAX_UNDO_LEVEL);
-
- final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
- fTextViewer.setDocument(document);
-
- fUndoManager.beginCompoundChange();
- doRepeatableChange(document);
- fUndoManager.endCompoundChange();
- assertTrue(fUndoManager.undoable());
-
- // insert an empty compound
- fUndoManager.beginCompoundChange();
- fUndoManager.endCompoundChange();
-
- // insert the atomic changes
- doRepeatableChange(document);
-
- assertTrue(fUndoManager.undoable());
- while (fUndoManager.undoable())
- fUndoManager.undo();
- assertTrue(!fUndoManager.undoable());
-
- final String reverted= document.get();
-
- assertEquals(INITIAL_DOCUMENT_CONTENT, reverted);
- }
-
- public void testDocumentStamp() {
- final IDocument document= createDocument(INITIAL_DOCUMENT_CONTENT);
- fTextViewer.setDocument(document);
- long stamp= ((IDocumentExtension4)document).getModificationStamp();
- doChange(document, 1);
- fUndoManager.undo();
- assertEquals(stamp, ((IDocumentExtension4)document).getModificationStamp());
-
- }
-
- // see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=109104
- public void testDocumentStamp2() throws BadLocationException {
- final IDocument document= createDocument("");
- final int stringLength= 13;
- fTextViewer.setDocument(document);
- document.replace(0, 0, createRandomString(stringLength));
- long stamp= ((IDocumentExtension4)document).getModificationStamp();
- fUndoManager.undo();
- document.replace(0, 0, createRandomString(stringLength));
- assertFalse(stamp == ((IDocumentExtension4)document).getModificationStamp());
-
- }
-
- private static String createRandomString(int length) {
- final StringBuffer buffer= new StringBuffer();
-
- for (int i= 0; i < length; i++)
- buffer.append(getRandomCharacter());
-
- return buffer.toString();
- }
-
- private static final char getRandomCharacter() {
- // XXX should include \t
- return (char) (32 + 95 * Math.random());
- }
-
- private static String createRandomStringPoisson() {
- final int length= getRandomPoissonValue(2);
- return createRandomString(length);
- }
-
- private IDocument createDocument(String contents) {
- IModelHandler handler = ModelHandlerRegistry.getInstance().getHandlerForContentTypeId("org.eclipse.core.runtime.xml");
- BasicStructuredDocument document = (BasicStructuredDocument) handler.getDocumentLoader().createNewStructuredDocument();
- document.set(contents);
-// return new Document(contents);
- return document;
- }
-
- private static Position createRandomPositionPoisson(int documentLength) {
-
- float random= (float) Math.random();
- int offset= (int) (random * (documentLength + 1));
-
- // Catch potential rounding issue
- if (offset == documentLength + 1)
- offset= documentLength;
-
- int length= getRandomPoissonValue(2);
- if (offset + length > documentLength)
- length= documentLength - offset;
-
- return new Position(offset, length);
- }
-
- private static int getRandomPoissonValue(int mean) {
- final int MAX_VALUE= 10;
-
- final float random= (float) Math.random();
- float probability= 0;
- int i= 0;
- while (probability < 1 && i < MAX_VALUE) {
- probability += getPoissonDistribution(mean, i);
- if (random <= probability)
- break;
- i++;
- }
- return i;
- }
-
- private static float getPoissonDistribution(float lambda, int k) {
- return (float) (Math.exp(-lambda) * Math.pow(lambda, k) / faculty(k));
- }
-
- /**
- * Returns the faculty of k.
- *
- * @param k the <code>int</code> for which to get the faculty
- * @return the faculty
- */
- private static final int faculty(int k) {
- return k == 0
- ? 1
- : k * faculty(k - 1);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java
deleted file mode 100644
index deafc45d6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian Plesner Hansen (plesner@quenta.org) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
- * Tests for the default pair matcher.
- *
- * @since 3.3
- */
-public class DefaultPairMatcherTest extends AbstractPairMatcherTest {
-
- public static Test suite() {
- return new TestSuite(DefaultPairMatcherTest.class);
- }
-
- protected ICharacterPairMatcher createMatcher(String chars) {
- return new DefaultCharacterPairMatcher(chars.toCharArray(),
- getDocumentPartitioning());
- }
-
- /*
- * @see org.eclipse.jface.text.tests.AbstractPairMatcherTest#getDocumentPartitioning()
- * @since 3.3
- */
- protected String getDocumentPartitioning() {
- return IDocumentExtension3.DEFAULT_PARTITIONING;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java
deleted file mode 100644
index ada6b8c39..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.DefaultUndoManager;
-import org.eclipse.jface.text.IUndoManager;
-
-/**
- * Tests for DefaultUndoManager.
- *
- * @since 3.2
- */
-public class DefaultUndoManagerTest extends AbstractUndoManagerTest {
-
- public static Test suite() {
- return new TestSuite(DefaultUndoManagerTest.class);
- }
-
- /*
- * @see TestCase#TestCase(String)
- */
- public DefaultUndoManagerTest(final String name) {
- super(name);
- }
-
- /*
- * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int)
- * @since 3.2
- */
- protected IUndoManager createUndoManager(int maxUndoLevel) {
- return new DefaultUndoManager(maxUndoLevel);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java
deleted file mode 100644
index 4fa4c4a55..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.internal.text.html.HTML2TextReader;
-
-
-public class HTML2TextReaderTester extends TestCase {
-
- private static final boolean DEBUG= false;
-
- private static final String LD= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
- public HTML2TextReaderTester(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HTML2TextReaderTester.class);
- }
-
- private void verify(String input, String expectedOutput) throws IOException{
- Reader reader= new StringReader(input);
- HTML2TextReader htmlReader= new HTML2TextReader(reader, null);
- String result= htmlReader.getString();
- if (DEBUG)
- System.out.println("<"+ result +"/>");
- assertEquals(expectedOutput, result);
- }
-
- public void test0() throws IOException{
- String string= "<code>3<5<code>";
- String expected= "3<5";
- verify(string, expected);
- }
-
- public void test1() throws IOException{
- String string= "<dl><dt>@author</dt><dd>Foo Bar</dd></dl>";
- String expected= LD+ "@author"+LD+"\tFoo Bar"+LD;
- verify(string, expected);
- }
-
- public void test2() throws IOException{
- String string= "<code>3>5<code>";
- String expected= "3>5";
- verify(string, expected);
- }
-
- public void test3() throws IOException{
- String string= "<a href= \"<p>this is only a string - not a tag<p>\">text</a>";
- String expected= "text";
- verify(string, expected);
- }
-
- public void test4() throws IOException{
- String string= "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1><h5>void p.Bb.fes()</h5><p><dl><dt>Parameters:</dt><dd><b>i</b> fred or <code>null</code></dd></dl></font></body></html>";
- String expected= "void p.Bb.fes()"+ LD + LD + LD+ "Parameters:"+ LD + "\ti fred or null"+LD;
- verify(string, expected);
- }
-
- public void test5() throws IOException{
- String string= "<code>1<2<3<4</code>";
- String expected= "1<2<3<4";
- verify(string, expected);
- }
-
- public void test6() throws IOException{
- //test for bug 19070
- String string= "<p>Something.<p>Something more.";
- String expected= LD + "Something." + LD + "Something more.";
- verify(string, expected);
- }
-
- public void testComments() throws Exception {
- String string= "<!-- begin-user-doc -->no comment<!-- end-user-doc -->";
- String expected= "no comment";
- verify(string,expected);
- }
-
-}
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
deleted file mode 100644
index ddc984dfc..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test Suite for org.eclipse.jface.text.
- *
- * @since 3.0
- */
-public class JFaceTextTestSuite extends TestSuite {
-
- public static Test suite() {
- TestSuite suite= new TestSuite("org.eclipse.jface.text Test Suite using JSP BasicStructuredDocument"); //$NON-NLS-1$
-// suite.addTest(HTML2TextReaderTester.suite());
-// suite.addTest(TextHoverPopupTest.suite());
-// suite.addTest(TextPresentationTest.suite());
- suite.addTest(DefaultUndoManagerTest.suite());
- suite.addTest(TextViewerUndoManagerTest.suite());
-// suite.addTest(RulesTestSuite.suite());
-// suite.addTest(ReconcilerTestSuite.suite());
-// suite.addTest(DefaultPairMatcherTest.suite());
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java
deleted file mode 100644
index 584d5bb0b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.TextEvent;
-
-
-public class TestTextEvent extends TextEvent {
-
- TestTextEvent(DocumentEvent event, String replacedText) {
- super(event.getOffset(), event.getLength(), event.getText(), replacedText, event, true);
- }
-
- TestTextEvent(String text) {
- super(0, 0, text, (String) null, (DocumentEvent) null, true);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java
deleted file mode 100644
index 41859b308..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.IEventConsumer;
-import org.eclipse.jface.text.IFindReplaceTarget;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.IViewportListener;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-
-
-
-public class TestTextViewer implements ISourceViewer, IDocumentListener {
-
-
- protected IDocument fDocument;
- protected List fInputListeners= new ArrayList();
- protected List fTextListeners= new ArrayList();
- protected TextPresentation fTextPresentation;
- protected Point fSelection= new Point(-1, -1);
- protected String fDeletion;
-
- /**
- * @see ITextViewer#setDocument(IDocument, int, int)
- */
- public void setDocument(IDocument document, int p1, int p2) {
- setDocument(document);
- }
-
- /**
- * @see ITextViewer#getDocument()
- */
- public IDocument getDocument() {
- return fDocument;
- }
-
- /**
- * @see ITextViewer#setDocument(IDocument)
- */
- public void setDocument(IDocument document) {
- IDocument oldDoc= fDocument;
- fireTextInputChanged(oldDoc, document, true);
-
- if (oldDoc != null)
- oldDoc.removeDocumentListener(this);
-
- fDocument= document;
-
- if (fDocument != null) {
- fireTextChanged(new TestTextEvent(fDocument.get()));
- fDocument.addDocumentListener(this);
- }
-
- fireTextInputChanged(oldDoc, document, false);
- }
-
- /**
- * @see ITextViewer#removeTextInputListener(ITextInputListener)
- */
- public void removeTextInputListener(ITextInputListener listener) {
- fInputListeners.remove(listener);
- }
-
- /**
- * @see ITextViewer#addTextInputListener(ITextInputListener)
- */
- public void addTextInputListener(ITextInputListener listener) {
- if (!fInputListeners.contains(listener))
- fInputListeners.add(listener);
- }
-
- protected void fireTextInputChanged(IDocument oldDoc, IDocument newDoc, boolean about) {
- Iterator e= new ArrayList(fInputListeners).iterator();
- while (e.hasNext()) {
- ITextInputListener l= (ITextInputListener) e.next();
- if (about)
- l.inputDocumentAboutToBeChanged(oldDoc, newDoc);
- else
- l.inputDocumentChanged(oldDoc, newDoc);
- }
- }
-
- /**
- * @see ITextViewer#changeTextPresentation(TextPresentation, boolean)
- */
- public void changeTextPresentation(TextPresentation presentation, boolean p1) {
- fTextPresentation= presentation;
- }
-
- /**
- * @see ITextViewer#invalidateTextPresentation()
- */
- public void invalidateTextPresentation() {
- }
-
- public TextPresentation getTextPresentation() {
- return fTextPresentation;
- }
-
- public void documentAboutToBeChanged(DocumentEvent event) {
- try {
- fDeletion= fDocument.get(event.getOffset(), event.getLength());
- } catch (BadLocationException x) {
- }
- }
-
- public void documentChanged(DocumentEvent event) {
- fireTextChanged(new TestTextEvent(event, fDeletion));
- }
-
- /**
- * @see ITextViewer#getFindReplaceTarget()
- */
- public IFindReplaceTarget getFindReplaceTarget() {
- return null;
- }
-
- /**
- * @see ITextViewer#getTextOperationTarget()
- */
- public ITextOperationTarget getTextOperationTarget() {
- return null;
- }
-
- /**
- * @see ITextViewer#setTextColor(Color, int, int, boolean)
- */
- public void setTextColor(Color p0, int p1, int p2, boolean p3) {
- }
-
- /**
- * @see ITextViewer#setTextColor(Color)
- */
- public void setTextColor(Color p0) {
- }
-
- /**
- * @see ITextViewer#overlapsWithVisibleRegion(int, int)
- */
- public boolean overlapsWithVisibleRegion(int p0, int p1) {
- return false;
- }
-
- /**
- * @see ITextViewer#getVisibleRegion()
- */
- public IRegion getVisibleRegion() {
- return null;
- }
-
- /**
- * @see ITextViewer#resetVisibleRegion()
- */
- public void resetVisibleRegion() {
- }
-
- /**
- * @see ITextViewer#setVisibleRegion(int, int)
- */
- public void setVisibleRegion(int p0, int p1) {
- }
-
- /**
- * @see ITextViewer#setIndentPrefixes(String[], String)
- */
- public void setIndentPrefixes(String[] p0, String p1) {
- }
-
- /**
- * @see ITextViewer#setDefaultPrefixes(String[], String)
- */
- public void setDefaultPrefixes(String[] p0, String p1) {
- }
-
- /**
- * @see ITextViewer#setAutoIndentStrategy(IAutoIndentStrategy, String)
- */
- public void setAutoIndentStrategy(IAutoIndentStrategy p0, String p1) {
- }
-
- /**
- * @see ITextViewer#setTextDoubleClickStrategy(ITextDoubleClickStrategy, String)
- */
- public void setTextDoubleClickStrategy(ITextDoubleClickStrategy p0, String p1) {
- }
-
- /**
- * @see ITextViewer#setUndoManager(IUndoManager)
- */
- public void setUndoManager(IUndoManager p0) {
- }
-
- /**
- * @see ITextViewer#getTextWidget()
- */
- public StyledText getTextWidget() {
- return null;
- }
-
- public void setTextHover(ITextHover p0, String p1) {
- }
-
- /**
- * @see ITextViewer#activatePlugins()
- */
- public void activatePlugins() {
- }
-
- /**
- * @see ITextViewer#resetPlugins()
- */
- public void resetPlugins() {
- }
-
- /**
- * @see ITextViewer#getTopInset()
- */
- public int getTopInset() {
- return 0;
- }
-
- /**
- * @see ITextViewer#getBottomIndexEndOffset()
- */
- public int getBottomIndexEndOffset() {
- return 0;
- }
-
- /**
- * @see ITextViewer#getBottomIndex()
- */
- public int getBottomIndex() {
- return 0;
- }
-
- /**
- * @see ITextViewer#getTopIndexStartOffset()
- */
- public int getTopIndexStartOffset() {
- return 0;
- }
-
- /**
- * @see ITextViewer#getTopIndex()
- */
- public int getTopIndex() {
- return 0;
- }
-
- /**
- * @see ITextViewer#setTopIndex(int)
- */
- public void setTopIndex(int p0) {
- }
-
- /**
- * @see ITextViewer#revealRange(int, int)
- */
- public void revealRange(int p0, int p1) {
- }
-
- /**
- * @see ITextViewer#getSelectedRange()
- */
- public Point getSelectedRange() {
- return fSelection;
- }
-
- /**
- * @see ITextViewer#setSelectedRange(int, int)
- */
- public void setSelectedRange(int offset, int length) {
- fSelection.x= offset;
- fSelection.y= length;
- }
-
- /**
- * @see ITextViewer#isEditable()
- */
- public boolean isEditable() {
- return true;
- }
-
- /**
- * @see ITextViewer#setEditable(boolean)
- */
- public void setEditable(boolean p0) {
- }
-
- /**
- * @see ITextViewer#setEventConsumer(IEventConsumer)
- */
- public void setEventConsumer(IEventConsumer p0) {
- }
-
- /**
- * @see ITextViewer#removeTextListener(ITextListener)
- */
- public void removeTextListener(ITextListener listener) {
- fTextListeners.remove(listener);
- }
-
- protected void fireTextChanged(TextEvent event) {
- Iterator e= new ArrayList(fTextListeners).iterator();
- while (e.hasNext()) {
- ITextListener l= (ITextListener) e.next();
- l.textChanged(event);
- }
- }
-
- /**
- * @see ITextViewer#addTextListener(ITextListener)
- */
- public void addTextListener(ITextListener listener) {
- if (!fTextListeners.contains(listener))
- fTextListeners.add(listener);
- }
-
- /**
- * @see ITextViewer#removeViewportListener(IViewportListener)
- */
- public void removeViewportListener(IViewportListener p0) {
- }
-
- /**
- * @see ITextViewer#addViewportListener(IViewportListener)
- */
- public void addViewportListener(IViewportListener p0) {
- }
-
- /**
- * @see ISourceViewer#getSelectionProvider()
- */
- public ISelectionProvider getSelectionProvider() {
- return null;
- }
-
- /**
- * @see ISourceViewer#showAnnotations(boolean)
- */
- public void showAnnotations(boolean p0) {
- }
-
- /**
- * @see ISourceViewer#removeRangeIndication()
- */
- public void removeRangeIndication() {
- }
-
- /**
- * @see ISourceViewer#getRangeIndication()
- */
- public IRegion getRangeIndication() {
- return null;
- }
-
- /**
- * @see ISourceViewer#setRangeIndication(int, int, boolean)
- */
- public void setRangeIndication(int p0, int p1, boolean p2) {
- }
-
- /**
- * @see ISourceViewer#setRangeIndicator(Annotation)
- */
- public void setRangeIndicator(Annotation p0) {
- }
-
- /**
- * @see ISourceViewer#getAnnotationModel()
- */
- public IAnnotationModel getAnnotationModel() {
- return null;
- }
-
- /**
- * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int)
- */
- public void setDocument(IDocument p0, IAnnotationModel p1, int p2, int p3) {
- }
-
- /**
- * @see ISourceViewer#setDocument(IDocument, IAnnotationModel)
- */
- public void setDocument(IDocument p0, IAnnotationModel p1) {
- }
-
- /**
- * @see ISourceViewer#setAnnotationHover(IAnnotationHover)
- */
- public void setAnnotationHover(IAnnotationHover p0) {
- }
-
- /**
- * @see ISourceViewer#configure(SourceViewerConfiguration)
- */
- public void configure(SourceViewerConfiguration p0) {
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java
deleted file mode 100644
index abfa697f6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class TextHoverPopupTest extends TestCase {
-
-
- public TextHoverPopupTest(String name) {
- super(name);
- }
-
- protected void setUp() {
- }
-
- public static Test suite() {
- return new TestSuite(TextHoverPopupTest.class);
- }
-
- protected void tearDown() {
- }
-
-
- protected int search(int[] array, int x) {
- int low= 0;
- int high= array.length -1;
-
- while (high > low) {
- int offset= (low + high) / 2;
- int lookup= array[offset];
- if (lookup > x)
- high= offset - 1;
- else if (lookup < x)
- low= offset + 1;
- else
- low= high= offset;
- }
-
- return high;
- }
-
- public void testSearch() {
- int[] values= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
- for (int i= 0; i < 10; i++) {
- int result= search(values, i);
- assertTrue(i == result);
- }
-
- int[] values2= { 0, 3, 6, 9, 12, 15, 18, 21, 24, 27 };
- for (int i= 0; i < 10; i++) {
- int result= search(values2, i * 3);
- assertTrue(i == result);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java
deleted file mode 100644
index 689e8dc81..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextPresentation;
-
-public class TextPresentationTest extends TestCase {
-
- private static final int NORMAL= SWT.NORMAL;
- private static final int BOLD= SWT.BOLD;
-// private static final int ITALIC= SWT.ITALIC;
-
- private TextPresentation fTextPresentation;
- private StyleRange[] fAllRanges;
- private StyleRange[] fNonDefaultRanges;
-
- public static Test suite() {
- return new TestSuite(TextPresentationTest.class);
- }
-
- protected void setUp() {
- setUpStyleRanges();
- setUpTextPresentation();
- }
-
- private void setUpStyleRanges() {
- fAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL)
- };
-
- fNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD)
- };
- }
-
- private void setUpTextPresentation() {
- fTextPresentation= new TextPresentation();
- fTextPresentation.setDefaultStyleRange(createStyleRange(0, 140, NORMAL));
- for (int i= 0; i < fAllRanges.length; i++)
- fTextPresentation.addStyleRange(fAllRanges[i]);
- }
-
- private StyleRange createStyleRange(int start, int end, int style) {
- return createStyleRange(start, end, null, null, style);
- }
-
- private StyleRange createStyleRange(int start, int end, Color foreground, Color background, int style) {
- return new StyleRange(start, end - start, foreground, background, style);
- }
-
- private StyleRange createStyleRange(int start, int end, int foreground, int background, int style) {
- return createStyleRange(start, end, createColor(foreground, foreground, foreground), createColor(background, background, background), style);
- }
-
- private Display fDisplay= Display.getDefault();
-
- /**
- * Creates a new color.
- *
- * @param red the amount of red in the color
- * @param green the amount of green in the color
- * @param blue the amount of blue in the color
- * @return <code>null</code> if any of the parameters is smaller than 0 or greater than 255
- */
- private Color createColor(int red, int green, int blue) {
- if (red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255)
- return null;
- return new Color(fDisplay, red, green, blue);
- }
-
- private void checkRegions(StyleRange[] expectedAllRanges, StyleRange[] expectedNonDefaultRanges) {
- Iterator e= fTextPresentation.getAllStyleRangeIterator();
- for (int i= 0; i < expectedAllRanges.length; i++) {
- assertTrue(e.hasNext());
- assertEquals(expectedAllRanges[i], e.next());
- }
- assertTrue(!e.hasNext());
-
- e= fTextPresentation.getNonDefaultStyleRangeIterator();
- for (int i= 0; i < expectedNonDefaultRanges.length; i++) {
- assertTrue(e.hasNext());
- assertEquals(expectedNonDefaultRanges[i], e.next());
- }
- assertTrue(!e.hasNext());
- }
-
- public void testUnclippedRegions() {
- checkRegions(fAllRanges, fNonDefaultRanges);
- }
-
- public void testClippedRegions1() {
- fTextPresentation.setResultWindow(new Region(0, 140));
- checkRegions(fAllRanges, fNonDefaultRanges);
- }
-
- public void testClippedRegions2() {
-
- fTextPresentation.setResultWindow(new Region(30, 70));
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 17, NORMAL),
- createStyleRange( 17, 24, BOLD),
- createStyleRange( 24, 66, NORMAL),
- createStyleRange( 66, 70, BOLD)
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 17, 24, BOLD),
- createStyleRange( 66, 70, BOLD)
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at start of first existing range.
- */
- public void testMergeStyleRange1() {
- StyleRange range= createStyleRange(0, 2, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange(0, 2, 1, -1, NORMAL),
- createStyleRange( 2, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange(0, 2, 1, -1, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at end of last existing range.
- */
- public void testMergeStyleRange2() {
- StyleRange range= createStyleRange(138, 140, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 138, NORMAL),
- createStyleRange(138, 140, 1, -1, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(138, 140, 1, -1, NORMAL),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at start of existing default range.
- */
- public void testMergeStyleRange3() {
- StyleRange range= createStyleRange(20, 22, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 22, 1, -1, NORMAL),
- createStyleRange( 22, 47, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 22, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range within existing default range.
- */
- public void testMergeStyleRange4() {
- StyleRange range= createStyleRange(22, 24, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 22, NORMAL),
- createStyleRange(22, 24, 1, -1, NORMAL),
- createStyleRange( 24, 47, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(22, 24, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at end of existing default range.
- */
- public void testMergeStyleRange5() {
- StyleRange range= createStyleRange(45, 47, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 45, NORMAL),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at start of existing non-default range.
- */
- public void testMergeStyleRange6() {
- StyleRange range= createStyleRange(47, 49, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range within existing non-default range.
- */
- public void testMergeStyleRange7() {
- StyleRange range= createStyleRange(49, 51, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 49, BOLD),
- createStyleRange(49, 51, 1, -1, BOLD),
- createStyleRange( 51, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 49, BOLD),
- createStyleRange(49, 51, 1, -1, BOLD),
- createStyleRange( 51, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range at end of existing non-default range.
- */
- public void testMergeStyleRange8() {
- StyleRange range= createStyleRange(52, 54, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range from existing default to non-default range.
- */
- public void testMergeStyleRange9() {
- StyleRange range= createStyleRange(45, 49, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 45, NORMAL),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range from existing non-default to default range.
- */
- public void testMergeStyleRange10() {
- StyleRange range= createStyleRange(52, 56, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange(54, 56, 1, -1, NORMAL),
- createStyleRange( 56, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange(54, 56, 1, -1, NORMAL),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range from existing default over non-default to default range.
- */
- public void testMergeStyleRange11() {
- StyleRange range= createStyleRange(45, 56, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 45, NORMAL),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 54, 1, -1, BOLD),
- createStyleRange(54, 56, 1, -1, NORMAL),
- createStyleRange( 56, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 54, 1, -1, BOLD),
- createStyleRange(54, 56, 1, -1, NORMAL),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range from existing non-default over default to non-default range.
- */
- public void testMergeStyleRange12() {
- StyleRange range= createStyleRange(52, 98, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange(54, 96, 1, -1, NORMAL),
- createStyleRange(96, 98, 1, -1, BOLD),
- createStyleRange( 98, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 47, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange(54, 96, 1, -1, NORMAL),
- createStyleRange(96, 98, 1, -1, BOLD),
- createStyleRange( 98, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range over existing default range.
- */
- public void testMergeStyleRange13() {
- StyleRange range= createStyleRange(20, 47, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 47, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 47, 1, -1, NORMAL),
- createStyleRange( 47, 54, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- /**
- * Merge range over existing non-default range.
- */
- public void testMergeStyleRange14() {
- StyleRange range= createStyleRange(47, 54, 1, -1, NORMAL);
- fTextPresentation.mergeStyleRange(range);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange( 0, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange( 20, 47, NORMAL),
- createStyleRange(47, 54, 1, -1, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 140, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange( 4, 20, BOLD),
- createStyleRange(47, 54, 1, -1, BOLD),
- createStyleRange( 96, 102, BOLD),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
- public void testMergeStyleRanges1() {
- StyleRange[] ranges= new StyleRange[] {
- createStyleRange(0, 2, 1, -1, NORMAL), // at start of first existing
- createStyleRange(20, 22, 1, -1, NORMAL), // at start of existing default
- createStyleRange(24, 26, 1, -1, NORMAL), // within existing default
- createStyleRange(45, 47, 1, -1, NORMAL), // at end of existing default
- createStyleRange(47, 49, 1, -1, NORMAL), // at start of existing non-default
- createStyleRange(50, 51, 1, -1, NORMAL), // within existing non-default
- createStyleRange(52, 54, 1, -1, NORMAL), // at end of existing non-default
- createStyleRange(138, 140, 1, -1, NORMAL), // at end of last existing
- };
- fTextPresentation.mergeStyleRanges(ranges);
-
- StyleRange[] expectedAllRanges= new StyleRange[] {
- createStyleRange(0, 2, 1, -1, NORMAL),
- createStyleRange( 2, 4, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 22, 1, -1, NORMAL),
- createStyleRange( 22, 24, NORMAL),
- createStyleRange(24, 26, 1, -1, NORMAL),
- createStyleRange( 26, 45, NORMAL),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 50, BOLD),
- createStyleRange(50, 51, 1, -1, BOLD),
- createStyleRange( 51, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange( 54, 96, NORMAL),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(102, 138, NORMAL),
- createStyleRange(138, 140, 1, -1, NORMAL),
- };
-
- StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
- createStyleRange(0, 2, 1, -1, NORMAL),
- createStyleRange( 4, 20, BOLD),
- createStyleRange(20, 22, 1, -1, NORMAL),
- createStyleRange(24, 26, 1, -1, NORMAL),
- createStyleRange(45, 47, 1, -1, NORMAL),
- createStyleRange(47, 49, 1, -1, BOLD),
- createStyleRange( 49, 50, BOLD),
- createStyleRange(50, 51, 1, -1, BOLD),
- createStyleRange( 51, 52, BOLD),
- createStyleRange(52, 54, 1, -1, BOLD),
- createStyleRange( 96, 102, BOLD),
- createStyleRange(138, 140, 1, -1, NORMAL),
- };
-
- checkRegions(expectedAllRanges, expectedNonDefaultRanges);
- }
-
-// Template
-//
-// public void testMergeStyleRange0() {
-//// StyleRange range= createStyleRange(0, 2, 1, -1, NORMAL);
-//// fTextPresentation.mergeStyleRange(range);
-//
-//// StyleRange[] ranges= new StyleRange[] {
-//// createStyleRange(0, 2, 1, -1, NORMAL),
-//// };
-//// fTextPresentation.mergeStyleRanges(ranges);
-//
-// StyleRange[] expectedAllRanges= new StyleRange[] {
-// createStyleRange( 0, 4, NORMAL),
-// createStyleRange( 4, 20, BOLD),
-// createStyleRange( 20, 47, NORMAL),
-// createStyleRange( 47, 54, BOLD),
-// createStyleRange( 54, 96, NORMAL),
-// createStyleRange( 96, 102, BOLD),
-// createStyleRange(102, 140, NORMAL),
-// };
-//
-// StyleRange[] expectedNonDefaultRanges= new StyleRange[] {
-// createStyleRange( 4, 20, BOLD),
-// createStyleRange( 47, 54, BOLD),
-// createStyleRange( 96, 102, BOLD),
-// };
-//
-// checkRegions(expectedAllRanges, expectedNonDefaultRanges);
-// }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java
deleted file mode 100644
index effd2878d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.text.undo.DocumentUndoEvent;
-import org.eclipse.text.undo.DocumentUndoManager;
-import org.eclipse.text.undo.IDocumentUndoListener;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.TextViewerUndoManager;
-
-/**
- * Tests for TextViewerUndoManager.
- *
- * @since 3.2
- */
-public class TextViewerUndoManagerTest extends AbstractUndoManagerTest {
-
- public static Test suite() {
- return new TestSuite(TextViewerUndoManagerTest.class);
- }
-
- /*
- * @see TestCase#TestCase(String)
- */
- public TextViewerUndoManagerTest(final String name) {
- super(name);
- }
-
- /*
- * @see org.eclipse.jface.text.tests.AbstractUndoManagerTest#createUndoManager(int)
- * @since 3.2
- */
- protected IUndoManager createUndoManager(int maxUndoLevel) {
- return new TextViewerUndoManager(maxUndoLevel);
- }
-
- //--- DocumentUndoManager only ---
-
- public void internalTestTransferNonTextOp(final boolean isUndoable) throws Exception {
- Object context= new Object();
- DocumentUndoManager tempUndoManager= new DocumentUndoManager(new Document());
- tempUndoManager.connect(context);
-
- IUndoableOperation operation= new AbstractOperation("") {
- public boolean canUndo() {
- return isUndoable;
- }
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
- };
- operation.addContext(tempUndoManager.getUndoContext());
- OperationHistoryFactory.getOperationHistory().add(operation);
-
- assertEquals(isUndoable, tempUndoManager.undoable());
-
- final DocumentUndoManager undoManager= new DocumentUndoManager(new Document());
- Object newContext= new Object();
- undoManager.connect(newContext);
-
- undoManager.addDocumentUndoListener(new IDocumentUndoListener() {
- public void documentUndoNotification(DocumentUndoEvent event) {
- fail();
- }
- });
-
- undoManager.transferUndoHistory(tempUndoManager);
- tempUndoManager.disconnect(context);
-
- assertEquals(isUndoable, undoManager.undoable());
- undoManager.undo();
- assertEquals(false, undoManager.undoable());
-
- undoManager.disconnect(newContext);
- }
-
- public void testTransferNonUndoableNonTextOp() throws Exception {
- internalTestTransferNonTextOp(false);
- }
-
- public void testTransferUndoableNonTextOp() throws Exception {
- internalTestTransferNonTextOp(true);
- }
-
- public void testCanUndo() throws Exception {
- IDocument doc= new Document();
- final DocumentUndoManager undoManager= new DocumentUndoManager(doc);
- Object context= new Object();
- undoManager.connect(context);
-
- undoManager.addDocumentUndoListener(new IDocumentUndoListener() {
-
- public void documentUndoNotification(DocumentUndoEvent event) {
- if (event.getEventType() == DocumentUndoEvent.ABOUT_TO_UNDO)
- assertEquals(true, undoManager.undoable());
- else if (event.getEventType() == DocumentUndoEvent.UNDONE)
- assertEquals(false, undoManager.undoable());
- }
- });
-
- doc.set("foo");
-
- assertEquals(true, undoManager.undoable());
- undoManager.undo();
- assertEquals(false, undoManager.undoable());
-
- undoManager.disconnect(context);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
deleted file mode 100644
index a20fbaff5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.reconciler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.text.tests.Accessor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.reconciler.AbstractReconciler;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.tests.TestTextViewer;
-
-
-/**
- * Reconciler tests. Uses barrier synchronization and a call log to assert
- * correct order of reconciling events.
- *
- * TODO test reconciler arguments (delay > 0 etc.)
- * TODO incremental reconciler tests
- *
- * @since 3.1
- */
-public class AbstractReconcilerTest extends TestCase {
-
- /**
- * Modified barrier: there are two threads: the main (testing) thread
- * creating the barrier, and the reconciler thread. When both threads have
- * met at the barrier, the main thread is released and can perform
- * assertions while being sure that the reconciler is dormant. After the
- * tests have been performed, the main thread must call <code>wakeAll</code>
- * to release the reconciler thread.
- */
- static class Barrier {
- private final Object fMutex= new Object();
- private final int fParticipants;
- private final Thread fMainThread;
-
- private int fWaiting= 0;
- private boolean fMainThreadArrived= false;
- private boolean fIsInactive= false;
-
- Barrier() {
- fParticipants= 2;
- fMainThread= Thread.currentThread();
- }
-
- public void await() {
- synchronized (fMutex) {
- if (fIsInactive)
- return;
-
- fWaiting++;
-
- boolean isMainThread= Thread.currentThread() == fMainThread;
- if (isMainThread)
- fMainThreadArrived= true;
-
- if (allArrived()) {
- if (!fMainThreadArrived) {
- fWaiting--;
- throw new RuntimeException(getClass() + " can't join barrier if only the main thread is missing!");
- }
-
- if (!isMainThread)
- notifyMainThread();
- }
- if (!allArrived() || !isMainThread) {
- try {
- if (!isMainThread)
- fMutex.wait();
- else {
- fMutex.wait(5000); // don't wait forever for bad reconcilers
- if (!allArrived())
- fail("reconciler never ran in 5 seconds");
- }
- } catch (InterruptedException e) {
- // threads must not be interrupted
- throw new Error();
- }
- }
- }
- }
-
- private boolean allArrived() {
- return fWaiting == fParticipants;
- }
-
- private void notifyMainThread() {
- fMutex.notify();
- }
-
- public void wakeAll() {
- synchronized (fMutex) {
- fWaiting= 0;
- fMainThreadArrived= false;
- fMutex.notifyAll();
- }
- }
-
- public void shutdown() {
- synchronized (fMutex) {
- fIsInactive= true;
- fMutex.notifyAll();
- }
- }
- }
-
- private Accessor fAccessor;
- private Barrier fBarrier;
- private List fCallLog;
- private ITextViewer fViewer;
- protected AbstractReconciler fReconciler;
- private Document fDocument;
-
- protected void setUp() {
- fBarrier= new Barrier();
- fCallLog= Collections.synchronizedList(new ArrayList());
- fReconciler= new AbstractReconciler() {
- protected void initialProcess() {
- fCallLog.add("initialProcess");
- fBarrier.await();
- }
- protected void process(DirtyRegion dirtyRegion) {
- fCallLog.add("process");
- fBarrier.await();
- }
- protected void reconcilerDocumentChanged(IDocument newDocument) {
- fCallLog.add("reconcilerDocumentChanged");
- }
- protected void aboutToBeReconciled() {
- fCallLog.add("aboutToBeReconciled");
- }
- protected void reconcilerReset() {
- fCallLog.add("reconcilerReset");
- }
- public IReconcilingStrategy getReconcilingStrategy(String contentType) {
- return null;
- }
- };
- fReconciler.setIsIncrementalReconciler(false);
- fReconciler.setDelay(50); // make tests run faster
-
- fViewer= new TestTextViewer();
- fReconciler.install(fViewer);
-
- fAccessor= new Accessor(fReconciler, AbstractReconciler.class);
- Object object= fAccessor.get("fThread");
- fAccessor= new Accessor(object, object.getClass());
- }
-
-
- protected void tearDown() throws Exception {
- fBarrier.shutdown();
- fReconciler.uninstall();
- }
-
- public void testInitialReconcile() throws InterruptedException {
- // initially the reconciler is neither active nor dirty
- // XXX shouldn't it be dirty?
- assertFalse(isActive());
- assertFalse(isDirty());
-
- // set up initial document
- fDocument= new Document("foo");
- fViewer.setDocument(fDocument);
- assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
- assertEquals("aboutToBeReconciled", fCallLog.remove(0));
-
- fBarrier.await();
- assertEquals("initialProcess", fCallLog.remove(0));
- // XXX shouldn't it be dirty and active during initialProcess?
- assertFalse(isActive());
- assertFalse(isDirty());
- fBarrier.wakeAll();
-
- // wait until clean
- pollUntilClean();
- assertFalse(isActive());
- assertFalse(isDirty());
- }
-
- public void testDirtyingWhenClean() throws BadLocationException, InterruptedException {
- installDocument();
-
- dirty();
- assertEquals("aboutToBeReconciled", fCallLog.remove(0));
- assertEquals("reconcilerReset", fCallLog.remove(0));
-
- fBarrier.await();
- assertEquals("process", fCallLog.remove(0));
- assertTrue(isActive());
- assertTrue(isDirty());
- fBarrier.wakeAll();
-
- // wait until clean
- pollUntilClean();
- assertFalse(isActive());
- assertFalse(isDirty());
- }
-
-
- private void dirty() throws BadLocationException {
- fDocument.replace(0,0,"bar");
- }
-
-
- public void testDirtyingWhenRunning() throws InterruptedException, BadLocationException {
- installDocument();
-
- dirty();
- fBarrier.await();
- assertTrue(isActive());
- assertTrue(isDirty());
- fCallLog.clear();
- dirty();
- // no aboutToBeReconciled since the reconciler is still running
- // when the second edition comes in
- assertEquals("reconcilerReset", fCallLog.remove(0));
- fBarrier.wakeAll();
-
- fBarrier.await();
- assertEquals("process", fCallLog.remove(0));
- fBarrier.wakeAll();
- pollUntilClean();
- assertFalse(isActive());
- assertFalse(isDirty());
- }
-
- public void testCancellingWhenClean() throws InterruptedException, BadLocationException {
- installDocument();
-
- // dirty again
- dirty();
- fBarrier.await();
- fBarrier.wakeAll();
-
- // cancel
- fCallLog.clear();
- fReconciler.uninstall();
- pollUntilInactive();
- assertTrue(fCallLog.isEmpty());
- assertFalse(isActive());
- // XXX fails since AbstractReconciler does not update state before leaving
-// assertFalse(isDirty()); // fails
- }
-
- public void testCancellingWhenRunning() throws InterruptedException, BadLocationException {
- installDocument();
-
- // dirty and cancel
- dirty();
- fBarrier.await();
- fCallLog.clear();
- fReconciler.uninstall();
- fBarrier.wakeAll();
- pollUntilInactive();
- assertTrue(fCallLog.isEmpty());
- assertFalse(isActive());
- // XXX fails since AbstractReconciler does not update state before leaving
-// assertFalse(isDirty());
- }
-
- public void testReplacingDocumentWhenClean() throws InterruptedException {
- installDocument();
-
- // replace
- fCallLog.clear();
- fViewer.setDocument(new Document("bar"));
- assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
- assertEquals("aboutToBeReconciled", fCallLog.remove(0));
- assertEquals("reconcilerReset", fCallLog.remove(0));
- fBarrier.await();
- assertEquals("process", fCallLog.remove(0));
- fBarrier.wakeAll();
-
- pollUntilClean();
- assertFalse(isActive());
- assertFalse(isDirty());
- }
-
- public void testReplacingDocumentWhenRunning() throws InterruptedException, BadLocationException {
- installDocument();
-
- // dirty and replace
- dirty();
- fBarrier.await();
- fCallLog.clear();
- fViewer.setDocument(new Document("bar"));
- assertEquals("reconcilerDocumentChanged", fCallLog.remove(0));
- assertEquals("reconcilerReset", fCallLog.remove(0));
- assertTrue(fCallLog.isEmpty());
- fBarrier.wakeAll();
-
- // XXX this fails, which is a bug - replacing the document should
- // cancel the progress monitor
-// fBarrier.await();
-// assertEquals("process", fCallLog.remove(0));
-// fBarrier.wakeAll();
- }
-
- void installDocument() throws InterruptedException {
- fDocument= new Document("foo");
- fViewer.setDocument(fDocument);
-
- // initial process
- fBarrier.await();
- fBarrier.wakeAll();
-
- pollUntilClean();
- fCallLog.clear();
- }
-
- void pollUntilClean() throws InterruptedException {
- // wait for reconciler to become clean
- long start= System.currentTimeMillis();
- while (isDirty()) {
- long current= System.currentTimeMillis();
- if (current > start + 5000)
- fail("waited > 5s for reconciler to complete");
- synchronized (this) {
- wait(50);
- }
- }
- }
-
- void pollUntilInactive() throws InterruptedException {
- // wait for reconciler to become clean
- long start= System.currentTimeMillis();
- while (isActive()) {
- long current= System.currentTimeMillis();
- if (current > start + 5000)
- fail("waited > 5s for reconciler to complete");
- synchronized (this) {
- wait(50);
- }
- }
- }
-
- boolean isActive() {
- Object bool= fAccessor.invoke("isActive", null);
- return ((Boolean) bool).booleanValue();
- }
-
- boolean isDirty() {
- Object bool= fAccessor.invoke("isDirty", null);
- return ((Boolean) bool).booleanValue();
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java
deleted file mode 100644
index 32dfe189e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.tests.reconciler;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- * @since 3.0
- */
-public class ReconcilerTestSuite {
-
- public static Test suite() {
- TestSuite suite= new TestSuite("Test Suite org.eclipse.jface.text.tests.reconciler");
- //$JUnit-BEGIN$
- suite.addTestSuite(AbstractReconcilerTest.class);
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java
deleted file mode 100644
index 4dc114b07..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-
-public class DefaultPartitionerTest extends FastPartitionerTest {
- protected IDocumentPartitioner createPartitioner(IPartitionTokenScanner scanner) {
- return new DefaultPartitioner(scanner, new String[] { DEFAULT, COMMENT });
- }
-
- /*
- * @see org.eclipse.jface.text.tests.rules.FastPartitionerTest#testPR130900()
- */
- public void testPR130900() throws Exception {
- System.out.println("Bug130900 not fixed in DefaultPartitioner");
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java
deleted file mode 100644
index 9e1792aa2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.Token;
-
-
-/**
- * @since 3.0
- */
-public class DefaultPartitionerZeroLengthTest extends TestCase {
-
- private static final String COMMENT= "comment";
- private static final String DEFAULT= IDocument.DEFAULT_CONTENT_TYPE;
-
- private IDocument fDoc;
- private FastPartitioner fPartitioner;
-
- public void setUp() {
- fDoc= new Document();
- IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
- {
- IToken comment= new Token(COMMENT);
- IPredicateRule[] rules= new IPredicateRule[] { new MultiLineRule("/*", "*/", comment) };
- setPredicateRules(rules);
-
- }
- };
- fPartitioner= new FastPartitioner(scanner, new String[] { DEFAULT, COMMENT });
- fDoc.setDocumentPartitioner(fPartitioner);
- fPartitioner.connect(fDoc);
- }
-
- public void testGetZeroLengthPartition() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetZeroLengthPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthPartitionEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertGetZeroLengthPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthPartitionEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertGetZeroLengthPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthPartitionEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetZeroLengthPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthContentType() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetZeroLengthContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthContentTypeEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertGetZeroLengthContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthContentTypeEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertGetZeroLengthContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetZeroLengthContentTypeEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetZeroLengthContentType_InterleavingPartitions(offsets);
- }
-
- public void testComputeZeroLengthPartitioning() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputeZeroLengthPartitioningEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputeZeroLengthPartitioningEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputeZeroLengthPartitioningEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioningSubrangeBeforeBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(12, 38, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeOnBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(13, 39, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeOnBoundaries2() {
- fDoc.set("/* comment *//* comment *//* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(13, 26, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeAfterBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 26, 26, 39 };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(14, 40, offsets, COMMENT);
- }
-
- public void testComputePartitioningSubrangeInBoundaries1() {
- fDoc.set("/* comment */");
-
- int[] offsets= new int[] { };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(1, 12, offsets, COMMENT);
- }
-
- public void testComputePartitioningSubrangeInBoundaries2() {
- fDoc.set("docu ment");
-
- int[] offsets= new int[] { };
- assertComputeZeroLengthPartitioning_InterleavingPartitions(1, 12, offsets, DEFAULT);
- }
-
- private void assertComputeZeroLengthPartitioning_InterleavingPartitions(int[] offsets) {
- assertComputeZeroLengthPartitioning_InterleavingPartitions(0, fDoc.getLength(), offsets, DEFAULT);
- }
-
- private void assertComputeZeroLengthPartitioning_InterleavingPartitions(int startOffset, int endOffset, int[] offsets, String startType) {
- ITypedRegion[] regions= fPartitioner.computePartitioning(startOffset, endOffset - startOffset, true);
-
- String type= startType;
- int previousOffset= startOffset;
-
- assertEquals(offsets.length + 1, regions.length);
- for (int i= 0; i <= offsets.length; i++) {
- int currentOffset= (i == offsets.length) ? endOffset : offsets[i];
- ITypedRegion region= regions[i];
-
- assertTypedRegion(region, previousOffset, currentOffset, type);
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= currentOffset;
- }
- }
-
- private void assertGetZeroLengthContentType_InterleavingPartitions(int[] offsets) {
- String type= DEFAULT;
- int previousOffset= 0;
- for (int i= 0; i <= offsets.length; i++) {
- int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
- assertEqualPartitionType(previousOffset, offset, type);
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= offset;
- }
- }
-
- private void assertGetZeroLengthPartition_InterleavingPartitions(int[] offsets) {
- String type= DEFAULT;
- int previousOffset= 0;
- for (int i= 0; i <= offsets.length; i++) {
- int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
- assertEqualPartition(previousOffset, offset, type);
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= offset;
- }
- }
-
- private boolean isOpenType(String type) {
- return type.equals(DEFAULT);
- }
-
- private void assertEqualPartition(int offset, int inclusiveEnd, String type) {
- int from= isOpenType(type) ? offset : offset + 1;
- int to= isOpenType(type) ? inclusiveEnd : inclusiveEnd - 1;
- for (int i= from; i <= to; i++) {
- ITypedRegion region= fPartitioner.getPartition(i, true);
- assertTypedRegion(region, offset, inclusiveEnd, type);
- }
- }
-
- private void assertTypedRegion(ITypedRegion region, int offset, int inclusiveEnd, String type) {
- assertEquals(offset, region.getOffset());
- assertEquals(inclusiveEnd - offset, region.getLength());
- assertEquals(type, region.getType());
- }
-
- private void assertEqualPartitionType(int offset, int inclusiveEnd, String type) {
- int from= isOpenType(type) ? offset : offset + 1;
- int to= isOpenType(type) ? inclusiveEnd : inclusiveEnd - 1;
- for (int i= from; i <= to; i++) {
- assertEquals(type, fPartitioner.getContentType(i, true));
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java
deleted file mode 100644
index f67016165..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-
-
-/**
- * @since 3.0
- */
-public class FastPartitionerTest extends TestCase {
-
- protected static final String COMMENT= "comment";
- protected static final String DEFAULT= IDocument.DEFAULT_CONTENT_TYPE;
-
- private IDocument fDoc;
- private IDocumentPartitioner fPartitioner;
-
- public void setUp() {
- fDoc= new Document();
- IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
- {
- IToken comment= new Token(COMMENT);
- IPredicateRule[] rules= new IPredicateRule[] { new MultiLineRule("/*", "*/", comment) };
- setPredicateRules(rules);
-
- }
- };
- fPartitioner= createPartitioner(scanner);
- fDoc.setDocumentPartitioner(fPartitioner);
- fPartitioner.connect(fDoc);
- }
-
- protected IDocumentPartitioner createPartitioner(IPartitionTokenScanner scanner) {
- return new FastPartitioner(scanner, new String[] { DEFAULT, COMMENT });
- }
-
- public void testGetPartition() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetPartitionEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertGetPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetPartitionEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertGetPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetPartitionEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetPartition_InterleavingPartitions(offsets);
- }
-
- public void testGetContentType() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetContentTypeEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertGetContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetContentTypeEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertGetContentType_InterleavingPartitions(offsets);
- }
-
- public void testGetContentTypeEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertGetContentType_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioning() {
- fDoc.set("docu ment/* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputePartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioningEmptyMiddle() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertComputePartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioningEmptyStart() {
- fDoc.set("/* comment */docu ment");
-
- int[] offsets= new int[] { 0, 13 };
- assertComputePartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioningEmptyEnd() {
- fDoc.set("docu ment/* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputePartitioning_InterleavingPartitions(offsets);
- }
-
- public void testComputePartitioningSubrangeBeforeBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26 };
- assertComputePartitioning_InterleavingPartitions(12, 38, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeOnBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 13, 26, 26, 39 };
- assertComputePartitioning_InterleavingPartitions(13, 39, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeOnBoundaries2() {
- fDoc.set("/* comment *//* comment *//* comment */");
-
- int[] offsets= new int[] { 13, 26 };
- assertComputePartitioning_InterleavingPartitions(13, 26, offsets, DEFAULT);
- }
-
- public void testComputePartitioningSubrangeAfterBoundaries() {
- fDoc.set("docu ment/* comment *//* comment */docu ment");
-
- int[] offsets= new int[] { 26, 26, 39 };
- assertComputePartitioning_InterleavingPartitions(14, 40, offsets, COMMENT);
- }
-
- public void testComputePartitioningSubrangeInBoundaries1() {
- fDoc.set("/* comment */");
-
- int[] offsets= new int[] { };
- assertComputePartitioning_InterleavingPartitions(1, 12, offsets, COMMENT);
- }
-
- public void testComputePartitioningSubrangeInBoundaries2() {
- fDoc.set("docu ment");
-
- int[] offsets= new int[] { };
- assertComputePartitioning_InterleavingPartitions(1, 12, offsets, DEFAULT);
- }
-
- public void testPR101014() throws BadLocationException {
- fDoc.set(
- "package pr101014;\n" +
- "\n" +
- "class X {\n" +
- "String s= \n" +
- " /*foo*/;\n" +
- "}\n");
-
- int[] offsets= {41, 48};
- assertComputePartitioning_InterleavingPartitions(offsets);
-
- fDoc.replace(40, 8, " /*foo*/");
- assertComputePartitioning_InterleavingPartitions(offsets);
- }
-
- public void testPR130900() throws Exception {
- fPartitioner.disconnect();
- IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() {
- {
- IToken comment= new Token(COMMENT);
- IPredicateRule[] rules= new IPredicateRule[] { new SingleLineRule("#", null, comment, (char) 0, true, false) };
- setPredicateRules(rules);
- }
- };
- fPartitioner= createPartitioner(scanner);
- fDoc.setDocumentPartitioner(fPartitioner);
- fPartitioner.connect(fDoc);
-
- fDoc.set("#");
- int[] offsets= new int[] { 0, 1 };
- assertComputePartitioning_InterleavingPartitions(offsets);
-
- }
-
- private void assertComputePartitioning_InterleavingPartitions(int[] offsets) {
- assertComputePartitioning_InterleavingPartitions(0, fDoc.getLength(), offsets, DEFAULT);
- }
-
- private void assertComputePartitioning_InterleavingPartitions(int startOffset, int endOffset, int[] offsets, String startType) {
- ITypedRegion[] regions= fPartitioner.computePartitioning(startOffset, endOffset - startOffset);
-
- String type= startType;
- int previousOffset= startOffset;
-
- int j= 0;
- for (int i= 0; i <= offsets.length; i++) {
- int currentOffset= (i == offsets.length) ? endOffset : offsets[i];
- if (currentOffset - previousOffset != 0) { // don't do empty partitions
- ITypedRegion region= regions[j++];
-
- assertTypedRegion(region, previousOffset, currentOffset, type);
- }
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= currentOffset;
- }
- }
-
- private void assertGetContentType_InterleavingPartitions(int[] offsets) {
- String type= DEFAULT;
- int previousOffset= 0;
- for (int i= 0; i <= offsets.length; i++) {
- int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
- assertEqualPartitionType(previousOffset, offset, type);
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= offset;
- }
- }
-
- private void assertGetPartition_InterleavingPartitions(int[] offsets) {
- String type= DEFAULT;
- int previousOffset= 0;
- for (int i= 0; i <= offsets.length; i++) {
- int offset= (i == offsets.length) ? fDoc.getLength() : offsets[i];
- assertEqualPartition(previousOffset, offset, type);
-
- // advance
- if (type == DEFAULT)
- type= COMMENT;
- else
- type= DEFAULT;
- previousOffset= offset;
- }
- }
-
- private void assertEqualPartition(int offset, int end, String type) {
- int from= offset;
- int to= end - 1;
- for (int i= from; i <= to; i++) {
- ITypedRegion region= fPartitioner.getPartition(i);
- assertTypedRegion(region, offset, end, type);
- }
- }
-
- private void assertTypedRegion(ITypedRegion region, int offset, int end, String type) {
- assertEquals(offset, region.getOffset());
- assertEquals(end - offset, region.getLength());
- assertEquals(type, region.getType());
- }
-
- private void assertEqualPartitionType(int offset, int end, String type) {
- int from= offset;
- int to= end - 1;
- for (int i= from; i <= to; i++) {
- assertEquals(type, fPartitioner.getContentType(i));
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java
deleted file mode 100644
index 48deb6de6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @since 3.0
- */
-public class RulesTestSuite {
-
- public static Test suite() {
- TestSuite suite= new TestSuite(
- "Test Suite org.eclipse.jface.text.tests.rules");
- // $JUnit-BEGIN$
- suite.addTestSuite(FastPartitionerTest.class);
- suite.addTestSuite(DefaultPartitionerTest.class);
- suite.addTestSuite(DefaultPartitionerZeroLengthTest.class);
- suite.addTestSuite(WordRuleTest.class);
- suite.addTestSuite(ScannerColumnTest.class);
- // $JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java
deleted file mode 100644
index 1b0c8b670..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-
-
-/**
- * @since 3.4
- */
-public class ScannerColumnTest extends TestCase {
-
- private IDocument fDocument;
-
- protected void setUp() throws Exception {
- fDocument= new Document("scanner test");
- }
-
- protected void tearDown() throws Exception {
- fDocument= null;
- }
-
- public void testRuleBasedScannerColumnRead() {
- _testScannerColumnRead(new RuleBasedScanner());
- }
-
- public void testRuleBasedScannerColumnUnread() {
- _testScannerColumnUnread(new RuleBasedScanner());
- }
-
- public void testBufferedRuleBasedScannerColumnRead() {
- _testScannerColumnRead(new BufferedRuleBasedScanner(100));
- }
-
- public void testBufferedRuleBasedScannerColumnUnread() {
- _testScannerColumnUnread(new BufferedRuleBasedScanner(100));
- }
-
- private void _testScannerColumnRead(RuleBasedScanner scanner) {
- scanner.setRange(fDocument, 0, 10);
- assertEquals(0, scanner.getColumn());
- assertEquals('s', scanner.read());
- assertEquals(1, scanner.getColumn());
- scanner.unread();
- assertEquals(0, scanner.getColumn());
- }
-
- private void _testScannerColumnUnread(RuleBasedScanner scanner) {
- scanner.setRange(fDocument, 0, 10);
- assertEquals(0, scanner.getColumn());
- assertEquals('s', scanner.read());
- assertEquals(1, scanner.getColumn());
- scanner.unread();
- assertEquals(0, scanner.getColumn());
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java b/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java
deleted file mode 100644
index 6f5ecfd11..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests.rules;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWordDetector;
-import org.eclipse.jface.text.rules.PatternRule;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WordRule;
-
-/**
- * @since 3.3
- */
-public class WordRuleTest extends TestCase {
-
-
- private static class SimpleWordDetector implements IWordDetector {
- public boolean isWordStart(char c) {
- return !Character.isWhitespace(c);
- }
-
- public boolean isWordPart(char c) {
- return !Character.isWhitespace(c);
- }
- }
-
-
- /*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=163116
- */
- public void testBug163116() throws Exception {
- IWordDetector detector= new IWordDetector() {
-
- public boolean isWordPart(char c) {
- return true;
- }
-
- public boolean isWordStart(char c) {
- return true;
- }
-
- };
-
- WordRule rule= new WordRule(detector, new Token(this));
-
- RuleBasedScanner scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] { rule });
- scanner.setRange(new Document(), 0, 0);
-
- IToken token= null;
- int i= 0;
- while (token != Token.EOF && i++ < 1000)
- token= scanner.nextToken();
-
- assertTrue(i < 1000);
-
- }
-
- /*
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=144355
- */
- public void testBug144355() throws Exception {
- IWordDetector detector= new SimpleWordDetector();
-
- String defaultTokenString= "defaultToken";
- Token defaultToken= new Token(defaultTokenString);
-
- String testTokenStringNormal= "TestTokenString";
- String testTokenStringDifferentCapitalization= "TestTOKENString";
- String testTokenStringCompletelyDifferent= "XXX";
- Token normalToken= new Token(testTokenStringNormal);
-
- WordRule rule= new WordRule(detector, defaultToken, true);
- rule.addWord(testTokenStringNormal, normalToken);
-
- // scenario 1
- // pre: pass in a normal string ("TestTokenString")
- // post: expect the normal token to be returned
- RuleBasedScanner scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] {rule});
- scanner.setRange(new Document(testTokenStringNormal), 0, testTokenStringNormal.length());
- assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
- // scenario 2
- // pre: pass in a normal string but different capitalization ("TestTOKENString")
- // post: expect the normal token to be returned
- scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] {rule});
- scanner.setRange(new Document(testTokenStringDifferentCapitalization), 0, testTokenStringDifferentCapitalization.length());
- assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
- // scenario 3
- // pre: pass in a completely different string ("XXX")
- // post: expect the default token to be returned because the string can't be matched
- scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] {rule});
- scanner.setRange(new Document(testTokenStringCompletelyDifferent), 0, testTokenStringCompletelyDifferent.length());
- assertTrue(scanner.nextToken().getData().equals(defaultTokenString));
-
- WordRule ruleWithoutIgnoreCase= new WordRule(detector, defaultToken);
- ruleWithoutIgnoreCase.addWord(testTokenStringNormal, normalToken);
-
- // scenario 4
- // pre: pass in a normal string ("TestTokenString")
- // post: expect the normal token to be returned
- scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] {ruleWithoutIgnoreCase});
- scanner.setRange(new Document(testTokenStringNormal), 0, testTokenStringNormal.length());
- assertTrue(scanner.nextToken().getData().equals(testTokenStringNormal));
-
- // scenario 5
- // pre: pass in a normal string but different capitalization ("TestTOKENString")
- // post: expect the default token to be returned
- scanner= new RuleBasedScanner();
- scanner.setRules(new IRule[] {ruleWithoutIgnoreCase});
- scanner.setRange(new Document(testTokenStringDifferentCapitalization), 0, testTokenStringDifferentCapitalization.length());
- assertTrue(scanner.nextToken().getData().equals(defaultTokenString));
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=175712
- public void testBug175712_1() throws Exception {
- IRule[] rules= new IRule[2];
-
- IToken stepToken= new Token(new TextAttribute(null, null, SWT.BOLD));
- PatternRule stepRule= new PatternRule("(((", ")", stepToken, (char) 0,false);
- stepRule.setColumnConstraint(-1);
- rules[1]= stepRule;
-
- IToken titleToken= new Token(new TextAttribute(null, null, SWT.BOLD));
- WordRule wordRule= new WordRule(new SimpleWordDetector());
- wordRule.addWord("((", titleToken);
- rules[0]= wordRule;
-
- IDocument document= new Document("((( \n((\n- Cheese\n- Wine");
- RuleBasedScanner scanner= new RuleBasedScanner();
- scanner.setRules(rules);
- scanner.setRange(document, 0, document.getLength());
-
- IToken defaultToken= new Token(this);
- scanner.setDefaultReturnToken(defaultToken);
-
- IToken token= scanner.nextToken();
- assertSame(defaultToken, token);
-
- token= scanner.nextToken();
- assertSame(defaultToken, token);
-
- token= scanner.nextToken();
- assertSame(defaultToken, token);
-
- token= scanner.nextToken();
- assertSame(titleToken, token);
-
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=175712
- public void testBug175712_2() throws Exception {
- IRule[] rules= new IRule[2];
-
- IToken stepToken= new Token(new TextAttribute(null, null, SWT.BOLD));
- PatternRule stepRule= new PatternRule("(((", ")", stepToken, (char) 0,false);
- stepRule.setColumnConstraint(-1);
- rules[1]= stepRule;
-
- IToken titleToken= new Token(new TextAttribute(null, null, SWT.BOLD));
- WordRule wordRule= new WordRule(new SimpleWordDetector());
- wordRule.addWord("((", titleToken);
- rules[0]= wordRule;
-
- IDocument document= new Document("((\n((\n- Cheese\n- Wine");
- RuleBasedScanner scanner= new RuleBasedScanner();
- scanner.setRules(rules);
- scanner.setRange(document, 0, document.getLength());
-
- IToken defaultToken= new Token(this);
- scanner.setDefaultReturnToken(defaultToken);
-
- IToken token= scanner.nextToken();
- assertSame(titleToken, token);
-
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
deleted file mode 100644
index ee14d1942..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-# properties file for org.eclipse.jst.jsp.ui.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Structured Source Editor for JSP Tests
-view.name.0 = Embedded JSP Structured Text Viewer
-editor.name.0 = Generic Structured Text Editor
-taglibview.name.0=TaglibIndex Delta Trace View
-_UI_SHOW_TRANSLATION=Show Java Translation \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
deleted file mode 100644
index 82cfc57a9..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
- <view
- name="%view.name.0"
- icon="$nl$/icons/sourceEditor.gif"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"
- id="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP" />
- <view
- name="%taglibview.name.0"
- icon="$nl$/icons/sourceEditor.gif"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.jst.jsp.ui.tests.TaglibIndexDeltaTraceView"
- id="org.eclipse.jst.jsp.ui.tests.TaglibIndexDeltaTraceView" />
- </extension>
- <extension point="org.eclipse.ui.editors">
- <editor
- name="%editor.name.0"
- extensions="project, classpath, websettings, serverPreference"
- icon="$nl$/icons/sourceEditor.gif"
- class="org.eclipse.wst.sse.ui.StructuredTextEditor"
- contributorClass="org.eclipse.wst.sse.ui.internal.actions.ActionContributor"
- symbolicFontName="org.eclipse.wst.sse.ui.textfont"
- id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
- </editor>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.jst.jsp.ui.showTranslation"
- name="%_UI_SHOW_TRANSLATION">
- </command>
- </extension>
- <extension point="org.eclipse.ui.bindings">
- <!-- win32: M1=CTRL, M2=SHIFT, M3=ALT, M4=-
- carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL
- gtk: ?
- -->
- <key
- sequence="M1+M2+9"
- contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
- commandId="org.eclipse.jst.jsp.ui.showTranslation"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- </extension>
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.jst.jsp.ui.tests.ShowTranslationHandler"
- commandId="org.eclipse.jst.jsp.ui.showTranslation">
- </handler>
- </extension>
- <extension
- point="org.eclipse.jst.jsp.ui.classPatternProvider">
- <classPatternProvider
- contentType="org.eclipse.jst.jsp.ui.tests.type"
- pattern="*foo,*bar">
- </classPatternProvider>
- <classPatternProvider
- contentType="org.eclipse.jst.jsp.ui.tests.multitype"
- pattern="*foo,*bar">
- </classPatternProvider>
- <classPatternProvider
- contentType="org.eclipse.jst.jsp.ui.tests.multitype"
- pattern="*baz">
- </classPatternProvider>
- </extension>
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/TestJSPContentAssistComputers.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/TestJSPContentAssistComputers.zip
deleted file mode 100644
index 07432e740..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/TestJSPContentAssistComputers.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
deleted file mode 100644
index c50a9a9a6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
deleted file mode 100644
index 32204f27b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
deleted file mode 100644
index 773a303cc..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip
deleted file mode 100644
index 44eac28e3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/testJSPELContentAssist.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
deleted file mode 100644
index ccff6a67c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.wst.sse.core.internal.util.DocumentInputStream;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * @author nitin
- *
- */
-public class JSPTranslationEditorInput implements IStorageEditorInput {
- private class JSPTranslationStorage implements IStorage {
- /**
- *
- */
- public JSPTranslationStorage(IDOMModel jspModel) {
- fModel = jspModel;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return fModel.getAdapter(adapter);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getContents()
- */
- public InputStream getContents() throws CoreException {
- return new DocumentInputStream(getTranslationAdapter().getJSPTranslation().getJavaDocument());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getFullPath()
- */
- public IPath getFullPath() {
- return new Path(getTranslationAdapter().getJSPTranslation().getJavaPath());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getName()
- */
- public String getName() {
-// return getTranslationAdapter().getJSPTranslation().getCompilationUnit().getElementName();
- return new Path(fModel.getBaseLocation()).lastSegment() + ".java";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#isReadOnly()
- */
- public boolean isReadOnly() {
- return true;
- }
- }
-
- IDOMModel fModel;
-
- private JSPTranslationStorage fStorage;
-
- /**
- *
- */
- public JSPTranslationEditorInput(IDOMModel model) {
- fStorage = new JSPTranslationStorage(model);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#exists()
- */
- public boolean exists() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return fModel.getAdapter(adapter);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#getName()
- */
- public String getName() {
- return fStorage.getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#getPersistable()
- */
- public IPersistableElement getPersistable() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IStorageEditorInput#getStorage()
- */
- public IStorage getStorage() throws CoreException {
- return fStorage;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#getToolTipText()
- */
- public String getToolTipText() {
- return fModel.getBaseLocation();
- }
-
- JSPTranslationAdapter getTranslationAdapter() {
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) fModel.getDocument().getAdapterFor(IJSPTranslation.class);
- return adapter;
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
deleted file mode 100644
index 4ec6fec1d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ /dev/null
@@ -1,121 +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.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.internal.preferences.JSPUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * 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 JSPUIPreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.html.ui";
-
- // 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, JSPUIPreferenceNames.AUTO_PROPOSE);
- bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
- assertNotSame("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() {
- IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
- pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
- pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE, "<=");
- }
-
- private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
- String defaultValue = store.getDefaultString(prefKey);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
- }
-
- /**
- * 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() {
- IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
- pluginSetPreferenceBoolean(store, JSPUIPreferenceNames.AUTO_PROPOSE);
- pluginSetPreferenceString(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
- }
-
- private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
- boolean originalValue = store.getBoolean(prefKey);
- boolean expectedValue = !originalValue;
- store.setValue(prefKey, expectedValue);
- boolean foundValue = store.getBoolean(prefKey);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- store.setValue(prefKey, originalValue);
- }
-
- private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
- String originalValue = store.getString(prefKey);
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- store.setValue(prefKey, expectedValue);
- String foundValue = store.getString(prefKey);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- store.setValue(prefKey, originalValue);
- }
-
- public void testJavaSeverityPageIDsMatch() {
- // used when linking from our JSP severity preference page to the Java severity preference page
- assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PREF_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PREFERENCE_PAGE);
- assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PROP_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PROPERTY_PAGE);
- assertEquals(org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage.DATA_NO_LINK, org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.DATA_NO_LINK);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java
deleted file mode 100644
index 64e1eb162..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java
+++ /dev/null
@@ -1,43 +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.ui.tests;
-
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public final class JSPUITestImages {
- private final static String ICONS_PATH = "icons/full/"; //$NON-NLS-1$
-
- /* disabled */
- private final static String DLCL = ICONS_PATH + "dlcl16/"; // $NON-NLS-1$
- /* enabled */
- private final static String ELCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
-
- // Images courtesy of org.eclipse.debug.ui
- public static final String IMG_ELCL_SUSPEND = ELCL + "SUSPEND"; //$NON-NLS-1$
- public static final String IMG_ELCL_RESUME = ELCL + "RESUME"; //$NON-NLS-1$
- public static final String IMG_DLCL_SUSPEND = DLCL + "SUSPEND"; //$NON-NLS-1$
- public static final String IMG_DLCL_RESUME = DLCL + "RESUME"; //$NON-NLS-1$
- public static final String IMG_ELCL_REMOVE_ALL = ELCL + "CLEAR"; //$NON-NLS-1$
- public static final String IMG_DLCL_REMOVE_ALL = DLCL + "CLEAR"; //$NON-NLS-1$
-
- static void initializeImageRegistry(ImageRegistry reg) {
- reg.put(IMG_ELCL_RESUME, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "resume_co.gif"));
- reg.put(IMG_DLCL_RESUME, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "resume_co.gif"));
-
- reg.put(IMG_ELCL_SUSPEND, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "suspend_co.gif"));
- reg.put(IMG_DLCL_SUSPEND, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "suspend_co.gif"));
-
- reg.put(IMG_ELCL_REMOVE_ALL, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "rem_all_co.gif"));
- reg.put(IMG_DLCL_REMOVE_ALL, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "rem_all_co.gif"));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
deleted file mode 100644
index 98583881d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ /dev/null
@@ -1,82 +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.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.tests.JFaceTextTestSuite;
-import org.eclipse.jst.jsp.ui.tests.breakpointproviders.BreakpointProvidersTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPELContentAssistTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.TestJSPContentAssistComputers;
-import org.eclipse.jst.jsp.ui.tests.contentdescription.TestContentDescription;
-import org.eclipse.jst.jsp.ui.tests.document.FileBufferDocumentTester;
-import org.eclipse.jst.jsp.ui.tests.model.TestModelsFromFiles;
-import org.eclipse.jst.jsp.ui.tests.modelquery.ModelQueryTester;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.other.UnitTests;
-import org.eclipse.jst.jsp.ui.tests.pagedirective.TestPageDirective;
-import org.eclipse.jst.jsp.ui.tests.partitioning.TestStructuredPartitionerJSP;
-import org.eclipse.jst.jsp.ui.tests.registry.AdapterFactoryRegistryTest;
-import org.eclipse.jst.jsp.ui.tests.validation.JSPHTMLValidatorTest;
-import org.eclipse.jst.jsp.ui.tests.viewer.TestViewerConfigurationJSP;
-import org.eclipse.text.tests.EclipseTextTestSuite;
-
-
-
-
-public class JSPUITestSuite extends TestSuite {
- public static Test suite() {
- return new JSPUITestSuite();
- }
-
- public JSPUITestSuite() {
- super("JSP UI Test Suite");
-
- addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
- addTest(new TestSuite(UnitTests.class, "UnitTests"));
- addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
- addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
- addTest(new TestSuite(JSPJavaTranslatorTest.class, "Mixed JavaScript Translator Tests"));
- addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
- addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfo Provider Test"));
- addTest(new TestSuite(JSPTranslationTest.class, "Translator Tests"));
- addTest(new TestSuite(JSPELContentAssistTest.class, "JSP EL Content Assist Tests"));
- addTest(TestJSPContentAssistComputers.suite());
- addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistry Tests"));
- addTest(new TestSuite(JSPUIPreferencesTest.class, "Preference Tests"));
- addTest(new TestSuite(TestViewerConfigurationJSP.class, "Source Viewer Configuration Tests"));
- addTest(new TestSuite(TestEditorConfigurationJSP.class, "Editor Configuration Tests"));
-
- // moved from jsp core tests because they require UI
- addTest(new TestSuite(TestPageDirective.class, "Page Directive Tests"));
- addTest(new TestSuite(FileBufferDocumentTester.class, "FileBuffer Document Tests"));
- addTest(new TestSuite(TestModelClone.class, "Model Clone Tests"));
-
- addTest(new TestSuite(TestModelsFromFiles.class, "Test Models From Files"));
- addTest(new TestSuite(TestModelEmbeddedContentType.class, "Test Model Embedded ContentType"));
-
- addTest(new TestSuite(TestContentDescription.class, "Content Description Tests"));
- addTest(new TestSuite(JSPHTMLValidatorTest.class, "JSP HTML Validator Test"));
-
- // Breakpoint Providers
- addTest(new TestSuite(BreakpointProvidersTest.class, "Additional JSP Breakpoint classes"));
-
- // pa_TODO fix this test
- //addTest(new TestSuite(JSPSearchTests.class));
-
- addTest(JFaceTextTestSuite.suite());
- addTest(EclipseTextTestSuite.suite());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
deleted file mode 100644
index f61d946ff..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
+++ /dev/null
@@ -1,102 +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.ui.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.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPUITestsPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static JSPUITestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- public static final String ID = "org.eclipse.jst.jsp.ui.tests";
-
- /**
- * The constructor.
- */
- public JSPUITestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.ui.tests.SSEForJSPTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPUITestsPlugin 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 = JSPUITestsPlugin.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.ui.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;
- }
-
- protected void initializeImageRegistry(ImageRegistry reg) {
- super.initializeImageRegistry(reg);
- JSPUITestImages.initializeImageRegistry(reg);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
deleted file mode 100644
index 22b107229..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
deleted file mode 100644
index c62116955..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.jsp.core.internal.java.IJSPProblem;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationExtension;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-/**
- * Opens the current JSP editor's current translated source in a Java editor
- *
- * Invoke with M1+M2+9
- *
- * @author nitin
- */
-public class ShowTranslationHandler extends AbstractHandler {
-
- /**
- *
- */
- public ShowTranslationHandler() {
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands
- * .ExecutionEvent)
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- // IDE.openEditor(event.getApplicationContext(), createEditorInput(),
- // JavaUI.ID_CU_EDITOR, true);
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection instanceof IStructuredSelection) {
- List list = ((IStructuredSelection) selection).toList();
- if (!list.isEmpty()) {
- if (list.get(0) instanceof IDOMNode) {
- final IDOMModel model = ((IDOMNode) list.get(0)).getModel();
- INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
- if (adapter != null) {
- Job opener = new UIJob("Opening JSP Java Translation") {
- public IStatus runInUIThread(IProgressMonitor monitor) {
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- final JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
-
- // create an IEditorInput for the Java editor
- final IStorageEditorInput input = new JSPTranslationEditorInput(model);
- try {
- IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaUI.ID_CU_EDITOR, true);
- // Now add the problems we found
- if (editor instanceof ITextEditor) {
- IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
- translation.reconcileCompilationUnit();
- List problemsList = translation.getProblems();
- IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
- AnnotationTypeLookup lookup = new AnnotationTypeLookup();
- for (int i = 0; i < problems.length; i++) {
- if (problems[i] instanceof IJSPProblem)
- continue;
- int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
- Position position = new Position(problems[i].getSourceStart(), length);
- Annotation annotation = null;
- String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
- if (problems[i].isError()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
- }
- else if (problems[i].isWarning()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
- }
- annotation = new Annotation(type, false, problems[i].getMessage());
- if (annotation != null) {
- annotationModel.addAnnotation(annotation, position);
- }
- }
- }
- }
- catch (PartInitException e) {
- e.printStackTrace();
- Display.getCurrent().beep();
- }
- return Status.OK_STATUS;
- }
- };
- opener.setSystem(false);
- opener.setUser(true);
- opener.schedule();
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java
deleted file mode 100644
index e6ea06b7f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java
+++ /dev/null
@@ -1,400 +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.ui.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsp.core.taglib.ITaglibIndexDelta;
-import org.eclipse.jst.jsp.core.taglib.ITaglibIndexListener;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndexDelta;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Sash;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-
-public class TaglibIndexDeltaTraceView extends ViewPart {
-
- static final String MEM_LISTENING = "IS_LISTENING";
- boolean isListening = false;
-
- /**
- * Resumes listening to TaglibIndexDeltas
- */
- private class ResumeAction extends Action {
- public ResumeAction() {
- super();
- setText("Resume");
- setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_RESUME));
- setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_RESUME));
- }
-
- public void run() {
- super.run();
- TaglibIndex.addTaglibIndexListener(fInternalListener);
- isListening = true;
- fSuspendAction.setEnabled(true);
- setEnabled(false);
- }
- }
-
- /**
- * Stops listening to TaglibIndexDeltas
- */
- private class SuspendAction extends Action {
- public SuspendAction() {
- setText("Suspend");
- setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_SUSPEND));
- setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_SUSPEND));
- }
-
- public void run() {
- super.run();
- TaglibIndex.removeTaglibIndexListener(fInternalListener);
- isListening = false;
- setEnabled(false);
- fResumeAction.setEnabled(true);
- }
- }
-
- /**
- * Empties deltas from viewer
- */
- private class ClearAction extends Action {
- public ClearAction() {
- setText("Clear");
- setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_REMOVE_ALL));
- setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_REMOVE_ALL));
- }
-
- public void run() {
- super.run();
- fInput.clear();
- fViewer.refresh();
- setEnabled(false);
- }
- }
-
- class TaglibIndexListener implements ITaglibIndexListener {
- public void indexChanged(final ITaglibIndexDelta delta) {
- getControl().getDisplay().syncExec(new Runnable() {
- public void run() {
- fInput.add(delta);
- fViewer.refresh();
- fViewer.setSelection(new StructuredSelection(delta));
- fClearAction.setEnabled(true);
- }
- });
- }
- }
-
- ITaglibIndexListener fInternalListener = null;
-
- List fInput = new ArrayList();
- TableViewer fViewer = null;
- ResumeAction fResumeAction;
- SuspendAction fSuspendAction;
- IAction fClearAction;
-
- public TaglibIndexDeltaTraceView() {
- super();
- fInternalListener = new TaglibIndexListener();
- }
-
- void showSelectionDetail(final Composite composite) {
- IStructuredSelection selection = (IStructuredSelection) fViewer.getSelection();
- if (!selection.isEmpty()) {
- final TaglibIndexDelta selectedDelta = (TaglibIndexDelta) selection.getFirstElement();
- final ITableLabelProvider tableLabelProvider = ((ITableLabelProvider) fViewer.getLabelProvider());
- String columnText = tableLabelProvider.getColumnText(selectedDelta, 1);
- columnText = columnText + ":" + tableLabelProvider.getColumnText(selectedDelta, 2);
- new Dialog(composite.getShell()) {
- public void create() {
- setShellStyle(getShellStyle() | SWT.RESIZE);
- super.create();
- }
-
- protected Control createDialogArea(final Composite parent) {
- final Composite inner = new Composite(parent, SWT.NONE);
- inner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- final Sash sash = new Sash(inner, SWT.HORIZONTAL);
-
- final TreeViewer treeViewer = new TreeViewer(inner);
- treeViewer.setContentProvider(new ITreeContentProvider() {
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
-
- public Object getParent(Object element) {
- return selectedDelta;
- }
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof TaglibIndexDelta) {
- TaglibIndexDelta taglibIndexDelta = ((TaglibIndexDelta) parentElement);
- if (taglibIndexDelta.getTrigger() != null) {
- List combined = new ArrayList();
- combined.add(taglibIndexDelta.getTrigger());
- combined.addAll(Arrays.asList(taglibIndexDelta.getAffectedChildren()));
- return combined.toArray();
- }
- return taglibIndexDelta.getAffectedChildren();
- }
- return new Object[0];
- }
- });
- treeViewer.setLabelProvider(new LabelProvider() {
- public String getText(Object element) {
- if (element instanceof ITaglibIndexDelta) {
- ITaglibIndexDelta taglibIndexDelta = ((ITaglibIndexDelta) element);
- if (taglibIndexDelta.getTaglibRecord() != null)
- return taglibIndexDelta.toString();
- String text = tableLabelProvider.getColumnText(selectedDelta, 1);
- text = text + ":" + tableLabelProvider.getColumnText(selectedDelta, 2);
- return text;
- }
- return StringUtils.firstLineOf(super.getText(element));
- }
- });
- treeViewer.setInput(selectedDelta);
-
- final Text text = new Text(inner, SWT.MULTI);
-
- treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection2 = (IStructuredSelection) treeViewer.getSelection();
- if (!selection2.isEmpty())
- text.setText("" + (selection2).getFirstElement());
- else
- text.setText("");
- }
- });
-
- final FormLayout form = new FormLayout();
- inner.setLayout(form);
-
- FormData firstData = new FormData();
- firstData.top = new FormAttachment(0, 0);
- firstData.bottom = new FormAttachment(sash, 2);
- firstData.left = new FormAttachment(0, 0);
- firstData.right = new FormAttachment(100, 0);
- treeViewer.getControl().setLayoutData(firstData);
-
- FormData secondData = new FormData();
- secondData.top = new FormAttachment(sash, 2);
- secondData.left = new FormAttachment(0, 0);
- secondData.right = new FormAttachment(100, 0);
- secondData.bottom = new FormAttachment(100, 0);
- text.setLayoutData(secondData);
-
- final FormData sashData = new FormData();
- sashData.top = new FormAttachment(60, 0);
- sashData.left = new FormAttachment(0, 0);
- sashData.right = new FormAttachment(100, 0);
- sash.setLayoutData(sashData);
- sash.addListener(SWT.Selection, new org.eclipse.swt.widgets.Listener() {
- public void handleEvent(Event e) {
- sashData.top = new FormAttachment(0, e.y);
- inner.layout();
- }
- });
- return sash;
- }
- }.open();
- }
- }
-
- public void createPartControl(final Composite parent) {
- fViewer = new TableViewer(parent, SWT.SINGLE | SWT.FULL_SELECTION);
- fViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- showSelectionDetail(parent);
- }
-
- });
- fViewer.setContentProvider(new ArrayContentProvider());
- fViewer.setLabelProvider(new ITableLabelProvider() {
- public void removeListener(ILabelProviderListener listener) {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void dispose() {
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public String getColumnText(Object element, int columnIndex) {
- switch (columnIndex) {
- case 0 : {
- return Long.toString(((TaglibIndexDelta) element).getTime());
- }
- case 1 : {
- String kind = null;
- switch (((ITaglibIndexDelta) element).getKind()) {
- case ITaglibIndexDelta.ADDED :
- kind = "added";
- break;
- case ITaglibIndexDelta.REMOVED :
- kind = "removed";
- break;
- case ITaglibIndexDelta.CHANGED :
- kind = "changed";
- break;
- }
- return kind;
- }
- case 2 :
- return ((ITaglibIndexDelta) element).getProject().getName();
- case 3 :
- return ((TaglibIndexDelta) element).getTrigger().toString();
- }
- return "";
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- });
-
- String[] columnProperties = new String[]{"time", "Kind", "Project", "Trigger"};
- TableLayout tlayout = new TableLayout();
- CellEditor[] cellEditors = new CellEditor[columnProperties.length];
- int columnWidths[] = new int[]{Display.getCurrent().getBounds().width / 14, Display.getCurrent().getBounds().width / 7, Display.getCurrent().getBounds().width / 7, Display.getCurrent().getBounds().width / 14, Display.getCurrent().getBounds().width / 7};
- for (int i = 0; i < columnProperties.length; i++) {
- tlayout.addColumnData(new ColumnWeightData(1));
- TableColumn tc = new TableColumn(fViewer.getTable(), SWT.NONE);
- tc.setText(columnProperties[i]);
- tc.setResizable(true);
- tc.setWidth(columnWidths[i]);
- }
- fViewer.setCellEditors(cellEditors);
- fViewer.setColumnProperties(columnProperties);
-
- fViewer.getTable().setHeaderVisible(true);
- fViewer.getTable().setLinesVisible(true);
- fViewer.setColumnProperties(columnProperties);
-
- MenuManager contextMenuManager = new MenuManager();
- contextMenuManager.setRemoveAllWhenShown(false);
- contextMenuManager.add(new Action() {
- public void run() {
- super.run();
- showSelectionDetail(parent);
- }
-
- public String getText() {
- return "Details...";
- }
-
- public boolean isEnabled() {
- return !fViewer.getSelection().isEmpty();
- }
- });
-
- Menu contextMenu = contextMenuManager.createContextMenu(fViewer.getControl());
- getControl().setMenu(contextMenu);
-
- fViewer.setInput(fInput);
- }
-
- public void dispose() {
- super.dispose();
- TaglibIndex.removeTaglibIndexListener(fInternalListener);
- }
-
- Control getControl() {
- return fViewer.getControl();
- }
-
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
-
- boolean shouldListen = memento != null && Boolean.valueOf(memento.getString(MEM_LISTENING)).booleanValue();
- if (shouldListen) {
- TaglibIndex.addTaglibIndexListener(fInternalListener);
- isListening = true;
- }
- fResumeAction = new ResumeAction();
- fSuspendAction = new SuspendAction();
- fClearAction = new ClearAction();
- fSuspendAction.setEnabled(isListening);
- fResumeAction.setEnabled(!isListening);
-
- IToolBarManager mgr = site.getActionBars().getToolBarManager();
- mgr.add(fResumeAction);
- mgr.add(fSuspendAction);
- mgr.add(fClearAction);
- }
-
- public void saveState(IMemento memento) {
- super.saveState(memento);
- memento.putString(MEM_LISTENING, Boolean.toString(isListening));
- }
-
- public void setFocus() {
- fViewer.getControl().setFocus();
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
deleted file mode 100644
index 90ae56176..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
+++ /dev/null
@@ -1,55 +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 - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.internal.taginfo.JSPJavaJavadocHoverProcessor;
-import org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for jsp content type
- */
-public class TestEditorConfigurationJSP extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), StructuredTextViewerConfigurationJSP.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), JSPContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-
- public void testGetDocumentationTextHover() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IJSPPartitions.JSP_CONTENT_JAVA);
- assertNotNull("no documentation text hover processor for " + IJSPPartitions.JSP_CONTENT_JAVA, o);
- // check for over-qualified subclasses
- assertEquals("unexpected documentation text hover processor for " + IJSPPartitions.JSP_CONTENT_JAVA, o.getClass(), JSPJavaJavadocHoverProcessor.class);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
deleted file mode 100644
index 154156da6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
+++ /dev/null
@@ -1,29 +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.ui.tests;
-
-import junit.framework.TestCase;
-
-public class TestEmailNotice extends TestCase {
- private boolean sendNotifications = false;
-
- public TestEmailNotice() {
- super();
- }
-
- public TestEmailNotice(String name) {
- super(name);
- }
-
- public void testEmail() {
- assertFalse("Simple test to be sure email gets sent on failure", sendNotifications);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
deleted file mode 100644
index f6b3dd02f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.modelquery.JSPModelQueryAdapterImpl;
-import org.eclipse.jst.jsp.core.internal.modelquery.JSPModelQueryImpl;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML;
-import org.eclipse.wst.html.core.internal.modelquery.HTMLModelQueryImpl;
-//import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeFamilyForHTML;
-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.provisional.IModelManager;
-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.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- *
- */
-public class TestModelClone extends TestCase {
-
- private HashMap embeddedModelQueries = new HashMap();
-
- /**
- * Constructor for TestModelClone.
- */
- public TestModelClone(String name) {
- super(name);
- }
-
- public static Test getTest() {
- return new TestModelClone("testCreateStructuredModelJSP");
- }
-
- public void testCloneStructuredModelXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the embedded type is correct
- boolean passed = true;
- Document doc = ((IDOMModel) clonedModel).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("cloned model did not have embedded adapter", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
- // note, we initialy expect HTML, since there is not content
- checkEmbeddedType(model, EmbeddedHTML.class);
-
- String testContent = "<%@ page contentType=\"text/xml\" %>";
- model.getStructuredDocument().setText(this, testContent);
-
- // modified for design change, where re-init should be handled before
- // set returns.
- assertTrue("model should not need reinit", !model.isReinitializationNeeded());
-
- // but if it did need re-init, here's the right calling sequence
- // if (model.isReinitializationNeeded()) {
- // model.aboutToChangeModel();
- // model = model.reinit();
- // model.changedModel();
- // }
-
- checkEmbeddedType(model, EmbeddedXML.class);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- checkEmbeddedType(clonedModel, EmbeddedXML.class);
-
- }
-
- private void checkEmbeddedType(IStructuredModel model, Class expectedType) {
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("model did not have pageDirective", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("model did not have embedded handler", embeddedHandler);
-
- assertEquals(expectedType, embeddedHandler.getClass());
-
- }
-
- public void testCreateStructuredModelJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
- factories = (ArrayList) factories.clone();
-
- IStructuredModel clonedModel = model.newInstance();
- if (model.getModelHandler() == null) {
- System.out.println();
- assertTrue(false);
- }
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are correct.
-
- ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- newFactories = (ArrayList) newFactories.clone();
-
- boolean passed = checkFactoriesListForIdentity(factories, newFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
- // Now, assigning some content shouldn't change the factories
- clonedModel.getStructuredDocument().replaceText(this, 0, 0, "<sample> text");
- ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- twoFactories = (ArrayList) twoFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, twoFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- clonedModel.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\"");
- ArrayList threeFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- threeFactories = (ArrayList) threeFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, threeFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
-
- }
-
- public void testCreateStructuredModelJSPXHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
-
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" +
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\n" +
- "\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n" +
- "<%@page language=\"java\" contentType=\"text/xml; charset=ISO-8859-1\"\n" +
- " pageEncoding=\"ISO-8859-1\"%>\n" +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
- "<head>\n" +
- "<meta http-equiv=\"Content-Type\" content=\"text/xml; charset=ISO-8859-1\" />\n" +
- "<style>\n" +
- "A { color: red; }\n" +
- "</style>\n" +
- "</head>\n" +
- "</html>\n" +
- "");
-
- checkEmbeddedType(model, EmbeddedHTML.class);
- checkModelQuery(model, JSPModelQueryImpl.class);
- checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-
-
-
-
- }
-
- public void testCreateStructuredModelJSPXHTMnoDoctype() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
-
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" +
- "<%@page language=\"java\" contentType=\"text/xml; charset=ISO-8859-1\"\n" +
- " pageEncoding=\"ISO-8859-1\"%>\n" +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
- "<head>\n" +
- "<meta http-equiv=\"Content-Type\" content=\"text/xml; charset=ISO-8859-1\" />\n" +
- "<style>\n" +
- "A { color: red; }\n" +
- "</style>\n" +
- "</head>\n" +
- "</html>\n" +
- "");
-
- checkEmbeddedType(model, EmbeddedHTML.class);
- checkModelQuery(model, JSPModelQueryImpl.class);
- checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-
-
-
-
- }
-
- public void testCreateStructuredModelJSPXHTML2() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
-
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" +
- "<%@page language=\"java\" contentType=\"application/xml; charset=ISO-8859-1\"\n" +
- " pageEncoding=\"ISO-8859-1\"%>\n" +
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\n" +
- "\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n" +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
- "<head>\n" +
- "<meta http-equiv=\"Content-Type\" content=\"application/xml; charset=ISO-8859-1\" />\n" +
- "<style>\n" +
- "A { color: red; }\n" +
- "</style>\n" +
- "</head>\n" +
- "</html>\n" +
- "");
-
- checkEmbeddedType(model, EmbeddedHTML.class);
- checkModelQuery(model, JSPModelQueryImpl.class);
- checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-
-
-
-
- }
-
- private void checkModelQuery(IStructuredModel model, Class class1) {
- Document doc = ((IDOMModel) model).getDocument();
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) doc).getExistingAdapter(ModelQueryAdapter.class);
- assertNotNull("model did not have modelQueryAdapter", modelQueryAdapter);
-
- assertTrue("modelQueryAdapter is wrong class", class1.equals(JSPModelQueryImpl.class));
-
- }
-
- private void checkEmbeddedModelQuery(IStructuredModel model, Class outerQueryAdapter, Class outerQueryClass, Class embeddedQueryClass) {
-
- Document doc = ((IDOMModel) model).getDocument();
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) doc).getExistingAdapter(ModelQueryAdapter.class);
- assertNotNull("model did not have modelQueryAdapter", modelQueryAdapter);
-
- Class expected = outerQueryAdapter;
- Class actual = modelQueryAdapter.getClass();
- assertEquals("document's model query is not as expected", expected, actual);
-
- ModelQuery modelQuery = modelQueryAdapter.getModelQuery();
- expected = outerQueryClass;
- actual = modelQuery.getClass();
- assertEquals("model query adapter's model query is not as expected", expected, actual);
-
- ModelQuery nodeQuery = getEmbeddedModelQuery(doc);
- assertNotNull("node does not have a modelQueryAdapter", nodeQuery);
-
- expected = embeddedQueryClass;
- actual = nodeQuery.getClass();
- assertEquals("documents model query is not as expected", expected, actual);
-
-
-
- }
-
- /**
- * Method checkEmbeddedFactories.
- * @param model
- * @param clonedModel
- * @return boolean
- */
- private boolean checkForSameEmbeddedFactories(IStructuredModel model, IStructuredModel clonedModel) {
- boolean result = true;
-
-
- EmbeddedTypeHandler oldEmbeddedType = getEmbeddedType(model);
- EmbeddedTypeHandler newEmbeddedType = getEmbeddedType(clonedModel);
- // expect to be the same type
- if (!oldEmbeddedType.getClass().equals(newEmbeddedType.getClass())) {
- result = false;
- assertTrue(result);
- }
-
- List oldFactories = oldEmbeddedType.getAdapterFactories();
- List newFactories = newEmbeddedType.getAdapterFactories();
- result = checkFactoriesListForEquivalence(oldFactories, newFactories);
-
-
- return result;
- }
-
- private EmbeddedTypeHandler getEmbeddedType(IStructuredModel model) {
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("model did not have embedded handler", embeddedHandler);
-
- return embeddedHandler;
- }
-
-
- /**
- * Method checkFactoriesList.
- * @param factories
- * @param newFactories
- * @return boolean
- */
- private boolean checkFactoriesListForIdentity(List factories, List newFactories) {
- boolean result = true;
- if (factories.size() != newFactories.size()) {
- result = false;
- }
- else {
- // nned not be identical, nor same order
- // for (int i = 0; i < factories.size(); i++) {
- // if (!(factories.get(i) == newFactories.get(i))) {
- // result = false;
- // break;
- // }
- // }
- }
- return result;
- }
-
- private boolean checkFactoriesListForEquivalence(List factories, List newFactories) {
- boolean result = true;
- if (factories.size() != newFactories.size()) {
- result = false;
- }
- else {
- for (int i = 0; i < factories.size(); i++) {
- if (!factories.get(i).getClass().equals(newFactories.get(i).getClass())) {
- result = false;
- break;
- }
- }
- }
- return result;
- }
-
-
- public void testCreateStructuredModelHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
- factories = (ArrayList) factories.clone();
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are correct.
-
- ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- newFactories = (ArrayList) newFactories.clone();
-
- boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-
- assertTrue("newInstance of structured model is not correct", passed);
-
- // Now, assigning some content shouldn't change the factories
- clonedModel.getStructuredDocument().setText(this, "<sample> text");
- ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- twoFactories = (ArrayList) twoFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, newFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- private ModelQuery getEmbeddedModelQuery(Node node) {
- ModelQuery embeddedModelQuery = null;
-
- if (node instanceof INodeNotifier) {
- Node ownerNode = node.getOwnerDocument();
- if (ownerNode == null) {
- // then must be the document itself
- ownerNode = node;
- }
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) ownerNode).getAdapterFor(PageDirectiveAdapter.class);
- if (pageDirectiveAdapter != null) {
-
- String effectiveContentType = null;
- ModelQuery potentialModelQueryObject = null;
-
- String familyId = pageDirectiveAdapter.getEmbeddedType().getFamilyId();
- //if (ContentTypeFamilyForHTML.HTML_FAMILY.equals(familyId)) {
- if ("org.eclipse.wst.html.core.contentfamily.html".equals(familyId)) {
- effectiveContentType = "text/html";
- }
- else {
- effectiveContentType = pageDirectiveAdapter.getContentType();
- }
-
- potentialModelQueryObject = (ModelQuery) embeddedModelQueries.get(effectiveContentType);
-
- if (potentialModelQueryObject == null) {
- ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) node, ModelQueryAdapter.class);
- if (embeddedAdapter != null) {
- // we will cache one model query per content type
- embeddedModelQuery = embeddedAdapter.getModelQuery();
- embeddedModelQueries.put(effectiveContentType, embeddedModelQuery);
- }
- }
- else {
- embeddedModelQuery = potentialModelQueryObject;
- }
- }
- }
- return embeddedModelQuery;
- }
-
- public void testCreateStructuredModelJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
-
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%-- keep JSP page compiler from generating code that accesses the session --%>\n" +
- "<%@ page session=\"false\" contentType=\"text/xml; charset=ISO-8859-1\" %>\n" +
- "\n" +
- "<!-- load WPS portlet tag library and initialize objects -->\n" +
- "<%@ taglib uri=\"/WEB-INF/tld/portlet.tld\" prefix=\"portletAPI\" %>\n" +
- "<portletAPI:init /> \n" +
- "\n" +
- "<%-- Replace the name of the layout specified by the layoutName attribute of the canvas element below with the layout name for your portlet. --%>\n" +
- "<canvas xmlns =\"http://www.volantis.com/xmlns/marlin-cdm\" \n" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
- " layoutName=\"/sample_layout.mlyt\" \n" +
- " type=\"portlet\" >\n" +
- "\n" +
- "\n" +
- "<%-- Specify the pane name from your layout policy as the value for the name attribute of the pane element below --%>\n" +
- "<pane name=\"sample_pane\">\n" +
- " <p>Hello!</p>\n" +
- " <p>This is an XDIME <b>view mode</b> page . You have to edit this page to customize it for your own use.<br/><br/>\n" +
- " The source file for this page is \"/Web Content/testportlet_legacy/jsp/xdime/TemplateLegacyPortletView.jsp\".\n" +
- "</p>\n" +
- "\n" +
- "<br/>\n" +
- "This is image 1 \n" +
- "<img src=\"/paw.mimg\" alt=\"noimg\" />\n" +
- "\n" +
- "<br/>\n" +
- "This is image 2 \n" +
- "<img src=\"paw.mimg\" alt=\"noimg\" />\n" +
- "\n" +
- "</pane>\n" +
- "</canvas>");
-
- checkEmbeddedType(model, EmbeddedXML.class);
- checkModelQuery(model, JSPModelQueryImpl.class);
- checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, XMLModelQueryImpl.class);
-
-
-
-
- }
-
- public void testCreateStructuredModelJSPWML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
-
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/vnd.wap.wml\" %>\n" +
- "\n" +
- " <jsp:useBean id=\"beanInstanceName\" scope=\"session\" class=\"package.class\" />\n" +
- " <jsp:getProperty name=\"beanInstanceName\" property=\"*\" />\n" +
- "\n" +
- " <?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
- " <!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.3//EN\" \"http://www.wapforum.org/DTD/wml13.dtd\">\n" +
- " <wml>\n" +
- "\n" +
- " <template>\n" +
- " <!-- Template implementation here. -->\n" +
- " <do type=\"prev\"><prev/></do>\n" +
- " </template>\n" +
- "\n" +
- " <%\n" +
- " if (session.isNew() || session.getAttribute(\"userid\")==null ) {\n" +
- " %>\n" +
- " <card id=\"card1\" title=\"Card #1\">\n" +
- "\n" +
- " <do type=\"unknown\" label=\"Next\">\n" +
- " <go href=\"#card2\"/>\n" +
- " </do>\n" +
- " <p align=\"center\">\n" +
- " <big><b>First Card</b></big>\n" +
- " </p>\n" +
- " </card>\n" +
- "\n" +
- " <%\n" +
- " } else {\n" +
- " %>\n" +
- " <card id=\"card2\" title=\"Card #2\">\n" +
- "\n" +
- " <p align=\"center\">\n" +
- " <big><b> <%= beanInstanceName.getUserid() %> </b></big>\n" +
- " </p>\n" +
- " </card>\n" +
- " <%\n" +
- " }\n" +
- " %>\n" +
- " </wml>");
-
- checkEmbeddedType(model, EmbeddedHTML.class);
- checkModelQuery(model, JSPModelQueryImpl.class);
- checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-
-
-
-
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
deleted file mode 100644
index 7adfab6a0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-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.modelhandler.ModelHandlerUtility;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- * @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 TestModelEmbeddedContentType extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestModelEmbeddedContentType(String name) {
- super(name);
- }
-
- public static void main(String[] args) {
- }
-
- public static Test getTest() {
- return new TestModelEmbeddedContentType("testStructuredModelEmbeddedJSPChange");
- }
-
- protected void checkEmbeddedType(IStructuredModel clonedModel, Object expectedType) {
- Document doc = ((IDOMModel) clonedModel).getDocument();
- PageDirectiveAdapter embeddedTypeAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
- assertNotNull("cloned model did not have embedded adapter", embeddedTypeAdapter);
-
- EmbeddedTypeHandler embeddedHandler = embeddedTypeAdapter.getEmbeddedType();
- assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
- assertTrue("cloned model embeddedHandler is wrong type", embeddedHandler.equals(expectedType));
- }
-
- public void testStructuredModelEmbeddedXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- assertTrue("model could not be created!", model != null);
-
- // XML should NOT have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
- assertTrue("embededHanlder should be null for XML", embeddedHandler == null);
-
- }
-
- public void testStructuredModelEmbeddedHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- // should NOT have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
- assertTrue("embededHanlder should be null for HTML", embeddedHandler == null);
-
- }
-
- protected IStructuredModel doStructuredModelEmbeddedJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // should have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter embeddedHandler = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
- assertTrue("embededHanlder should NOT be null for JSP", embeddedHandler != null);
-
- // embedded type should be HTML since no content
- checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
- String testContent = "<%@ page contentType=\"text/html\" %>";
- model.getStructuredDocument().replaceText(this, 0, 0, testContent);
- assertTrue("reinit should NOT be needed in this case", !model.isReinitializationNeeded());
-
- // embedded type should STILL be HTML since no contentType was
- // text/html
- checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
- return model;
- //
- }
-
- public void testStructuredModelEmbeddedJSP() throws IOException {
- doStructuredModelEmbeddedJSP();
- }
-
- public void testStructuredModelEmbeddedJSPChange() throws IOException {
-
- // start with the full test case
- IStructuredModel model = doStructuredModelEmbeddedJSP();
- // change "html" to "xml"
- model.getStructuredDocument().replaceText(this, 27, 4, "xml");
- // with reinit in XML model ... its already been re-initialized
- // assertTrue("reinit SHOULD be needed in this case",
- // model.isReiniitializationNeeded());
-
- if (model.isReinitializationNeeded()) {
- model.reinit();
- }
-
- // embedded type should now be XML
- checkEmbeddedType(model, ModelHandlerUtility.getEmbeddedContentTypeFor("text/xml"));
-
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/breakpointproviders/BreakpointProvidersTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/breakpointproviders/BreakpointProvidersTest.java
deleted file mode 100644
index acd31bd6a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/breakpointproviders/BreakpointProvidersTest.java
+++ /dev/null
@@ -1,45 +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.ui.tests.breakpointproviders;
-
-import org.eclipse.jst.jsp.ui.internal.breakpointproviders.ClassPatternRegistry;
-
-import junit.framework.TestCase;
-
-public class BreakpointProvidersTest extends TestCase {
-
- /**
- * Tests the case of a single provider of additional class patterns
- */
- public void testAdditionalProviders() {
- // Test
- final String pattern = ClassPatternRegistry.getInstance().getClassPattern("org.eclipse.jst.jsp.ui.tests.type");
- assertNotNull("Class pattern for 'type' shouldn't be null", pattern);
- assertEquals("Class patterns are not equal", "*foo,*bar", pattern);
- }
-
- /**
- * Tests the case of no provider for a content type
- */
- public void testNoAdditionalProviders() {
- final String pattern = ClassPatternRegistry.getInstance().getClassPattern("org.eclipse.jst.jsp.ui.tests.notype");
- assertNull("There should be no providers for 'notype'", pattern);
- }
-
- /**
- * Tests the case of multiple providers for a content type
- */
- public void testMultipleProviders() {
- final String pattern = ClassPatternRegistry.getInstance().getClassPattern("org.eclipse.jst.jsp.ui.tests.multitype");
- assertNotNull("Class pattern for 'type' shouldn't be null", pattern);
- assertEquals("Class patterns are not equal", "*foo,*bar,*baz", pattern);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
deleted file mode 100644
index 79360966c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
+++ /dev/null
@@ -1,231 +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.ui.tests.contentassist;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.ui.internal.contentassist.BeanInfoProvider;
-import org.eclipse.jst.jsp.ui.internal.contentassist.IJavaPropertyDescriptor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-
-/**
- * This class tests the BeanInfoProvider. Currently test workspace MUST point
- * to the specific one for this test.
- *
- * @author pavery
- */
-public class BeanInfoProviderTest extends TestCase {
- class OverwriteNone implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return IOverwriteQuery.ALL;
- }
- }
-
- private IResource fResource;
- private BeanInfoProvider fProvider;
- private HashSet fAlreadyOpen = new HashSet();
- private ProjectUnzipUtility fProjUtil = null;
- private boolean fIsSetup = false;
-
- public BeanInfoProviderTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.fIsSetup) {
- initializeResource();
- this.fIsSetup = true;
- }
- }
-
- private void initializeResource() throws Exception {
- fProjUtil = new ProjectUnzipUtility();
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
- // platform location may be null -- depends on "mode" of platform
- if (platformLocation != null) {
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "beaninfo_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject("BEANINFO");
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String workspaceRelativeLocation = "/BEANINFO/BEAN_TESTS/beanInfo_test.jsp";
- fResource = root.getFile(new Path(workspaceRelativeLocation));
- IJavaProject javaProj = JavaCore.create(fResource.getProject());
- openPath(javaProj);
- }
- }
-
- protected File getSourceDirectory(String absoluteSourceDirectoryPath) {
- File sourceDirectory = new File(absoluteSourceDirectoryPath);
- if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
- return null;
- }
- return sourceDirectory;
- }
-
- private void openPath(IJavaProject javaProj) {
- try {
- if (javaProj.exists() && !javaProj.isOpen()) {
- javaProj.open(null);
- }
- IPackageFragmentRoot root = javaProj.getPackageFragmentRoot(fResource.getProject());
- if (!root.isOpen())
- root.open(null);
- IPackageFragment frag = getPackageFragment(root, "BEAN_TESTS");
- openAll(frag);
- frag = getPackageFragment(root, "org");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui.tests");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- }
- catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-
- private IPackageFragment getPackageFragment(IPackageFragmentRoot root, String fragmentName) throws JavaModelException {
- IPackageFragment frag = null;
- IJavaElement[] children = root.getChildren();
- for (int i = 0; i < children.length; i++) {
- if (children[i].getElementName().equals(fragmentName)) {
- frag = (IPackageFragment) children[i];
- break;
- }
- }
- return frag;
- }
-
- private void openAll(IJavaElement javaElem) throws JavaModelException {
- if (javaElem instanceof IOpenable) {
- if (!((IOpenable) javaElem).isOpen())
- ((IOpenable) javaElem).open(null);
- }
- if (javaElem instanceof IParent && ((IParent) javaElem).hasChildren()) {
- IJavaElement[] children = ((IParent) javaElem).getChildren();
- for (int i = 0; i < children.length; i++) {
- if (!fAlreadyOpen.contains(children[i].getElementName())) {
- fAlreadyOpen.add(children[i].getElementName());
- openAll(children[i]);
- }
- }
- }
- }
-
- public void testAll() {
- beanOnClasspath();
- beanInProject();
- }
-
- private void beanOnClasspath() {
- // pa_TODO don't use JButton, properties change
- // use something more static
- IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "javax.swing.JButton");
- // assertEquals("Number of properties for JButton:", 122, descriptors.length);
- assertNotNull("descriptors shouldn't be null", descriptors);
-
- // List getOnly = new ArrayList();
- // List setOnly = new ArrayList();
- // List both = new ArrayList();
- // IJavaPropertyDescriptor jpd = null;
- // for (int i = 0; i < descriptors.length; i++) {
- // jpd = descriptors[i];
- // if (jpd.getReadable() && jpd.getWriteable())
- // both.add(jpd);
- // else if (jpd.getReadable() && !jpd.getWriteable())
- // getOnly.add(jpd);
- // else
- // setOnly.add(jpd);
- // }
- // assertEquals("Number of getOnly properties:", 62, getOnly.size());
- //assertEquals("Number of setOnly properties:", 0, setOnly.size());
- //assertEquals("Number of get & set properties that:", 59,
- // both.size());
- }
-
- private void beanInProject() {
- IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "org.eclipse.jst.jsp.ui.tests.BaseAlbumCollectionBean");
- assertEquals("Number of properties for BaseAlbumCollectionBean:", 4, descriptors.length);
- List getOnly = new ArrayList();
- List setOnly = new ArrayList();
- List both = new ArrayList();
- IJavaPropertyDescriptor jpd = null;
- for (int i = 0; i < descriptors.length; i++) {
- jpd = descriptors[i];
- if (jpd.getReadable() && jpd.getWriteable())
- both.add(jpd);
- else if (jpd.getReadable() && !jpd.getWriteable())
- getOnly.add(jpd);
- else
- setOnly.add(jpd);
- }
- assertEquals("Number of getOnly properties:", 1, getOnly.size());
- assertEquals("Number of setOnly properties:", 1, setOnly.size());
- assertEquals("Number of get & set properties that:", 2, both.size());
- // get only
- jpd = (IJavaPropertyDescriptor) getOnly.get(0);
- assertEquals("get readable for get only property: ", true, jpd.getReadable());
- assertEquals("get writable for get only property:", false, jpd.getWriteable());
- assertEquals("name for get only property", "numCds", jpd.getDisplayName());
- assertEquals("type for get only property", "int", jpd.getDeclaredType());
- // set only
- jpd = (IJavaPropertyDescriptor) setOnly.get(0);
- assertEquals("get readable for set only property: ", false, jpd.getReadable());
- assertEquals("get writable for set only property:", true, jpd.getWriteable());
- assertEquals("name for set only property", "cds", jpd.getDisplayName());
- assertEquals("type for set only property", "String[]", jpd.getDeclaredType());
- // both
- jpd = (IJavaPropertyDescriptor) both.get(0);
- assertEquals("get readable for both property: ", true, jpd.getReadable());
- assertEquals("get writable for both property:", true, jpd.getWriteable());
- }
-
- private BeanInfoProvider getProvider() {
- if (fProvider == null)
- fProvider = new BeanInfoProvider();
- return fProvider;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java
deleted file mode 100644
index f35d66e1b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPELContentAssistTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsp.ui.internal.contentassist.JSPELContentAssistProcessor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class JSPELContentAssistTest extends TestCase {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private String previousWTPAutoTestNonINteractivePropValue = null;
-
- private static final String TEST_PROJECT_NAME = "testJSPELContentAssist";
- private static final String CONTENT_DIR = "WebContent";
-
- private static final String STRUCTURED_EDITOR_TYPE = "org.eclipse.wst.sse.ui.StructuredTextEditor.test";
-
- private static final String FILE_0_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test0.jsp";
- private static final String FILE_1_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test1.jsp";
- private static final String FILE_2_PATH = CONTENT_DIR + IPath.SEPARATOR + "Test2.jsp";
-
- private static final String[] TEST_0_EXPECTED_PROPS = {
- "errorData", "exception", "expressionEvaluator", "out", "page", "request", "response",
- "servletConfig", "servletContext", "session", "variableResolver"};
- private static final String[] TEST_1_EXPECTED_PROPS = {"request", "response"};
- private static final String[] TEST_2_EXPECTED_PROPS = {"request"};
-
- private static final int TEST_0_DOC_LOC = 371;
- private static final int TEST_1_DOC_LOC = 372;
- private static final int TEST_2_DOC_LOC = 374;
-
- private IProject project;
- private IWorkbenchPage page;
-
- public JSPELContentAssistTest() {
- super("JSP EL Content Assist Tests");
- }
-
- public JSPELContentAssistTest(String name) {
- super(name);
- }
-
- /**
- * Do set up, ignore all pop ups during test
- */
- protected void setUp() throws Exception {
- super.setUp();
- initializeResource();
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-
- if (noninteractive != null) {
- previousWTPAutoTestNonINteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonINteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (previousWTPAutoTestNonINteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonINteractivePropValue);
- }
-
- try {
- this.project.delete(true, null);
- } catch (Exception e ) {
- //ignore, this is not part of the test, just useful cleanup
- }
- }
-
- /**
- * Set up the project and workbench
- *
- * @throws Exception
- */
- private void initializeResource() throws Exception {
- ProjectUnzipUtility fProjUtil = new ProjectUnzipUtility();
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
- // platform location may be null -- depends on "mode" of platform
- if (platformLocation != null) {
- File zipFile = FileUtil.makeFileFor(
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER,
- TEST_PROJECT_NAME + ProjectUnzipUtility.ZIP_EXTENSION,
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject(TEST_PROJECT_NAME);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- this.project = root.getProject(TEST_PROJECT_NAME);
-
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- this.page = workbenchWindow.getActivePage();
- }
- }
-
- public void testELProposals_0() throws Exception {
- ICompletionProposal[] props = getCompletionProposals(FILE_0_PATH, TEST_0_DOC_LOC);
- verifyProposals(props, TEST_0_EXPECTED_PROPS);
- }
-
- public void testELProposals_1() throws Exception {
- ICompletionProposal[] props = getCompletionProposals(FILE_1_PATH, TEST_1_DOC_LOC);
- verifyProposals(props, TEST_1_EXPECTED_PROPS);
- }
-
- public void testELProposals_2() throws Exception {
- ICompletionProposal[] props = getCompletionProposals(FILE_2_PATH, TEST_2_DOC_LOC);
- verifyProposals(props, TEST_2_EXPECTED_PROPS);
- }
-
- public void testELChosenProposalCompletion() throws Exception {
- IFile file = getFile(FILE_1_PATH);
- ICompletionProposal[] props = getCompletionProposals(file, TEST_1_DOC_LOC);
- verifyProposals(props, TEST_1_EXPECTED_PROPS);
-
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- IDocument document = viewer.getDocument();
- props[0].apply(document);
-
- String inserted = document.get(TEST_1_DOC_LOC-1, TEST_1_EXPECTED_PROPS[0].length());
- assertEquals(
- "The completed proposal " + inserted + " does not match the expected completion " + TEST_1_EXPECTED_PROPS[0],
- TEST_1_EXPECTED_PROPS[0], inserted);
-
- editor.doSave(null);
- }
-
- /**
- * Get a file contained in the project
- *
- * @param filePath
- * @return
- */
- private IFile getFile(String filePath) {
- IFile retFile = this.project.getFile(filePath);
-
- assertTrue(retFile + " testing file does not exist.", retFile.exists());
-
- return retFile;
- }
-
- /**
- * use a viewer and document location to generate completion proposals for that location in the viewer
- *
- * @param filePath
- * @param documentLocation
- * @return
- * @throws PartInitException
- */
- private ICompletionProposal[] getCompletionProposals(String filePath, int documentLocation) throws PartInitException {
- IFile file = getFile(filePath);
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- return getCompletionProposals(viewer, documentLocation);
- }
-
-
- /**
- * use a viewer and document location to generate completion proposals for that location in the viewer
- *
- * @param file
- * @param documentLocation
- * @return
- * @throws PartInitException
- */
- private ICompletionProposal[] getCompletionProposals(IFile file, int documentLocation) throws PartInitException {
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- return getCompletionProposals(viewer, documentLocation);
- }
-
- /**
- * use a viewer and document location to generate completion proposals for that location in the viewer
- *
- * @param viewer
- * @param documentLocation
- * @return
- * @throws PartInitException
- */
- private ICompletionProposal[] getCompletionProposals(StructuredTextViewer viewer, int documentLocation) throws PartInitException {
- JSPELContentAssistProcessor processor = new JSPELContentAssistProcessor();
- ICompletionProposal[] props = processor.computeCompletionProposals(viewer, documentLocation);
-
- return props;
- }
-
- /**
- * Given a file returns a viewer for that file
- *
- * @param file
- * @return
- * @throws PartInitException
- */
- private StructuredTextEditor getEditor(IFile file) throws PartInitException {
- IEditorInput input = new FileEditorInput(file);
- IEditorPart part = this.page.openEditor(input, STRUCTURED_EDITOR_TYPE, true);
-
- assertTrue("Unable to open structured text editor", part instanceof StructuredTextEditor);
-
- return (StructuredTextEditor) part;
- }
-
- /**
- * Given generated proposals be sure that all of the epxted proposals are contained in the generated ones
- * @param props
- * @param expectedProps
- */
- private void verifyProposals(ICompletionProposal[] props, String[] expectedProps) {
- for(int i = 0; i < expectedProps.length; ++i) {
- assertTrue("The expected proposal \"" + expectedProps[i] + "\" was not given",
- findPropsoal(props, expectedProps[i]));
- }
- }
-
- /**
- * Given an expected proposal string check to be sure it exists in the given proposals
- *
- * @param props
- * @param expectedProp
- * @return
- */
- private boolean findPropsoal(ICompletionProposal[] props, String expectedProp) {
- boolean found = false;
-
- for(int i = 0; i < props.length && !found; ++i) {
- found = props[i].getDisplayString().startsWith(expectedProp);
- }
-
- return found;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
deleted file mode 100644
index a872a0630..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
+++ /dev/null
@@ -1,119 +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.ui.tests.contentassist;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationUtil;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-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.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * This class tests the sed JSPJavaTranslator class
- *
- * @author pavery
- */
-public class JSPJavaTranslatorTest extends TestCase {
-
- public JSPJavaTranslatorTest(String name) {
- super(name);
- }
-
- public void testAllFiles() throws UnsupportedEncodingException, IOException {
- // this test is for PMR: 91930 CMVC:218469
- testJSPInJavascript("testfiles/jspInJavascript.jsp");
- }
-
- void testJSPInJavascript(String filename) throws UnsupportedEncodingException, IOException {
- IStructuredModel sm = getStructuredModelForRead(filename);
- if (sm != null) {
- IDOMNode xmlNode = (IDOMNode) sm.getIndexedRegion(0);
-
- if (xmlNode != null) {
- JSPTranslator jspt = new JSPTranslator();
- jspt.reset(xmlNode, null);
- // int sourceTextPos = text.indexOf("<%= testJspString") + 17;
- // jspt.setSourceCursor(sourceTextPos); // right after the
- // text
- jspt.translate();
- String translation = jspt.getTranslation().toString();
- // offsets are found using JSPTranslation now
- // int translatedCursorPosition = jspt.getCursorPosition();
- // assertEquals("incorrect cursor position >" +
- // translatedCursorPosition, 519, translatedCursorPosition);
- // assertEquals("translation was incorrect", "testJspString",
- // translation.substring(519, 532));
- int cursorStart = translation.indexOf("out.print( testJspString );" ) + 10;
- assertEquals("incorrect cursor position >" + cursorStart, 914, cursorStart);
- }
- sm.releaseFromRead();
- }
- }
-
- public void testMultipleJSPSectionsInJavascript() throws Exception {
- String filename = "testfiles/jspInJavascript2.jsp";
- IStructuredModel sm = getStructuredModelForRead(filename);
- assertNotNull("couldn't load JSP for test", sm);
- JSPTranslationUtil translationUtil = new JSPTranslationUtil(sm.getStructuredDocument());
-
- String javaText = StringUtils.replace(translationUtil.getTranslation().getJavaText(), "\r\n", "\n");
- javaText = StringUtils.replace(javaText, "\r", "\n");
- sm.releaseFromRead();
-
- String translatedText = loadContents("testfiles/jspInJavascript2.javasource");
- assertEquals("translated contents are not as expected", translatedText, javaText);
- }
-
- /**
- * @return
- */
- private String loadContents(String filename) throws IOException {
- Reader reader = new InputStreamReader(getClass().getResourceAsStream(filename));
- char[] readBuffer = new char[2048];
- int n = reader.read(readBuffer);
- StringBuffer s = new StringBuffer();
- while (n > 0) {
- s.append(readBuffer, 0, n);
- n = reader.read(readBuffer);
- }
-
- String source = StringUtils.replace(s.toString(), "\r\n", "\n");
- source = StringUtils.replace(source, "\r", "\n");
- return source;
- }
-
- /**
- * IMPORTANT whoever calls this must releaseFromRead after they are done
- * using it.
- *
- * @param filename
- * @return
- * @throws IOException
- * @throws UnsupportedEncodingException
- */
- protected IStructuredModel getStructuredModelForRead(String filename) throws UnsupportedEncodingException, IOException {
- // create model
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
- return sModel;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
deleted file mode 100644
index ac3b13b7d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ /dev/null
@@ -1,438 +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.ui.tests.contentassist;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jst.jsp.core.internal.domdocument.DOMModelForJSP;
-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.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.JSP11Namespace;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * This class unit tests the sed JSPTranslation mechanism.
- * That includes JSPTranslationAdapterFactory, JSPTranslationAdapter, and JSPTranslation.
- * It uses the jsp_include_test.jsp, because of the more complicated translation and offsets.
- *
- * @author pavery
- */
-public class JSPTranslationTest extends TestCase {
-
- private ProjectUnzipUtility fProjUtil = null;
- private boolean isSetup = false;
-
- private HashMap fXMLJSPPositions;
-
- public JSPTranslationTest(String name) {
- super(name);
- }
- public JSPTranslationTest() {
- super("JSPTranslationTest");
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
- fProjUtil = new ProjectUnzipUtility();
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "includes_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject("INCLUDES_TESTS");
- }
-
- public void testPageDirectiveSessionVariableInFile() throws JavaModelException {
- String jspTestFilePathString = "INCLUDES_TESTS/test189924.jsp";
- ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/test189924.jsp", jspTestFilePathString);
- IPath jspTestFilePath = new Path(jspTestFilePathString);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-
- verifyTranslationHasNoSessionVariables(file);
- }
- private void verifyTranslationHasNoSessionVariables(IFile file) throws JavaModelException {
- IDOMModel model = null;
- try {
- model = (IDOMModel) getStructuredModelForRead(file);
- setupAdapterFactory(model);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- ICompilationUnit cu = adapter.getJSPTranslation().getCompilationUnit();
- cu.makeConsistent(new NullProgressMonitor());
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- IJavaElement[] members = types[i].getChildren();
- for (int k = 0; k < members.length; k++) {
- // check fields for name "session"
- if (members[k].getElementType() == IJavaElement.FIELD) {
- assertFalse("field named \"session\" exists", members[k].getElementName().equals(JSP11Namespace.ATTR_NAME_SESSION));
- }
- /*
- * check "public void
- * _jspService(javax.servlet.http.HttpServletRequest
- * request, javax.servlet.http.HttpServletResponse
- * response)" for local variables named "session"
- */
- else if (members[k].getElementType() == IJavaElement.METHOD && members[k].getElementName().startsWith("_jspService")) {
- ICompilationUnit compilationUnit = ((IMethod) members[k]).getCompilationUnit();
- compilationUnit.makeConsistent(new NullProgressMonitor());
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(cu);
- ASTNode node = parser.createAST(null);
- node.accept(new ASTVisitor() {
- public boolean visit(VariableDeclarationStatement node) {
- Iterator fragments = node.fragments().iterator();
- while (fragments.hasNext()) {
- VariableDeclarationFragment fragment = (VariableDeclarationFragment) fragments.next();
- if (fragment.getName().getFullyQualifiedName().equals(JSP11Namespace.ATTR_NAME_SESSION)) {
- String typeName = ((SimpleType) node.getType()).getName().getFullyQualifiedName();
- assertFalse("local variable of type \"javax.servlet.http.HttpSession\" and named \"session\" exists", typeName.equals("javax.servlet.http.HttpSession"));
- }
- }
- return super.visit(node);
- }
- });
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- public void testPageDirectiveSessionVariableInSegment() throws JavaModelException {
- String jspTestFilePathString = "INCLUDES_TESTS/test189924.jsp";
- ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/test189924.jsp", jspTestFilePathString);
- jspTestFilePathString = "INCLUDES_TESTS/includer.jsp";
- ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/includer.jsp", jspTestFilePathString);
- IPath jspTestFilePath = new Path(jspTestFilePathString);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-
- verifyTranslationHasNoSessionVariables(file);
- }
-
- public void testTranslatePositions() {
-
- IDOMModel model = getIncludeTestModelForRead();
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- try {
- HashMap java2jsp = translation.getJava2JspMap();
- assertEquals("java2jsp map size:", 11, java2jsp.size());
-
- HashMap jsp2java = translation.getJsp2JavaMap();
- assertEquals("jsp2java map size:", 3, jsp2java.size());
-
- // some test positions (out.print("" + | );)
-
- // we need to ignore the classname length in our comparisons
- // with java offsets that we get from the translation
- // since it can vary depending on workspace location
- int classnameLength = translation.getClassname().length();
-
- int jspTestPosition = translation.getJspText().indexOf("<%= ") + 4;
- int javaOffset = translation.getJavaOffset(jspTestPosition) - classnameLength;
- assertEquals("JSPTranslation java offset:", 1277, javaOffset);
-
- // (<%= | %>)
- int javaTestPostition = translation.getJavaText().indexOf("out.print( );") + 10;
- // dont' need to worry about classname length here because we are comparing
- // with a position in the JSP document (which doesn't contain classname)
- int jspOffset = translation.getJspOffset(javaTestPostition);
- assertEquals("JSPTranslation jsp offset:", 564, jspOffset);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
-
- public void testJSPTranslationText() {
-
- IDOMModel model = getIncludeTestModelForRead();
- ScannerUnitTests.verifyLengths(model, model.getStructuredDocument().get());
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- // named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_text.bin");
- String knownTranslationText = loadChars(in);
- try {
- // improvements: may need finer tuned text compares later
- // for different types of translations (includes, xml-jsp in script, attributes, etc...)
- String text = translation.getJavaText();
-
- assertNotNull("JSP translation text:", text);
- assertEquals("JSP translation text does not match expected", knownTranslationText, text);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- public void testJSPTranslationAdapter() {
- IDOMModel model = getIncludeTestModelForRead();
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- try {
- IJavaProject proj = adapter.getJavaProject();
- assertNotNull("couldn't get java project:" + proj);
-
- translation = adapter.getJSPTranslation();
- assertNotNull("couldn't get translation:", translation);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Makes sure both beans are translated even though they are
- * right next to each other with no space.
- *
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=103004
- */
- public void testUseBeanNoSpace() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/useBean_tester.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- String javaText = translation.getJavaText();
- boolean bean1 = javaText.indexOf("javax.swing.JButton x = null;") != -1;
- boolean bean2 = javaText.indexOf("javax.swing.JButton y = null;") != -1;
- assertTrue(bean1);
- assertTrue(bean2);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- /**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86382
- */
- public void testXMLJSPTranslationText() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- String javaText = translation.getJavaText();
-
- // named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_xml_jsp.bin");
- String knownTranslationText = loadChars(in);
-
- assertEquals(knownTranslationText, javaText);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- public void testXMLJSPMapping() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- HashMap jsp2java = translation.getJsp2JavaMap();
- Object[] jspRanges = jsp2java.keySet().toArray();
- Position jspPos = null;
- Position javaPos = null;
- for (int i = 0; i < jspRanges.length; i++) {
- jspPos = (Position)jspRanges[i];
- javaPos = (Position)jsp2java.get(jspPos);
- //System.out.println("jsp:" + printPos(jspPos) + " >> java:" + printPos(javaPos));
- checkPosition(jspPos, javaPos);
- }
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- public void testXMLJSPCDATAText() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/cdata/cdata.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- String transText = translation.getJavaText();
-
-// named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_xml_jsp_cdata.bin");
- String knownText = loadChars(in);
-
- assertEquals(knownText, transText);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- private void checkPosition(Position jspPos, Position javaPos) {
-
- HashMap expected = getXMLJSPPositions();
- Object[] keys =expected.keySet().toArray();
- Position expectedJspPos= null;
- Position expectedJavaPos = null;
- boolean found = false;
- for (int i = 0; i < keys.length && !found; i++) {
- expectedJspPos = (Position)keys[i];
- if(jspPos.equals(expectedJspPos)) {
- expectedJavaPos = (Position)expected.get(expectedJspPos);
- found = true;
- }
- }
- assertTrue("expected JSP position missing: " + jspPos, found);
- assertNotNull("no expected java position for jspPos: " + printPos(jspPos), expectedJavaPos);
- assertEquals("unexpected java position for jsp position "+printPos(jspPos)+" was:" + printPos(javaPos) + " but expected:" + printPos(expectedJavaPos), expectedJavaPos, javaPos);
- }
- private String printPos(Position pos) {
- return pos != null ? "[" + pos.offset +":"+ pos.length + "]" : "null";
- }
- private HashMap getXMLJSPPositions() {
- if(fXMLJSPPositions == null) {
- fXMLJSPPositions = new HashMap();
- fXMLJSPPositions.put(new Position(882,52), new Position(1242,31));
- fXMLJSPPositions.put(new Position(961,7), new Position(1300,7));
- fXMLJSPPositions.put(new Position(1018,14), new Position(89,14));
- fXMLJSPPositions.put(new Position(640,2), new Position(1184,2));
- fXMLJSPPositions.put(new Position(406,24), new Position(1013,24));
- fXMLJSPPositions.put(new Position(685,19), new Position(1193,19));
- fXMLJSPPositions.put(new Position(650,26), new Position(1157,26));
- fXMLJSPPositions.put(new Position(563,9), new Position(1119,9));
- fXMLJSPPositions.put(new Position(461,23), new Position(1038,23));
- fXMLJSPPositions.put(new Position(522,8), new Position(1098,8));
- fXMLJSPPositions.put(new Position(323,44), new Position(277,45));
- fXMLJSPPositions.put(new Position(245,43), new Position(232,44));
- }
- return fXMLJSPPositions;
- }
-
- private static String loadChars(InputStream input) {
-
- StringBuffer s = new StringBuffer();
- try {
- int c = -1;
- while ((c = input.read()) >= 0) {
- if (c > 255)
- break;
- s.append((char) c);
- }
- input.close();
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while loading :");
- System.out.println(e);
- }
- return s.toString();
- }
-
- /**
- * add the factory for JSPTranslationAdapter here
- * @param sm
- */
- private void setupAdapterFactory(IStructuredModel sm) {
- ModelHandlerForJSP.ensureTranslationAdapterFactory(sm);
- }
-
- /**
- * IMPORTANT - release model (model.releaseFromRead()) after use
- * @param file
- * @return
- */
- private IStructuredModel getStructuredModelForRead(IFile file) {
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager.getModelForRead(file);
- }
- catch (IOException ioex) {
- System.out.println("couldn't open file > " + file);
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private IDOMModel getIncludeTestModelForRead() {
-
- IPath jspTestFilePath = new Path("INCLUDES_TESTS/jsp_include_test.jsp");
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
- IDOMModel xmlModel = (IDOMModel) getStructuredModelForRead(file);
- setupAdapterFactory(xmlModel);
- return xmlModel;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java
deleted file mode 100644
index bb6e4eb49..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java
+++ /dev/null
@@ -1,449 +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.jsp
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Assert;
-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.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-
-public class TestJSPContentAssistComputers extends TestCase {
- /** The name of the project that all of these tests will use */
- private static final String PROJECT_NAME = "TestJSPContentAssistComputers";
-
- private static final String CONTENT_DIR = "WebContent";
-
- /** The project that all of the tests use */
- private static IProject fProject;
-
- /**
- * Used to keep track of the already open editors so that the tests don't go through
- * the trouble of opening the same editors over and over again
- */
- private static Map fFileToEditorMap = new HashMap();
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public TestJSPContentAssistComputers() {
- super("Test JSP Content Assist Computers");
- }
-
- /**
- * <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 TestJSPContentAssistComputers(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(TestJSPContentAssistComputers.class, "Test JSP Content Assist Computers");
- return new TestJSPContentAssistComputersSetup(ts);
- }
-
- public void testEmptyDocument() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {14, 7, 6, 1, 0, 14};
- runProposalTest("test0.jsp", 0, 0, expectedProposalCounts);
- }
-
- public void testAfterXMLDeclarationBeforeHTMLTagProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {18, 10, 8, 0, 0, 18};
- runProposalTest("test1.jsp", 1, 0, expectedProposalCounts);
- }
-
- public void testAfterXMLDeclarationBeforeEmptyDocProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {19, 10, 8, 1, 0, 19};
- runProposalTest("test2.jsp", 1, 0, expectedProposalCounts);
- }
-
- public void testAfterJSPTaglibsBeforeDocType() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {18, 10, 8, 0, 0, 18};
- runProposalTest("test1.jsp", 6, 0, expectedProposalCounts);
- }
-
- public void testBodyTagChildElementProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {95, 10, 8, 64, 13, 95};
- runProposalTest("test1.jsp", 14, 0, expectedProposalCounts);
- }
-
- public void testPTagChildElementProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {72, 10, 8, 41, 13, 72};
- runProposalTest("test1.jsp", 16, 0, expectedProposalCounts);
- }
-
- public void testDIVTagChildElementProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {95, 10, 8, 64, 13, 95};
- runProposalTest("test1.jsp", 20, 0, expectedProposalCounts);
- }
-
- public void testCommentTagChildElementProposals() throws Exception {
- //default, HTML templates, HTML tags, JSP proposals, default
- int[] expectedProposalCounts = new int[] {1, 0, 0, 1, 1};
- runProposalTest("test1.jsp", 25, 0, expectedProposalCounts);
- }
-
- public void testJSPRegionProposals() throws Exception {
- //default, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {60, 0, 60, 60};
- runProposalTest("test1.jsp", 28, 0, expectedProposalCounts);
- }
-
- public void testDIVTagAttributeNameProposals() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {19, 1, 0, 18, 0, 19};
- runProposalTest("test1.jsp", 19, 5, expectedProposalCounts);
- }
-
- public void testELProposals() throws Exception {
- //default, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {12, 0, 12, 12};
- runProposalTest("test1.jsp", 33, 15, expectedProposalCounts);
- }
-
- public void testELInAttributeProposals() throws Exception {
- //default, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {12, 0, 12, 12};
- runProposalTest("test1.jsp", 31, 24, expectedProposalCounts);
- }
-
- public void testJSPTagAttributeNameProposals() throws Exception {
- //default, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {6, 4, 2, 0, 0, 6};
- runProposalTest("test1.jsp", 41, 15, expectedProposalCounts);
- }
-
- public void testHTMLTagAttributeValueProposals() throws Exception {
- //default, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {15, 2, 0, 0, 13, 15};
- runProposalTest("test3.jsp", 8, 10, expectedProposalCounts);
- }
-
- public void testJSPTagProposalsAtDocumentRootLevel() throws Exception {
- //default, jsp templates, html templates, html tags, jsp, default
- int[] expectedProposalCounts = new int[] {36, 10, 8, 1, 17, 36};
- runProposalTest("test6.jsp", 2, 0, expectedProposalCounts);
- }
-
- public void testFinishClosingHTMLTagNamePropsoals() throws Exception {
- //default, jsp template, html template, html, jsp, default
- int[] expectedProposalCounts = new int[] {2, 1, 0, 1, 0, 2};
- runProposalTest("test4.jsp", 11, 9, expectedProposalCounts);
- }
-
- public void testFinishClosingHTMLTagPropsoals() throws Exception {
- //default, jsp template, html template, html, jsp, default
- int[] expectedProposalCounts = new int[] {3, 1, 0, 2, 0, 3};
- runProposalTest("test4.jsp", 12, 0, expectedProposalCounts);
- }
-
- public void testFinishClosingJSPTagNamePropsoals() throws Exception {
- //default, xml template, html tag, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {1, 0, 0, 1, 0, 1};
- runProposalTest("test5.jsp", 11, 9, expectedProposalCounts);
- }
-
- public void testFinishClosingJSPTagPropsoals() throws Exception {
- //default, xml template, html tag, jsp, jsp java, default
- int[] expectedProposalCounts = new int[] {5, 4, 2, 0, 0, 5};
- runProposalTest("test5.jsp", 12, 0, expectedProposalCounts);
- }
-
- /**
- * <p>Run a proposal test by opening the given file and invoking content assist for
- * each expected proposal count at the given line number and line character
- * offset and then compare the number of proposals for each invocation (pages) to the
- * expected number of proposals.</p>
- *
- * @param fileName
- * @param lineNum
- * @param lineRelativeCharOffset
- * @param expectedProposalCounts
- * @throws Exception
- */
- private static void runProposalTest(String fileName,
- int lineNum, int lineRelativeCharOffset,
- int[] expectedProposalCounts) throws Exception{
-
- IFile file = getFile(fileName);
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- int offset = viewer.getDocument().getLineOffset(lineNum) + lineRelativeCharOffset;
-
- ICompletionProposal[][] pages = getProposals(viewer, offset, expectedProposalCounts.length);
-
- verifyProposalCounts(pages, expectedProposalCounts);
- }
-
- /**
- * <p>Invoke content assist on the given viewer at the given offset, for the given number of pages
- * and return the results of each page</p>
- *
- * @param viewer
- * @param offset
- * @param pageCount
- * @return
- * @throws Exception
- */
- private static ICompletionProposal[][] getProposals(StructuredTextViewer viewer, int offset, int pageCount) throws Exception {
- //setup the viewer
- StructuredTextViewerConfigurationJSP configuration = new StructuredTextViewerConfigurationJSP();
- ContentAssistant contentAssistant = (ContentAssistant)configuration.getContentAssistant(viewer);
- viewer.configure(configuration);
- viewer.setSelectedRange(offset, 0);
-
- //get the processor
- String partitionTypeID = viewer.getDocument().getPartition(offset).getType();
- IContentAssistProcessor processor = contentAssistant.getContentAssistProcessor(partitionTypeID);
-
- //fire content assist session about to start
- Method privateFireSessionBeginEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionBeginEvent", new Class[] {boolean.class});
- privateFireSessionBeginEventMethod.setAccessible(true);
- privateFireSessionBeginEventMethod.invoke(contentAssistant, new Object[] {Boolean.TRUE});
-
- //get content assist suggestions
- ICompletionProposal[][] pages = new ICompletionProposal[pageCount][];
- for(int p = 0; p < pageCount; ++p) {
- pages[p] = processor.computeCompletionProposals(viewer, offset);
- }
-
- //fire content assist session ending
- Method privateFireSessionEndEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionEndEvent", null);
- privateFireSessionEndEventMethod.setAccessible(true);
- privateFireSessionEndEventMethod.invoke(contentAssistant, null);
-
- return pages;
- }
-
- /**
- * <p>Compare the expected number of proposals per page to the actual number of proposals
- * per page</p>
- *
- * @param pages
- * @param expectedProposalCounts
- */
- private static void verifyProposalCounts(ICompletionProposal[][] pages, int[] expectedProposalCounts) {
- StringBuffer error = new StringBuffer();
- for(int page = 0; page < expectedProposalCounts.length; ++page) {
- if(expectedProposalCounts[page] > pages[page].length) {
- error.append("\nProposal page " + page + " did not have the expected number of proposals: was " +
- pages[page].length + " expected " + expectedProposalCounts[page]);
- }
- }
-
- //if errors report them
- if(error.length() > 0) {
- Assert.fail(error.toString());
- }
- }
-
- /**
- * <p>Given a file name in <code>fProject</code> attempts to get an <code>IFile</code>
- * for it, if the file doesn't exist the test fails.</p>
- *
- * @param name the name of the file to get
- * @return the <code>IFile</code> associated with the given <code>name</code>
- */
- private static IFile getFile(String name) {
- IFile file = fProject.getFile(CONTENT_DIR + IPath.SEPARATOR + name);
- assertTrue("Test file " + file + " can not be found", file.exists());
-
- return file;
- }
-
- /**
- * <p>Given a <code>file</code> get an editor for it. If an editor has already
- * been retrieved for the given <code>file</code> then return the same already
- * open editor.</p>
- *
- * <p>When opening the editor it will also standardized the line
- * endings to <code>\n</code></p>
- *
- * @param file open and return an editor for this
- * @return <code>StructuredTextEditor</code> opened from the given <code>file</code>
- */
- private static StructuredTextEditor getEditor(IFile file) {
- StructuredTextEditor editor = (StructuredTextEditor)fFileToEditorMap.get(file);
-
- if(editor == null) {
- try {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorPart editorPart = IDE.openEditor(page, file, true, true);
- if(editorPart instanceof XMLMultiPageEditorPart) {
- XMLMultiPageEditorPart xmlEditorPart = (XMLMultiPageEditorPart)editorPart;
- editor = (StructuredTextEditor)xmlEditorPart.getAdapter(StructuredTextEditor.class);
- } else if(editorPart instanceof StructuredTextEditor) {
- editor = ((StructuredTextEditor)editorPart);
- } else {
- fail("Unable to open structured text editor");
- }
-
- if(editor != null) {
- standardizeLineEndings(editor);
- fFileToEditorMap.put(file, editor);
- } else {
- fail("Could not open editor for " + file);
- }
- } catch (Exception e) {
- fail("Could not open editor for " + file + " exception: " + e.getMessage());
- }
- }
-
- return editor;
- }
-
- /**
- * <p>Line endings can be an issue when running tests on different OSs.
- * This function standardizes the line endings to use <code>\n</code></p>
- *
- * <p>It will get the text from the given editor, change the line endings,
- * and then save the editor</p>
- *
- * @param editor standardize the line endings of the text presented in this
- * editor.
- */
- private static void standardizeLineEndings(StructuredTextEditor editor) {
- IDocument doc = editor.getTextViewer().getDocument();
- String contents = doc.get();
- contents = StringUtils.replace(contents, "\r\n", "\n");
- contents = StringUtils.replace(contents, "\r", "\n");
- doc.set(contents);
- }
-
- /**
- * <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 TestJSPContentAssistComputersSetup 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 TestJSPContentAssistComputersSetup(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 {
- //setup properties
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
-
- //setup project
- ProjectUnzipUtility fProjUtil = new ProjectUnzipUtility();
- Location platformLocation = Platform.getInstanceLocation();
- // platform location may be null -- depends on "mode" of platform
- if (platformLocation != null) {
- File zipFile = FileUtil.makeFileFor(
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER,
- PROJECT_NAME + ProjectUnzipUtility.ZIP_EXTENSION,
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject(PROJECT_NAME);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- fProject = root.getProject(PROJECT_NAME);
- }
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- //close out the editors
- Iterator iter = fFileToEditorMap.values().iterator();
- while(iter.hasNext()) {
- StructuredTextEditor editor = (StructuredTextEditor)iter.next();
- editor.doSave(null);
- editor.close(false);
- }
-
- //remove project
- fProject.delete(true, new NullProgressMonitor());
-
- //restore properties
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
deleted file mode 100644
index f8c7c028c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script>
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<% %>
-<P>Place jspInJavascript.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource
deleted file mode 100644
index 8a0210b1e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource
+++ /dev/null
@@ -1,38 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class _testfiles_2F_jspInJavascript2_2E_jsp extends javax.servlet.http.HttpServlet{
-String testJspString = "testJspString";
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
-Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
-
-try {
-{out.print("");} //markup
-{out.print("");} //markup
-out.print( testJspString );
-{out.print("");} //markup
-
-{out.print("");} //markup
-
- if( request.getAttribute("SoapURL") != null )
- {
-
-out.print( (String)request.getAttribute("SoapURL"));
-
- }
- else
- {
-
-{out.print("");} //markup
- }
-{out.print("");} //markup
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp
deleted file mode 100644
index e63843c55..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script>
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<% %>
-<P>Place jspInJavascript2.jsp's content here.</P>
- <script type="text/javascript">
- <%
- if( request.getAttribute("SoapURL") != null )
- {
- %>
- var soapURL = "<%= (String)request.getAttribute("SoapURL")%>";
- <%
- }
- else
- {
- %>
- var soapURL = document.location.href;
- </script>
-<% } %>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
deleted file mode 100644
index 2ecded77f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_5F_TESTS_2F_jsp_5F_include_5F_test_2E_jsp extends javax.servlet.http.HttpServlet{
- String argh = "argh";
-
- public String globalIncludedString = "included";
-
- protected String with_space = "withspace";
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
-Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
-
-try {
-{out.print("");} //markup
-{out.print("");} //markup
- String localIncludedString = globalIncludedString;
-for(int i=0; i<5; i++) {
-out.print(i);
-}
-javax.swing.JButton BEAN_includedBean = new javax.swing.JButton();
- int include_include_int = 5;
-javax.swing.JButton includesUseBean = new javax.swing.JButton();
-{ // <gifts:gift>
-} // </gifts:gift>
-{out.print("");} //markup
-out.print( );
-{out.print("");} //markup
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
deleted file mode 100644
index 243072293..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
+++ /dev/null
@@ -1,39 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import java.util.List;
-public class __2F_INCLUDES_5F_TESTS_2F_xml_2D_jsp_2F_most_2D_tags_2D_xml_2D_jsp_2E_jsp extends javax.servlet.http.HttpServlet{
-public String myFunc() { return "myfunc"; }
-
-public String myFunc2() { return "myfunc"; }
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
-Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
-
-try {
-{out.print("");} //markup
-{out.print("");} //markup
-String consec1 = "test";
-String consec2 = "two";
-{out.print("");} //markup
-out.print(myFunc());
-out.print(myFunc2());
-{out.print("");} //markup
-javax.swing.AbstractButton jb = new javax.swing.JButton();
-{out.print("");} //markup
-String includedString = "incd";
-{out.print("");} //markup
- jb.
-{out.print("");} //markup
-{ // <logic:iterate>
-} // </logic:iterate>
-{out.print("");} //markup
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
deleted file mode 100644
index 5d19e8737..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
+++ /dev/null
@@ -1,40 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_5F_TESTS_2F_cdata_2F_cdata_2E_jsp extends javax.servlet.http.HttpServlet{
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, request, response, null, true, JspWriter.DEFAULT_BUFFER, true);
-javax.servlet.ServletContext application = pageContext.getServletContext();
-javax.servlet.ServletConfig config = pageContext.getServletConfig();
-javax.servlet.jsp.JspWriter out = pageContext.getOut();
-Object page = this;
-javax.servlet.http.HttpSession session = pageContext.getSession();
-
-try {
-{out.print("");} //markup
-
-int a = 1;
-if (a
-<
- 2) {
- out.println("x");
-}
-{out.print("");} //markup
-
-String test = "";
-
-
-
-int a = 1;
-if (a < 2) {
- out.println("x");
-}
-
-
-
- test.toUpperCase();
-{out.print("");} //markup
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
deleted file mode 100644
index a5f35464d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
+++ /dev/null
@@ -1,157 +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.ui.tests.contentdescription;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.internal.Logger;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-
-/**
- * Tests that our ContentDescriberForJSP is working as expected,
- * We check that the content description for a given input stream has all
- * of the appropriate properties.
- * (through the Platform content type framework)
- */
-public class TestContentDescription extends UnzippedProjectTester {
-
- public void testNoXMLPIWithJSPSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-no-XMLPI-jsp-syntax.jsp", expectedProperties);
- }
-
- public void testWithXMLPIWithJSPSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-jsp-syntax.jsp", expectedProperties);
- }
-
- public void testWithXMLPIWithXMLSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-xml-syntax.jsp", expectedProperties);
- }
-
- public void testJSPWithHTMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/html");
- doTestContentDescription("/content-description/html.jsp", expectedProperties);
- }
-
- public void testJSPWithXHTMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xhtml");
- doTestContentDescription("/content-description/xhtml.jsp", expectedProperties);
- }
-
- public void testJSPWithXMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- doTestContentDescription("/content-description/xml.jsp", expectedProperties);
- }
-
- private void doTestContentDescription(String filePath, HashMap expectedProperties) {
- IContentDescription desc = getContentDescription(filePath);
- assertNotNull("couldn't get IContentDescription for file:[" + filePath + "]", desc);
- Object[] keys = expectedProperties.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
-
- Object expected = expectedProperties.get(keys[i]);
- Object detected = desc.getProperty( (QualifiedName)keys[i] );
- assertEquals("unexpected property value", expected, detected);
- }
- }
-
- private IContentDescription getContentDescription(String filePath) {
- if(filePath == null)
- return null;
-
- InputStream in = null;
- try {
- // workspace file
- IFile wsFile = FileBuffers.getWorkspaceFileAtLocation(new Path(filePath));
- if(wsFile != null && wsFile.exists()) {
- in = wsFile.getContents();
- }
- else {
- // external file
- File sFile = FileBuffers.getSystemFileAtLocation(new Path(filePath));
- if(sFile !=null && sFile.exists())
- in = new FileInputStream(sFile);
- }
- }
- catch (CoreException e) {
- Logger.logException(e);
- }
- catch (FileNotFoundException e) {
- Logger.logException(e);
- }
-
- assertNotNull(in);
-
- return getContentDescription(in);
- }
-
- /**
- * Returns content description for an input stream
- * Assumes it's JSP content.
- * Closes the input stream when finished.
- *
- * @param in
- * @return the IContentDescription for in
- */
- private IContentDescription getContentDescription(InputStream in) {
-
- if(in == null)
- return null;
-
- IContentDescription desc = null;
- try {
-
- IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
- desc = contentTypeJSP.getDescriptionFor(in, IContentDescription.ALL);
- }
- catch (IOException e) {
- Logger.logException(e);
- }
- finally {
- if(in != null) {
- try {
- in.close();
- }
- catch (IOException e) {
- Logger.logException(e);
- }
- }
- }
- return desc;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index e013669cf..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
- private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file);
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- bufferManager.disconnect(locationPath, null);
-
-// doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-
- }
-
-
-
-/*
-
- public void testFile103() throws CoreException, IOException {
- doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile124() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws CoreException {
- doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
-
- public void testFile1() throws CoreException, IOException {
- doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
- }
-
-*/
-
- public void testFile70() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-
- public void testFile71() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index 08f1fddb7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-
-/**
- * @author pavery
- */
-public class UnzippedProjectTester extends TestCase {
-
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = JSPUITestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- private static final boolean DEBUG = false;
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
- IWorkspace workspace = getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
deleted file mode 100644
index ceb218f73..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.examples;
-
-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.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CreatingJSPExpression extends TestCase {
-
- /**
- *
- */
- public CreatingJSPExpression() {
- super();
- }
-
- /**
- * @param name
- */
- public CreatingJSPExpression(String name) {
- super(name);
- }
-
- public void testCreateJSPExpression() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-
- Document doc = ((IDOMModel) model).getDocument();
-
- Element jspexpression = doc.createElement("jsp:expression");
- ((IDOMElement) jspexpression).setJSPTag(true);
- doc.appendChild(jspexpression);
- Text javacode = doc.createTextNode(" // some java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
- jspexpression.appendChild(javacode);
-
-
- Text cdatasection = doc.createCDATASection(" // some cdata java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
- doc.appendChild(cdatasection);
-
- // format's not needed, just prettier ... not sure why
- // it won't work right on whole document.
- new NodeFormatter().format(jspexpression);
- new NodeFormatter().format(cdatasection);
- System.out.println("document text: ");
- System.out.println(model.getStructuredDocument().get());
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java
deleted file mode 100644
index d880b15da..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java
+++ /dev/null
@@ -1,171 +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.ui.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.formatter.FormattingContext;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IContentFormatterExtension;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.jst.jsp.ui.tests.util.StringCompareUtil;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-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 TestContentFormatter extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "jspformatting";
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
- private IFormattingContext fContext;
-
- 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()) {
- ProjectUtil.createProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
- ProjectUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
-
- fContext = new FormattingContext();
- fContext.setProperty(FormattingContextProperties.CONTEXT_DOCUMENT, Boolean.valueOf(true));
-
- fStringCompareUtil = new StringCompareUtil();
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- if (resetPreferences) {
- resetPreferencesToDefault();
- }
-
- SourceViewerConfiguration configuration = new StructuredTextViewerConfigurationJSP();
- IContentFormatterExtension formatter = (IContentFormatterExtension) configuration.getContentFormatter(null);
-
- IDocument document = beforeModel.getStructuredDocument();
- Region region = new Region(0, document.getLength());
- fContext.setProperty(FormattingContextProperties.CONTEXT_REGION, region);
- formatter.format(document, fContext);
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestFormatProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filename));
- assertTrue("unable to find file: " + filename, file.exists());
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForEdit(file);
- }
- catch (CoreException ce) {
- ce.printStackTrace();
- }
- catch (IOException io) {
- io.printStackTrace();
- }
- return model;
- }
-
- private void resetPreferencesToDefault() {
- Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
- preferences.setToDefault(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS);
- preferences.setToDefault(HTMLCorePreferenceNames.LINE_WIDTH);
- preferences.setToDefault(HTMLCorePreferenceNames.INDENTATION_CHAR);
- preferences.setToDefault(HTMLCorePreferenceNames.INDENTATION_SIZE);
- preferences.setToDefault(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- }
-
- public void testFormatBug102495() throws UnsupportedEncodingException, IOException, CoreException {
- String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495.jsp";
- String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495-fmt.jsp";
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- public void testFormatBug102495_1() throws UnsupportedEncodingException, IOException, CoreException {
- String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_1.jsp";
- String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_1-fmt.jsp";
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- public void testFormatBug102495_2() throws UnsupportedEncodingException, IOException, CoreException {
- String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_2.jsp";
- String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_2-fmt.jsp";
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- public void testFormatBug102495_3() throws UnsupportedEncodingException, IOException, CoreException {
- String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_3.jsp";
- String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_3-fmt.jsp";
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- public void testFormatBug102495_4() throws UnsupportedEncodingException, IOException, CoreException {
- String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_4.jsp";
- String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_4-fmt.jsp";
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index f248994ce..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.model;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNonExistentDocument("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateModelWithNonExistIFile("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testNonExistentJSPDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNonExistentDocument("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testNonExistentJSPModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateModelWithNonExistIFile("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmpty("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleDocumentCaseXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmptyDocument("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleDocumentCaseJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmptyDocument("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testComplexCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmpty("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testReload() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestReload("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testJSPWithXMLOutput() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestReload("testfiles/jsp/jsp-xml-output.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testXHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testXHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testXHTMLTransitional3() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.xhtml", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/html/testh.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/html/testh.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- /*
- * TODO: these test files are missing, for some reason when running on
- * build machine ... need to re-construct public void testNearEmptyJSP()
- * throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/jsp/nearEmpty.jsp",
- * BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class); }
- *
- * public void testNearEmptyXML() throws ResourceAlreadyExists,
- * ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/xml/nearEmpty.xml",
- * BasicStructuredDocument.class, StructuredTextPartitionerForXML.class); }
- *
- * public void testNearEmptyHTML() throws ResourceAlreadyExists,
- * ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/html/nearEmpty.html",
- * BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class); }
- */
- private void doTestNotEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = doTestCreate(filePath, expectedDocumentClass, expectedPartioner);
- assertNotNull("contents were null", contents);
- assertTrue("contents were empty", contents.length() > 0);
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestNotEmptyDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredDocument document = modelManager.createStructuredDocumentFor(file);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- contents = document.get();
- assertNotNull("contents were null", contents);
- assertTrue("contents were empty", contents.length() > 0);
-
- }
-
- private void doTestNonExistentDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- boolean expectedExceptionCaught = false;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredDocument document = null;
- try {
- document = modelManager.createStructuredDocumentFor(file);
- }
- catch (FileNotFoundException e) {
- expectedExceptionCaught = true;
- }
-
- if (expectedExceptionCaught) {
- document = modelManager.createNewStructuredDocumentFor(file);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- contents = document.get();
- assertNotNull("contents were null", contents);
- assertTrue("contents were *not* empty as expected", contents.length() == 0);
- }
- else {
- assertTrue("FileNotFound exception was *not* thrown as expected", false);
- }
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestReload(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
- InputStream inStream = null;
- try {
- inStream = file.getContents();
- model.reload(inStream);
- assertNotNull(model);
- IStructuredDocument documentReloaded = model.getStructuredDocument();
- // note: NOT same instance of document
- // FIXME: this test has to be changed back, once the reload
- // API is
- // fixed to work with different document.
- // assertFalse(document == documentReloaded);
- assertTrue(document == documentReloaded);
- }
- finally {
- if (inStream != null) {
- inStream.close();
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private String doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- // file will be null if the resource does not exist
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- contents = document.get();
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
- testClone(model);
-
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- return contents;
- }
-
- private void testClone(IStructuredModel structuredModel) throws IOException {
- IDOMDocument document = ((IDOMModel) structuredModel).getDocument();
- INodeNotifier notifier = document;
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) notifier.getAdapterFor(ModelQueryAdapter.class);
- assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
-
- IStructuredModel newModel = structuredModel.newInstance();
- IDOMDocument newDocument = ((IDOMModel) newModel).getDocument();
- INodeNotifier newNotifier = newDocument;
- ModelQueryAdapter result = (ModelQueryAdapter) newNotifier.getAdapterFor(ModelQueryAdapter.class);
- assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private String doTestCreateModelWithNonExistIFile(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- // file will be null if the resource does not exist
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, false);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- contents = document.get();
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- return contents;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
deleted file mode 100644
index 87f8aa064..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.modelquery;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author pavery
- */
-public class ModelQueryTester extends TestCase {
-
- private final boolean testShippedDTDLookup = false;
-
- // Our Structured Model, which should always be an XMLModel (or subclass)
- protected IDOMModel fModel = null;
-
- protected ModelQuery fModelQuery = null;
-
- public ModelQueryTester(String name) {
- super(name);
- }
-
- protected static Test suite() {
- return new TestSuite(ModelQueryTester.class);
- }
-
- public static void main(java.lang.String[] args) {
- if (args == null || args.length == 0) {
- runAll();
- }
- else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
-
- }
-
- protected static void runAll() {
- TestRunner.run(suite());
-
- }
-
- protected static void runOne(String methodName) {
- TestSuite testSuite = new TestSuite();
- TestCase test = new ModelQueryTester(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
- }
-
- /**
- * Create an empty HTML model
- */
- protected void setUpHTML() {
- fModel = (IDOMModel) createModel(ContentTypeIdForHTML.ContentTypeID_HTML);
- initVars();
- }
-
- /**
- * Create an empty XML model
- */
- protected void setUpXML() {
- fModel = (IDOMModel) createModel(ContentTypeIdForXML.ContentTypeID_XML);
- initVars();
- }
-
-
- /**
- * Initialize local fields for this test
- */
- protected void initVars() {
- fModelQuery = ModelQueryUtil.getModelQuery(fModel.getDocument());
-
-
- }
-
- /**
- * Test the HTML BODY Element for the "bgcolor" attribute declaration
- */
- public void testBodyElement() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
- // text
-
- // TEST getting a CMElementDeclaration
- Element bodyElement = (Element) fModel.getIndexedRegion(7); // node at
- // offset7--should
- // be
- // <body>
- CMElementDeclaration bodyDecl = fModelQuery.getCMElementDeclaration(bodyElement);
-
- int contentType = bodyDecl.getContentType();
- assertTrue("CMElementDeclaration CONTENT TYPE INCORRECT FOR BODY", (contentType == CMElementDeclaration.MIXED));
-
- // get permissible attrs
- CMNamedNodeMap map = bodyDecl.getAttributes();
- assertTrue("ATTRIBUTES FROM ELEMENT DECLARATION == NULL", (map != null));
- Vector allowed = new Vector();
- for (int i = 0; i < map.getLength(); i++) {
- CMAttributeDeclaration node = (CMAttributeDeclaration) map.item(i);
- String name = node.getNodeName();
- allowed.add(name);
- if (name.equalsIgnoreCase("bgcolor")) {
- assertTrue("GOT INCORRECT ATTRIBUTE NODE TYPE", (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION));
-
- CMDataType attrType = node.getAttrType();
- // System.out.println("attribute type > " + attrType);
- assertTrue("COULD NOT GET ATTRIBUTE TYPE", (attrType != null));
- assertTrue("COULDN'T GET IMPLIED VALUE KIND", (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_NONE));
- }
- }
- }
-
- /**
- * Test the HTML HTML Element for its declared children
- */
- public void testHtmlChildren() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html></html>"); // set text
- Element htmlElement = fModel.getDocument().getDocumentElement();
- CMElementDeclaration htmlDecl = fModelQuery.getCMElementDeclaration(htmlElement);
-
- // HTML's children are within a group
- CMContent contents = htmlDecl.getContent();
-
- assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
- CMGroup group = (CMGroup) contents;
- int operator = group.getOperator();
- CMNodeList childList = group.getChildNodes();
- int max = contents.getMaxOccur();
- int min = contents.getMinOccur();
-
- // the group should be allowed once, with a sequence whose first entry
- // is the declaration for HEAD
- assertTrue("occurrance of group", min == 1 && max == 1);
- assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
- assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
- assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.HEAD));
-
- assertTrue("content descriptor type, position 1", childList.item(1).getNodeType() == CMNode.GROUP);
- // The second child should be a group as well, containing BODY and
- // FRAMESET with an
- // operator of CMGroup.CHOICE
- assertTrue("content descriptor type, position 1 - relationship of group", ((CMGroup) childList.item(1)).getOperator() == CMGroup.CHOICE);
- }
-
- public void testFormMethodAttr() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
- // text
-
- // TEST GETTING A CMAttributeDeclaratoin
- Element formElement = (Element) fModel.getIndexedRegion(31); // <form>
- Attr attrNode = formElement.getAttributeNode(HTML40Namespace.ATTR_NAME_METHOD);
- CMAttributeDeclaration methodAttrDecl = fModelQuery.getCMAttributeDeclaration(attrNode);
- assertTrue("Content Model missing the attribute declaration for \"method\"", methodAttrDecl != null);
-
- List values = getValidStrings(formElement, methodAttrDecl);
- assertTrue("wrong number of values for attribute \"method\"", (values.size() == 2));
- assertTrue("default value for attribute \"method\" is wrong", (methodAttrDecl.getAttrType().getImpliedValue().equalsIgnoreCase("get")));
- }
-
- /**
- * A short test to ensure that a DTD can be loaded from a system
- * reference.
- *
- * Note: May require a functioning network connection for the references
- * to be resolved properly.
- *
- * @throws IOException
- */
- public void testDTDLoadFromSystemID_1() throws IOException {
- if (testShippedDTDLookup) {
- setUpXML();
- URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
- String diskLocation = null;
- diskLocation = FileLocator.resolve(installationPath).toExternalForm();
-
- assertTrue("failed to resolve plugin install path", diskLocation != null);
- String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "TestFiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd\"" + "><html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:wml=\"http://www.wapforum.org/2001/wml\"></html>";
- fModel.getStructuredDocument().set(content);
- CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
- Node domNode = (Node) fModel.getIndexedRegion(content.length() - 2);
- CMNode node = fModelQuery.getCMNode(domNode);
- assertTrue("wml20.dtd failed to load", node != null && node.getNodeName().equalsIgnoreCase("html"));
- }
- }
-
-
- /**
- * A short test to ensure that a DTD, the XHTML 1.0 Transitional one, can
- * be loaded from a system reference.
- *
- * Note: May require a functioning network connection for the references
- * to be resolved properly.
- * @throws IOException
- */
- public void testDTDLoadFromSystemID_2() throws IOException {
- if (testShippedDTDLookup) {
- URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
- String diskLocation = null;
-
- diskLocation = FileLocator.resolve(installationPath).toExternalForm();
-
- assertTrue("failed to resolve plugin install path", diskLocation != null);
- setUpXML();
- String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "testfiles/XHTML/xhtml1-transitional.dtd\"" + "><html></html>";
- fModel.getStructuredDocument().set(content);
-
- CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
- // see defect 282429
- CMElementDeclaration htmlDecl = (CMElementDeclaration) fModelQuery.getCMNode((Node) fModel.getIndexedRegion(content.length() - 2));
- assertTrue("xhtml1-transitional.dtd not loaded", htmlDecl != null);
-
- // HTML's children are within a group
- CMContent contents = htmlDecl.getContent();
-
- assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
- CMGroup group = (CMGroup) contents;
- int operator = group.getOperator();
- CMNodeList childList = group.getChildNodes();
- int max = contents.getMaxOccur();
- int min = contents.getMinOccur();
-
- // the group should be allowed once, with a sequence whose first
- // entry
- // is the declaration for HEAD
- assertTrue("occurrance of group", min == 1 && max == 1);
- assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
- assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
- assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equals(HTML40Namespace.ElementName.HEAD.toLowerCase()));
- assertTrue("child order (BODY second)", childList.item(1).getNodeName().equals(HTML40Namespace.ElementName.BODY.toLowerCase()));
- }
- }
-
- /**
- * A short test to ensure that the DTD for JSP 1.2 tag libraries can be
- * loaded from a public reference registered in the XML catalog
- */
- public void testDTDLoadFromPublicID() {
- // No longer provided in WTP
- // TODO: provide DTD?
- // if (testShippedDTDLookup) {
- // setUpXML();
- // String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems,
- // Inc.//DTD JSP Tag Library 1.2//EN\">
- // <taglib><tag>foo</tag></taglib>";
- // fModel.getStructuredDocument().set(contents);
- //
- // CMDocumentManager documentManagaer =
- // fModelQuery.getCMDocumentManager();
- // documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD,
- // false);
- // documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD,
- // true);
- //
- //
- // // taglib
- // CMNode node = fModelQuery.getCMNode((Node)
- // fModel.getIndexedRegion(contents.length() - 2));
- // assertTrue("web-jsptaglibrary_1_2.dtd failed to load through
- // catalog", node != null && node.getNodeType() ==
- // CMNode.ELEMENT_DECLARATION &&
- // node.getNodeName().equalsIgnoreCase("taglib"));
- //
- // // tag
- // node = fModelQuery.getCMNode((Node)
- // fModel.getIndexedRegion(contents.length() - 12));
- // assertTrue("CMElementDeclaration for \"tag\" from
- // web-jsptaglibrary_1_2.dtd is missing", node != null &&
- // node.getNodeType() == CMNode.ELEMENT_DECLARATION &&
- // node.getNodeName().equalsIgnoreCase("tag"));
- // CMContent content = ((CMElementDeclaration) node).getContent();
- // assertTrue("only one occurrence of child group allowed",
- // content.getNodeType() == CMNode.GROUP && content.getMaxOccur() ==
- // 1);
- // }
- }
-
-
-
- public static IStructuredModel createModel(String contentTypeID) {
- // create an empty model with its default factories
- IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-
- // add editor adapter factories
- AdapterFactoryRegistry adapterRegistry = JSPUIPlugin.getDefault().getAdapterFactoryRegistry();
- Iterator adapterList = adapterRegistry.getAdapterFactories();
- // And all those appropriate for this particular type of content
- while (adapterList.hasNext()) {
- try {
- AdapterFactoryProvider provider = (AdapterFactoryProvider) adapterList.next();
- if (provider.isFor(model.getModelHandler())) {
- provider.addAdapterFactories(model);
- }
- }
- catch (Exception e) {
- Logger.logException(e);
- }
- }
- return model;
- }
-
- /**
- * Return the valid values for an attribute with the given declaration on
- * the given element. Derived from XMLPropertySource
- */
- private List getValidStrings(Element element, CMAttributeDeclaration attrDecl) {
- CMDataType valuesHelper = attrDecl.getAttrType();
- Vector values = new Vector();
-
- if (valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED && valuesHelper.getImpliedValue() != null) {
- // FIXED value
- values.add(valuesHelper.getImpliedValue());
- }
- else {
- // ENUMERATED values
- String[] valueStrings = null;
- // new way
- valueStrings = fModelQuery.getPossibleDataTypeValues(element, attrDecl);
- if (valueStrings == null)
- // older way
- valueStrings = attrDecl.getAttrType().getEnumeratedValues();
- if (valueStrings != null) {
- for (int i = 0; i < valueStrings.length; i++) {
- values.add(valueStrings[i]);
- }
- }
- }
- if (valuesHelper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE && valuesHelper.getImpliedValue() != null) {
- if (!values.contains(valuesHelper.getImpliedValue()))
- values.add(valuesHelper.getImpliedValue());
- }
-
- return values;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
deleted file mode 100644
index 82eccdf94..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
+++ /dev/null
@@ -1,59 +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.ui.tests.other;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/21/00 4:14:40 PM)
- * @author: David Williams
- */
-public class ColorRegions extends java.util.Vector {
- /**
- * Default <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * ColorRegions constructor comment.
- */
- public ColorRegions() {
- super();
- }
-
- /**
- * ColorRegions constructor comment.
- * @param initialCapacity int
- */
- public ColorRegions(int initialCapacity) {
- super(initialCapacity);
- }
-
- /**
- * ColorRegions constructor comment.
- * @param initialCapacity int
- * @param capacityIncrement int
- */
- public ColorRegions(int initialCapacity, int capacityIncrement) {
- super(initialCapacity, capacityIncrement);
- }
-
- public int[] asIntArray() {
- trimToSize();
- int arraySize = elementData.length;
- int[] results = new int[arraySize];
- //
- for (int i = 0; i < arraySize; i++) {
- results[i] = ((Integer) elementData[i]).intValue();
- }
- //
- return results;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
deleted file mode 100644
index e2ffeec6b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
+++ /dev/null
@@ -1,104 +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.ui.tests.other;
-
-import java.io.PrintStream;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class DebugDocument {
-
- public static void dump(Document document) {
- if (document == null)
- return;
- System.out.println("Dump of DOM"); //$NON-NLS-1$
-
- dump(document, System.out);
-
- //
- System.out.println();
- System.out.println("= = = = = ="); //$NON-NLS-1$
- System.out.println();
-
- }
-
- public static void dump(Document document, PrintStream out) {
- Node node = document.getFirstChild();
- while (node != null) {
- dump(node, out);
- node = node.getNextSibling();
- }
-
- }
-
- public static void dump(Node topNode) {
- dump(topNode, System.out);
- }
-
- public static void dump(Node topNode, PrintStream out) {
- if (topNode == null)
- return;
- // print out this node
- //
- printNode(topNode, out);
-
- // now print out its children
- //NodeList nodes = topNode.getChildNodes();
- //int len = nodes.getLength();
- //for (int i = 0; i < len; i++) {
-
- //Node node = nodes.item(i);
- //dump(node, out);
- //}
- }
-
- public static void printNode(Node topNode) {
- printNode(topNode, System.out);
-
- }
-
- public static void printNode(Node topNode, PrintStream out) {
- // print out this node
- //
- IStructuredDocumentRegion firstStructuredDocumentRegion = ((IDOMNode) topNode).getFirstStructuredDocumentRegion();
- IStructuredDocumentRegion lastStructuredDocumentRegion = ((IDOMNode) topNode).getLastStructuredDocumentRegion();
- if ((firstStructuredDocumentRegion == null) || (lastStructuredDocumentRegion == null)) {
- // no text to output
- } else {
- int start = firstStructuredDocumentRegion.getStart();
- int end = lastStructuredDocumentRegion.getEnd();
-
- String outString = topNode.toString();
- outString = org.eclipse.wst.sse.core.utils.StringUtils.escape(outString);
- out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- // now do its children
- NodeList nodes = topNode.getChildNodes();
- int len = nodes.getLength();
- for (int i = 0; i < len; i++) {
- Node childNode = nodes.item(i);
- printNode(childNode, out);
- }
-
- }
-
- public DebugDocument() {
- super();
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
deleted file mode 100644
index 60a0bef99..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
+++ /dev/null
@@ -1,1134 +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.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-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.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.CoreNodeList;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * @author Nitin Dahyabhai <nitind@us.ibm.com>
- */
-public class ScannerUnitTests extends TestCase {
-
- public static boolean checkComplexRegionTypes(ITextRegionList regions, String[] contexts, String[][] embeddedContexts) {
-
- int embedCount = 0;
- Iterator iterator = regions.iterator();
- for (int i = 0; i < contexts.length; i++) {
- if (!iterator.hasNext())
- return false;
- ITextRegion region = (ITextRegion) iterator.next();
- assertEquals("context " + i + " incorrect", contexts[i], region.getType());
- if (region instanceof ITextRegionContainer) {
- ITextRegionContainer container = (ITextRegionContainer) region;
- boolean embeddedResult = checkSimpleRegionCount(container, embeddedContexts[embedCount].length) && checkSimpleRegionTypes(container.getRegions(), embeddedContexts[embedCount]);
- embedCount++;
- assertTrue(embeddedResult);
- }
- }
- return true;
- }
-
- public static boolean checkModelLength(IStructuredDocument document, int length) {
- return checkModelLength(document.getLastStructuredDocumentRegion(), length);
- }
-
- public static boolean checkModelLength(IStructuredDocumentRegion region, int length) {
- return region.getEndOffset() == length;
- }
-
- public static boolean checkSimpleRegionCount(ITextRegionContainer regionContainer, int size) {
- // yes, this looks silly, but it makes it easier to find the exact
- // failure point
- assertEquals("region count", size, regionContainer.getNumberOfRegions());
- return true;
- }
-
- public static boolean checkSimpleRegionCounts(IStructuredDocumentRegionList regionContainers, int[] sizes) {
- int containers = regionContainers.getLength();
- assertEquals("different number of containers", sizes.length, containers);
- for (int i = 0; i < sizes.length; i++) {
- assertEquals("container " + i + " is different", sizes[i], regionContainers.item(i).getNumberOfRegions());
- continue;
- }
- return true;
- }
-
- public static boolean checkSimpleRegionTypes(ITextRegionList regions, String[] contexts) {
- for (int i = 0; i < contexts.length; i++) {
- ITextRegion region = regions.get(i);
- assertEquals("region type " + i, contexts[i], region.getType());
- }
- return true;
- }
-
- public static String loadChars(InputStream input) {
-
- StringBuffer s = new StringBuffer();
- try {
- int c = -1;
- while ((c = input.read()) >= 0) {
- if (c > 255)
- break;
- s.append((char) c);
- }
- input.close();
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return s.toString();
- }
-
- /**
- * Starts the application.
- *
- * @param args
- * an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
-
- if (args == null || args.length == 0) {
- runAll();
- }
- else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
- }
-
- protected static void runAll() {
-
- junit.textui.TestRunner.run(suite());
- }
-
- protected static void runOne(String methodName) {
-
- TestSuite testSuite = new TestSuite();
- TestCase test = new ScannerUnitTests(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
- }
-
- protected static Test suite() {
-
- return new TestSuite(ScannerUnitTests.class);
- }
-
- public static void verifyLengths(int startOffset, IStructuredDocumentRegion firstDocumentRegion, String text) {
- IStructuredDocumentRegion holdRegion = firstDocumentRegion;
- assertTrue("document does not start at expected offset", holdRegion.getStartOffset() == startOffset);
- int lastEnd = 0;
- while (holdRegion != null && holdRegion.getEndOffset() > 0) {
- assertTrue("zero-length StructuredDocumentRegion found", holdRegion.getStartOffset() == lastEnd);
- assertTrue("TextRegionless StructuredDocumentRegion found", holdRegion.getNumberOfRegions() > 0);
- ITextRegionList list = holdRegion.getRegions();
- int index = 0;
- for (int i = 0; i < list.size(); i++) {
- ITextRegion region = list.get(i);
- assertTrue("text region seams don't match", region.getStart() == index);
- index += region.getLength();
- }
- lastEnd = holdRegion.getEndOffset();
- holdRegion = holdRegion.getNext();
- }
-
- holdRegion = firstDocumentRegion;
- while (holdRegion != null && holdRegion.getNext() != null) {
- holdRegion = holdRegion.getNext();
- }
- checkModelLength(holdRegion, text.length());
- }
-
- public static void verifyLengths(int startOffset, IStructuredDocumentRegionList list, String text) {
- verifyLengths(startOffset, list.item(0), text);
- }
-
- public static void verifyLengths(IStructuredDocument document, String text) {
- verifyLengths(0, document.getFirstStructuredDocumentRegion(), text);
- }
-
- public static void verifyLengths(IStructuredModel model, String text) {
- verifyLengths(model.getStructuredDocument(), text);
- }
-
- protected IStructuredDocument fModel;
- protected String input;
- private BlockTagParser parser;
- protected Object type;
-
- public ScannerUnitTests(String name) {
-
- super(name);
- }
-
- protected void appendTagBlock(StringBuffer buffer, String tagname, int length) {
-
- buffer.append('<');
- buffer.append(tagname);
- buffer.append('>');
- for (int i = 0; i < length; i++)
- buffer.append('_');
- buffer.append("</");
- buffer.append(tagname);
- buffer.append('>');
- }
-
- protected void setUp() {
-
- setUpXML(null);
- }
-
- protected IStructuredDocumentRegionList setUpJSP(String text) {
-
- setupModel(new ModelHandlerForJSP());
- parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-
- /*
- * IStructuredDocumentRegionList nodes = setUpJSP("content <script>
- * <%= expression %> </script> <a> </a> <foo:disallowJSP> <%= %>
- * </foo:disallowJSP> >"); parser.addBlockMarker(new
- * BlockMarker("jsp:declaration", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
- * BlockMarker("jsp:expression", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
- * BlockMarker("jsp:scriptlet", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true));
- */
- input = text;
- fModel.set(input);
- return fModel.getRegionList();
- }
-
- protected void setupModel(IModelHandler contentType) {
-
- fModel = (IStructuredDocument) contentType.getDocumentLoader().createNewStructuredDocument();
- this.parser = (BlockTagParser) fModel.getParser();
- }
-
- protected IStructuredDocumentRegionList setUpXML(String text) {
-
- setupModel(new ModelHandlerForXML());
- parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
- input = text;
- fModel.set(input);
- return fModel.getRegionList();
- }
-
- protected void testBlockScanBufferBoundaries(String contentTypeID) {
- IStructuredDocument document = null;
- // the interesting offsets are around 16k (16384)
- // for (int i = 16500; i > 16100; i--) {
- // for (int i = 17000; i > 15000; i--) {
- for (int i = 16384 + 25; i > 16364 - 25; i--) {
- StringBuffer text = new StringBuffer();
- document = StructuredModelManager.getModelManager().createStructuredDocumentFor(contentTypeID);
- appendTagBlock(text, "script", i);
- String string = text.toString();
- try {
- document.setText(this, string);
- verifyLengths(document, string);
- assertTrue("too few document regions [run value " + i + "] ", new CoreNodeList(document.getFirstStructuredDocumentRegion()).getLength() == 3);
- verifyLengths(document, string);
- IStructuredDocumentRegion startTag = document.getFirstStructuredDocumentRegion();
- IStructuredDocumentRegion middleBlock = startTag.getNext();
- // IStructuredDocumentRegion endTag = middleBlock.getNext();
- assertTrue("not block text in middle", middleBlock.getFirstRegion().getType() == DOMRegionContext.BLOCK_TEXT);
- }
- catch (Exception e) {
- assertNull("exception caught" + e, e);
- }
- // System.gc();
- }
- }
-
- public void testBlockScanBufferBoundariesForHTML() {
- testBlockScanBufferBoundaries("org.eclipse.wst.html.core.htmlsource");
- }
-
- public void testBlockScanBufferBoundariesForJSP() {
- testBlockScanBufferBoundaries("org.eclipse.jst.jsp.core.jspsource");
- }
-
- private void testBlockTag(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBlockTag_JSP() {
- testBlockTag(setUpJSP("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
- }
-
- /**
- * Check block tag scanning between XML content
- */
- public void testBlockTag_XML() {
-
- testBlockTag(setUpXML("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
- }
-
- /**
- * Check block tag scanning between XML content
- */
- public void testBlockTagWithJSPExpressions() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("begin <script type=\"pl2\"> <%= \"expression\"%> </scrIPt> <a></a> <disallowJSP> <%= \"expression\" %> </disallowJSP> end");
-
- // OLD
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6,
- // 3, 3, 1, 3, 3, 1, 3, 3, 3, 1});
- // NEW
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 3, 3, 1, 3, 3, 1, 3, 1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int i = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkComplexRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE}}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- // CORRECT BEHAVIOR
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
- // OLD, BROKEN BEHAVIOR
- // && checkSimpleRegionTypes(nodes.item(i++).getRegions(),
- // new
- // String[]{
- // XMLRegionContext.BLOCK_TEXT,
- // XMLRegionContext.BLOCK_TEXT,
- // XMLRegionContext.BLOCK_TEXT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- private void testBufferUnderRun_1(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 2});
- assertTrue("IStructuredDocumentRegion region count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBufferUnderRun_1_JSP() {
- testBufferUnderRun_1(setUpJSP("content <tag a=b/><!--c"));
- }
-
- /**
- * Check for buffer under-runs on block scanning
- */
- public void testBufferUnderRun_1_XML() {
- testBufferUnderRun_1(setUpXML("content <tag a=b/><!--c"));
- }
-
- private void testBufferUnderRun_2(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1});
- assertTrue("IStructuredDocumentRegion region count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBufferUnderRun_2_JSP() {
-
- testBufferUnderRun_2(setUpJSP("content <tag a=b/><!--"));
- }
-
- /**
- * Check for buffer under-runs on block scanning
- */
- public void testBufferUnderRun_2_XML() {
-
- testBufferUnderRun_2(setUpXML("content <tag a=b/><!--"));
- }
-
- private void testCDATA(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testCDATA_JSP() {
-
- testCDATA(setUpJSP("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
- }
-
- /**
- * Check CDATA section scanning between content
- */
- public void testCDATA_XML() {
-
- testCDATA(setUpXML("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
- }
-
- public void testCDATAinBlockJSP1() {
- setUpJSP("<script><![CDATA[ contents]]></script>");
- }
-
- public void testCDATAinBlockJSP2() {
- setUpJSP("<script><![CDATA[</script>]]></script>");
- }
-
- public void testCDATAinBlockJSP2a() {
- setUpJSP("<script><![CDATA[contents</script>]]></script>");
- }
-
- public void testCDATAinBlockJSP2b() {
- setUpJSP("<script><![CDATA[</script>contents]]></script>");
- }
-
- public void testCDATAinBlockJSP3() {
- setUpJSP("<script><![CDATA[]]></script>");
- }
-
- public void testCDATAinBlockJSP4() {
- setUpJSP("<script><![CDATA[ ]]>");
- }
-
- public void testCDATAinBlockJSP5() {
- setUpJSP("<script><![CDATA[ ]]]>");
- }
-
- public void testCDATAinBlockJSP6() {
- setUpJSP("<script><![CDATA[ ]]");
- }
-
- public void testCDATAinBlockJSP7() {
- setUpJSP("<script><![CDATA[ ");
- }
-
- public void testCDATAinBlockJSP8() {
- setUpJSP("<script><![CDATA[");
- }
-
- public void testCDATAinBlockXML1() {
- setUpXML("<script><![CDATA[ ]]></script>");
- }
-
- public void testCDATAinBlockXML2() {
- setUpXML("<script><![CDATA[</script>]]></script>");
- }
-
- public void testCDATAinBlockXML3() {
- setUpXML("<script><![CDATA[]]></script>");
- }
-
- public void testCDATAinBlockXML4() {
- setUpXML("<script><![CDATA[ ]]>");
- }
-
- public void testCDATAinBlockXML5() {
- setUpXML("<script><![CDATA[ ]]]>");
- }
-
- public void testCDATAinBlockXML6() {
- setUpXML("<script><![CDATA[ ]]");
- }
-
- public void testCDATAinBlockXML7() {
- setUpXML("<script><![CDATA[ ");
- }
-
- public void testCDATAinBlockXML8() {
- setUpXML("<script><![CDATA[");
- }
-
- /**
- * Check comments between XML content
- */
- public void testComments_JSP() {
- String text = "a <!-- --><!----><%-- --%> b";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 2, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check comments between JSP content
- */
- public void testComments_XML() {
- String text = "a <!-- --><<!---->b";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 2, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- private void testContent(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- /**
- * Check simple content scanning
- */
- public void testContentJSP() {
-
- testContent(setUpJSP("hello world"));
- }
-
- public void testContentXML() {
-
- testContent(setUpXML("hello world"));
- }
-
- public void testDirectiveInTagBody() {
- String text = "<BODY <%@ include file=\"commonEventHandlers.jspf\" %> dir=\"ltr\"> ";
- IStructuredDocumentRegionList documentRegionList = setUpJSP(text);
- verifyLengths(0, documentRegionList, text);
-
- checkSimpleRegionTypes(documentRegionList.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE});
- ITextRegionCollection coll = (ITextRegionCollection) documentRegionList.item(0).getRegions().get(2);
- checkSimpleRegionTypes(coll.getRegions(), new String[]{DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN, DOMRegionContext.WHITE_SPACE, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.WHITE_SPACE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.WHITE_SPACE, DOMJSPRegionContexts.JSP_DIRECTIVE_CLOSE});
- }
-
- public void testDollarsign_Leading() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$ \"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testDollarsign_Single() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testDollarsign_SingleWithSpaces() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\" $ \"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELinContent() {
- String text = "${out.foo}";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
-
- public void testELtolerance_transparency_Dquote() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"${out.foo}\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELtolerance_transparency_DquoteWithSpaces() {
- // note: whitespace on either side returns a WHITE_SPACE context
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"_${out.foo}_\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELtolerance_transparency_Squote() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type='${out.foo}'/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPDeclaration() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%! int foo; %>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPDeclarationInCDATA() {
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%!%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPExpression() {
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%= \"Hello, World\"%>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPExpressionInCDATA() {
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%=%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPScriptlet() {
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<% %>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPScriptletInCDATA() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedTagInAttr() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("<a href=\"<jsp:getProperty/>\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSP_DHTMLimport() {
- String text = "<a> <?import type=\"foo\">";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testJSP_PI() {
- String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPAmpersandInTagNameInAttValue() {
- String text = "<a href=\"<a&b>\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{7, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
- //sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
- //assertTrue("IStructuredDocumentRegion and ITextRegion count (broken embedded tag)", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- //typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.UNDEFINED});
- //assertTrue("region context type check (broken embedded tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testJSPCommentInXMLComment() {
- String text = "s<!--\n<%--c--%>\n-->\n<html>\n<body><script> <%--c--%> </script>\n";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 5, 1, 3, 1, 3, 3, 3, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int item = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT,
- DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN,
- DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPCommentAtStartOfXMLCommentAndBlockTag() {
- String text = "s<!--<%--c--%>\n-->\n<html>\n<body><script><%--c--%> </script>\n";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1, 3, 1, 3, 3, 2, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int item = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPCommentinXMLTag() {
- String text = "s<a <%--c--%> b=c/>\n";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 7, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int item = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE},new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE, DOMRegionContext.WHITE_SPACE}});
- typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check that jsp:directive.(include|page|taglib) are recognized and
- * treated properly
- */
- public void testJSPDirectiveTags() {
- String text = "begin <jsp:directive.taglib> <jsp:directive.page a> <jsp:directive.include a=> <jsp:directive.pages a=b> end";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPDollarsign_Trailing() {
- String text = "<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPDollarsign_TrailingInContent() {
- String text = "nnn$<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check JSP code sections between HTML content
- */
- public void testJSPExpression() {
- IStructuredDocumentRegionList nodes = setUpJSP("begin <%= \"Hello,World\" %> end");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 1, 1, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPGreaterThanInAttValue() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\">next\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- assertTrue("region is not somple", !(nodes.item(0).getRegions().get(4) instanceof ITextRegionContainer));
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPInvalidTagNameInAttValue() {
- String text = "S<a type=\"a<4\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-
- assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
- //sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(1).getRegions().get(4)), 5);
- //assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- //typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(1).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- //assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPLessThanInAttValue() {
- // bails out of the attribute value with an UNDEFINED region for the
- // end quote
- String text = "<button label=\"<previous\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- //sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
- //assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
-// typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.UNDEFINED});
-// assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check JSP code sections, as a tag, scanning between HTML content
- */
- // public void testJSPScriptletTag() {
- // IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:scriptlet>
- // int foo = bar; //<jsp:Scriptlet>//</jsp:scriptlets</jsp:scriptlet>
- // end");
- //
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
- // 3,
- // 1});
- // assertTrue("IStructuredDocumentRegion and ITextRegion count",
- // sizeCheck);
- //
- // boolean typeCheck =
- // checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
- // XMLRegionContext.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
- // XMLRegionContext.XML_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
- // XMLJSPRegionContexts.JSP_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
- // XMLRegionContext.XML_END_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT});
- // assertTrue("region context type check", typeCheck);
- //
- // verifyModelLength();
- // }
- /**
- * Check JSP code sections, as a tag, scanning between HTML content
- */
- // public void testJSPTextTag() {
- // IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:text> int
- // foo
- // = bar; //<jsp:TEXT>//</jsp:Texts</jsp:text> <a> </a> end");
- //
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
- // 3,
- // 1, 3, 1, 3, 1});
- // assertTrue("IStructuredDocumentRegion and ITextRegion count",
- // sizeCheck);
- //
- // boolean typeCheck =
- // checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CDATA_TEXT})
- // && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_END_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_END_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT});
- // assertTrue("region context type check", typeCheck);
- //
- // verifyModelLength();
- // }
- /**
- * Check that jsp:root is recognized and treated properly
- */
- public void testJSPRootTag() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:root> <jsp:roots a> <jsp:roo a=> </jsp:root a=b><a>end");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPTagInAttValue() {
- String text = "<a type=\"<a/>\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testNothinginBlockJSP9() {
- String text = "<script>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testNothinginBlockXML9() {
- String text = "<script>";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- private void testSimpleTag(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 10, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testSimpleTag_JSP() {
- testSimpleTag(setUpJSP("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
- }
-
- /**
- * Check simple tag scanning between XML content
- */
- public void testSimpleTag_XML() {
- testSimpleTag(setUpXML("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
- }
-
- public void testVBLinContent() {
- String text = "#{out.foo}";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_Dquote() {
- String text = "<a type=\"#{out.foo}\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_DquoteWithSpaces() {
- // note: whitespace on either side returns a WHITE_SPACE context
- String text = "<a type=\"_#{out.foo}_\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_Squote() {
- String text = "<a type='#{out.foo}'/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testXML_DHTMLimport() {
- String text = "<a> <?import type=\"foo\">";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testXML_PI() {
- String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testXMLDollarsign_Trailing() {
- String text = "<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testUndefinedRegionContainer() {
- // see RATLC RATLC00284776
- String text = "<option <elms:inputValue value=\"<%=uomvox.uomID%>\"/><%=uomvox.uomID.equals(uomID) ? \" selected\" : \"\"%>>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{5});
- assertTrue("IStructuredDocumentRegion and overall ITextRegion count", sizeCheck);
- // checkComplexRegionTypes(nodes.item(0).getRegions(), new
- // String[]{XMLRegionContext.XML_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_ATTRIBUTE_NAME,
- // XMLRegionContext.UNDEFINED, XMLRegionContext.XML_TAG_CLOSE}, new
- // String[][] {{}});
- verifyEmbeddedContainerParentage(nodes);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * @param nodes
- */
- private void verifyEmbeddedContainerParentage(IStructuredDocumentRegionList nodes) {
- for (int i = 0; i < nodes.getLength(); i++) {
- IStructuredDocumentRegion r = nodes.item(i);
- ITextRegionList list = r.getRegions();
- for (int j = 0; j < list.size(); j++) {
- ITextRegion region = list.get(j);
- if (region instanceof ITextRegionContainer) {
- assertNotNull("parent is null for " + region, ((ITextRegionContainer) region).getParent());
- }
- }
- }
- }
-
- protected boolean verifyModelLength() {
- return checkModelLength(fModel, input.length());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
deleted file mode 100644
index 373d95f9c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-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.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentRegionIterator;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * test class for basic parsing and scanning
- */
-
-public class ScanningTests {
- private static IStructuredDocument textStore = null;
- private static long startTime = 0;
- private static long stopTime = 0;
-
- /**
- * ScanningTests constructor comment.
- */
- public ScanningTests() {
- super();
- }
-
- public static void checkNodeSeams(String fileName) {
- System.out.println("CHECKING NODE BOUNDARIES AND CONTENTS FOR " + fileName);
- Enumeration e = parseFile(fileName).elements();
- int lastEnd = 0;
- while (e.hasMoreElements()) {
- IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.nextElement();
- if (r.getStartOffset() != lastEnd)
- System.out.println("ERROR: dropped in " + r);
- if (r.getNumberOfRegions() < 1)
- System.out.println("ERROR: empty IStructuredDocumentRegion " + r);
- lastEnd = r.getEndOffset();
- }
- System.out.println("DONE");
- }
-
- public static void checkParse(String fileName) {
- checkTokenSeams(fileName);
- checkNodeSeams(fileName);
- }
-
- public static void checkTokenSeams(String fileName) {
- System.out.println("CHECKING TOKENIZER REGION BOUNDARIES FOR " + fileName);
- Iterator e = tokenizeFile(fileName).iterator();
- int lastEnd = 0;
- while (e.hasNext()) {
- IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.next();
- if (r.getStartOffset() != lastEnd)
- System.out.println("ERROR: dropped in " + r);
- lastEnd = r.getEndOffset();
- }
- System.out.println("DONE");
- }
-
- public static char[] loadChars(String fileName) {
- char[] chars = null;
- int c = 0;
- int length = 0;
- int count = 0;
- File file = null;
- FileInputStream fis = null;
- try {
- file = new File(fileName);
- length = (int) file.length();
- chars = new char[length];
- fis = new FileInputStream(file);
- while (((c = fis.read()) >= 0) && (count < length)) {
- chars[count++] = (char) c;
- }
- }
- catch (FileNotFoundException e) {
- System.out.println("File not found : \"" + fileName + "\"");
- System.exit(1);
- }
- catch (ArrayIndexOutOfBoundsException e) {
- System.out.println("Usage : java JSPLexer3 <inputfile>");
- System.exit(1);
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return chars;
- }
-
- public static RegionParser newParser() {
- JSPSourceParser parser = new JSPSourceParser();
- parser.addBlockMarker(new BlockMarker("foo", null, DOMRegionContext.BLOCK_TEXT, true));
- parser.addBlockMarker(new BlockMarker("globalFoo", null, DOMRegionContext.BLOCK_TEXT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:expression", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:scriptlet", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:declaration", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:text", null, XMLRegionContext.XML_CDATA_TEXT, true));
- return parser;
- }
-
- public static RegionParser newXMLParser() {
- XMLSourceParser parser = new XMLSourceParser();
- parser.addBlockMarker(new BlockMarker("Script", DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("stylE", DOMRegionContext.BLOCK_TEXT, false));
- return parser;
- }
-
- public static Vector parse(String stringdata) {
- return parse(stringdata, false);
- }
-
- public static Vector parse(String stringdata, boolean useXML) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- RegionParser parser = null;
- if (useXML)
- parser = newXMLParser();
- else
- parser = newParser();
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) creating a " + parser.getClass().getName());
- }
- // Caution: cast
- parser.reset(new StringReader(stringdata));
- IStructuredDocumentRegion aNode = setNodeDocument(parser.getDocumentRegions());
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
- textStore.setText(null, stringdata);
- StructuredDocumentRegionIterator.setParentDocument(aNode, textStore);
- Vector v = new Vector();
- while (aNode != null) {
- v.addElement(aNode);
- aNode = aNode.getNext();
- }
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) setting text and storing nodes");
- }
- return v;
- }
-
- public static Vector parseFile(String fileName) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- char[] input = loadChars(fileName);
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
- }
- return parse(new String(input));
- }
-
- private static IStructuredDocumentRegion setNodeDocument(IStructuredDocumentRegion startNode) {
- // Caution: cast
- IStructuredDocumentRegion aNode = startNode;
- while (aNode != null) {
- aNode.setParentDocument(textStore);
- aNode = aNode.getNext();
- }
- return startNode;
- }
-
- public static List tokenizeFile(String fileName) {
- List v = null;
- StringBuffer buff = new StringBuffer();
- try {
- //char[] input = loadChars(fileName);
- Reader input = new FileReader(fileName);
- RegionParser parser = newParser();
- // parser must be given input, before tokenizer is valid
- parser.reset(input);
- int c = 0;
- parser.getDocumentRegions();
- v = parser.getRegions();
- input.reset();
- while ((c = input.read()) >= 0) {
- buff.append((char) c);
- }
- textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
- textStore.setText(null, buff.toString());
- }
- catch (FileNotFoundException e) {
- System.out.println("File not found : \"" + fileName + "\"");
- }
- catch (IOException e) {
- }
- catch (ArrayIndexOutOfBoundsException e) {
- System.out.println("Usage : java JSPLexer3 <inputfile>");
- }
- return v;
- }
-
- public static String viewableTokenizeWithSeparator(String data) {
- StringBuffer s = new StringBuffer();
- s.append("\"");
- s.append(data);
- s.append("\"\n");
- s.append(viewableTokenize(data));
- s.append("--------------------------------------------------------------------------------\n");
- return s.toString();
- }
-
- public static String viewableTokenize(String stringdata) {
- return viewableTokenize(stringdata, false);
- }
-
- public static String viewableTokenize(String stringdata, boolean useXML) {
- java.util.List l = parse(stringdata, useXML);
- String s = "";
- for (int i = 0; i < l.size(); i++) {
- IStructuredDocumentRegion node = (IStructuredDocumentRegion) l.get(i);
- try {
- s += StringUtils.escape(node.toString()) + "\n";
- }
- catch (Exception e) {
- s += "[" + node.getStart() + ", " + node.getEnd() + "] (UNPRINTABLE " + e + ")";
- }
- ITextRegionList m = node.getRegions();
- for (int j = 0; j < m.size(); j++)
- if (m.get(j) instanceof ITextRegionContainer) {
- s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
- ITextRegionList n = ((ITextRegionContainer) m.get(j)).getRegions();
- for (int k = 0; k < n.size(); k++)
- s = s + "\t\t" + StringUtils.escape(n.get(k).toString()) + "\n";
- }
- else
- s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
- }
- return s;
- }
-
- public static String viewableTokenizeFile(String fileName) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- char[] input = loadChars(fileName);
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
- }
- return viewableTokenize(new String(input));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
deleted file mode 100644
index d6d59ce72..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class StructuredDocumentToDOMUnitTests implements IStructuredDocumentListener {
- public StructuredDocumentToDOMUnitTests() {
- super();
- }
-
- String getTestString1() {
- return "<a>a<b />b</a>"; // -> <a>ab</a>;
- }
-
- String getTestString2() {
- return "<menu>\n<rname>\nLiam's Chowder House and Grill\n</rname>\n</menu>";
- }
-
- String getTestString3() {
- // return " <?xml version=\"1.0\" ?>\n
- // <testTopSibling><p>text</p></testTopSibling>";
- return "<test/>\n\n <html>\n</html>";
- }
-
- String getTestString4() {
- return "<?xml version=\"1.0\" ?>";
- }
-
- /**
- *
- * @param args
- * java.lang.String[]
- */
- public static void main(String[] args) {
-
- try {
- StructuredDocumentToDOMUnitTests instance = new StructuredDocumentToDOMUnitTests();
- instance.testNodeDeletion4();
- }
- catch (Exception t) {
- t.printStackTrace();
- }
- }
-
- void makeChange1(IDOMModel tree) {
-
- //
- // pick a parent and ones of its children to delete
- // (note: validity of this code is highly dependent on input string)
- org.w3c.dom.Document dom = tree.getDocument();
- NodeList nodes = dom.getChildNodes();
- //
- /*
- * for "first" test case Node testParentNode = nodes.item(0); Node
- * testChildNode = testParentNode.getFirstChild();
- */
- // for "second" test case
- Node testParentNode = nodes.item(0);
- Node testChildNode = testParentNode.getFirstChild();
- testChildNode = testChildNode.getNextSibling();
-
- testParentNode.removeChild(testChildNode);
-
- }
-
- void makeChange2(IStructuredDocument structuredDocument) {
-
- // delete the apostrope in test string // 4, 4?
- structuredDocument.replaceText(this, 19, 1, null);
- }
-
- void makeChange3(IDOMModel tree) {
-
- //
- // pick a parent and ones of its children to delete
- // (note: validity of this code is highly dependent on input string)
- org.w3c.dom.Document dom = tree.getDocument();
- // NodeList nodes = dom.getChildNodes();
- //
- Node testChildNode = dom.getLastChild();
-
- dom.removeChild(testChildNode);
-
- }
-
- /**
- * newModel method comment.
- */
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- System.out.println("newModel:");
- }
-
- /**
- * noChange method comment.
- */
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- // log for now, unless we find reason not to
- Logger.log(Logger.INFO, "StructuredDocumentToDOMUnitTests::noChange needs to be implemented");
- }
-
- /**
- * nodesReplaced method comment.
- */
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- System.out.println("nodesReplaced:");
- System.out.println("\tNewFlatNodes:");
- IStructuredDocumentRegionList flatNodeList = structuredDocumentEvent.getNewStructuredDocumentRegions();
- int len = flatNodeList.getLength();
- for (int i = 0; i < len; i++) {
- String outString = flatNodeList.item(i).toString();
- outString = StringUtils.escape(outString);
- System.out.println("\t\t" + outString);
- }
- System.out.println("\tOldFlatNodes:");
- flatNodeList = structuredDocumentEvent.getOldStructuredDocumentRegions();
- len = flatNodeList.getLength();
- for (int i = 0; i < len; i++) {
- String outString = flatNodeList.item(i).toString();
- outString = StringUtils.escape(outString);
- System.out.println("\t\t" + outString);
- }
- }
-
- /**
- * regionChanged method comment.
- */
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- System.out.println("regionChanged:");
- }
-
- /**
- * regionsReplaced method comment.
- */
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- System.out.println("regionsReplaced:");
- }
-
- /**
- * Unit test -- tests basic parsing results of inserting a test string
- * into an initial string.
- */
- void testNodeDeletion() {
- // String initialString =
- // "<par><x>\ntextx\n</x>\n<y>\ntexty\n</y></par>";
- // String initialString = "<par><x>textx</x><y>texty</y></par>";
- // test cases for two text nodes left together (remove <b/>):
- // first case works, second doesn't
- // String initialString = "<a>a<b /></a>"; // -> <a>a</a>
- // String initialString = "<a>a<b />b</a>"; // -> <a>ab</a>
- // String initialString = getTestString1();
- String initialString = getTestString2();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Deletion");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
-
-
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- // makeChange1(tree);
- makeChange2(f);
-
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-
- /**
- * Unit test -- tests basic parsing results of inserting a test string
- * into an initial string.
- */
- void testNodeDeletion3() {
- String initialString = getTestString3();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Deletion");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- // makeChange1(tree);
- makeChange3(tree);
-
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-
- /**
- * Unit test -- test insert followed by delete at beginning of string.
- */
- void testNodeDeletion4() {
- String initialString = getTestString4();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Insert and Delete");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- f.replaceText(null, 0, 0, "a");
-
- System.out.println(" ==== Results after insert");
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- f.replaceText(null, 0, 1, "");
-
- System.out.println(" ==== Results after delete");
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
deleted file mode 100644
index 3aed2165a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
+++ /dev/null
@@ -1,951 +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.ui.tests.other;
-
-/**
- * Use this test class to validate an implementation of the StyledTextContent
- * interface. To perform the validation, copy this class to the package where
- * your StyledTextContent implementation lives. Then specify the fully
- * qualified name of your StyledTextContent class as an argument to the main
- * method of this class.
- *
- * NOTE: This test class assumes that your StyledTextContent implementation
- * handles the following delimiters:
- * /r /n /r/n
- *
- */
-// This class comes courtesy of Lynne Kues. Our StyledTextContent fails test
-// cases 6x of
-// "Special cases" since we (nor JFace) handle insertion between CR and LF. A
-// minor modification
-// was needed to getContentInstance for out version of StyleTextContent
-// (StructuredDocumentToTextAdapter).
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.StyledTextContent;
-import org.eclipse.swt.custom.TextChangeListener;
-import org.eclipse.swt.custom.TextChangedEvent;
-import org.eclipse.swt.custom.TextChangingEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.StructuredDocumentToTextAdapter;
-
-public class StyledTextContentSpec implements TextChangeListener {
- static String contentClassName;
- static int failCount = 0;
- static int errorCount = 0;
- Class contentClass = null;
- StyledTextContent contentInstance = null;
- int verify = 0;
- Method currentMethod = null;
- boolean failed = false;
- StyledText widget = null;
- Shell shell = null;
-
- public StyledTextContentSpec() {
- }
-
- public void assertWithMessage(String message, boolean condition) {
- System.out.print("\t" + currentMethod.getName() + " " + message);
- if (!condition)
- fail(message);
- else
- System.out.println(" passed");
- }
-
- public void fail(String message) {
- failed = true;
- System.out.println(" FAILED");
- failCount++;
- }
-
- public StyledTextContent getContentInstance() {
- contentInstance.setText("");
- widget.setContent(contentInstance);
- // dw. Had to add for our special version of StyledTextContent
- // Needs to be removed for testing jface's DocumentAdapter
- ((StructuredDocumentToTextAdapter) contentInstance).setWidget(widget);
- return contentInstance;
- }
-
- public static String getTestText() {
- return "This is the first line.\r\n" + "This is the second line.\r\n" + "This is the third line.\r\n" + "This is the fourth line.\r\n" + "This is the fifth line.\r\n" + "\r\n" + "This is the first line again.\r\n" + "This is the second line again.\r\n" + "This is the third line again.\r\n" + "This is the fourth line again.\r\n" + "This is the fifth line again.\r\n" + "\r\n" + "This is the first line once again.\r\n" + "This is the second line once again.\r\n" + "This is the third line once again.\r\n" + "This is the fourth line once again.\r\n" + "This is the fifth line once again.";
- }
-
- public static void main(String[] args) {
- StyledTextContentSpec spec = new StyledTextContentSpec();
- if (args.length > 0) {
- contentClassName = args[0];
- //String path = System.getProperty("java.library.path");
- //System.out.println("Java Library Path: " + path);
- }
- else {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
- box.open();
- return;
- }
- spec.run();
- System.out.println();
- System.out.println(failCount + " TEST FAILURES.");
- System.out.println(errorCount + " UNEXPECTED ERRORS.");
- }
-
- static private Display getDisplay() {
- return PlatformUI.getWorkbench().getDisplay();
- }
-
- public void run() {
- if (contentClassName.equals("")) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
- box.open();
- return;
- }
- if (contentClass == null) {
- try {
- contentClass = Class.forName(contentClassName);
- }
- catch (ClassNotFoundException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class:\n" + contentClassName + "\nnot found"); //$NON-NLS-1$
- box.open();
- return;
- }
- }
- try {
- contentInstance = (StyledTextContent) contentClass.newInstance();
- }
- catch (IllegalAccessException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Unable to access content class:\n" + contentClassName); //$NON-NLS-1$
- box.open();
- return;
- }
- catch (InstantiationException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Unable to instantiate content class:\n" + contentClassName); //$NON-NLS-1$
- box.open();
- return;
- }
- Class clazz;
- clazz = this.getClass();
- Method[] methods = clazz.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- setUp();
- currentMethod = methods[i];
- failed = false;
- try {
- if (currentMethod.getName().startsWith("test_")) {
- System.out.println();
- System.out.println(currentMethod.getName() + "...");
- currentMethod.invoke(this, new Object[0]);
- if (!failed) {
- System.out.println("PASSED.");
- }
- else {
- System.out.println("FAILED");
- }
- }
- }
- catch (InvocationTargetException ex) {
- System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.getTargetException().toString());
- System.out.println("FAILED");
- errorCount++;
- }
- catch (Exception ex) {
- System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.toString());
- System.out.println("FAILED");
- errorCount++;
- }
- if (verify != 0) {
- verify = 0;
- contentInstance.removeTextChangeListener(this);
- }
- tearDown();
- }
- }
-
- protected void setUp() {
- // create shell
- shell = new Shell();
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- shell.setSize(500, 300);
- shell.setLayout(layout);
- // create widget
- widget = new StyledText(shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
- GridData spec = new GridData();
- spec.horizontalAlignment = GridData.FILL;
- spec.grabExcessHorizontalSpace = true;
- spec.verticalAlignment = GridData.FILL;
- spec.grabExcessVerticalSpace = true;
- widget.setLayoutData(spec);
- shell.open();
- }
-
- protected void tearDown() {
- if (shell != null && !shell.isDisposed())
- shell.dispose();
- shell = null;
- }
-
- public void test_Delete() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(6, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("This\nia test\r"));
- assertWithMessage(":1b:", content.getLine(0).equals("This"));
- assertWithMessage(":1c:", content.getLine(1).equals("ia test"));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\n\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals(""));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(21, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("This\nis a test\nline 3"));
- assertWithMessage(":3b:", content.getLineCount() == 3);
- assertWithMessage(":3c:", content.getLine(0).equals("This"));
- assertWithMessage(":3d:", content.getLine(1).equals("is a test"));
- assertWithMessage(":3e:", content.getLine(2).equals("line 3"));
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(0, 5, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("is a test\nline 3\nline 4"));
- assertWithMessage(":4b:", content.getLineCount() == 3);
- assertWithMessage(":4c:", content.getLine(0).equals("is a test"));
- assertWithMessage(":4d:", content.getLine(1).equals("line 3"));
- assertWithMessage(":4e:", content.getLine(2).equals("line 4"));
- content.replaceTextRange(16, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4f:", newText.equals("is a test\nline 3"));
- assertWithMessage(":4g:", content.getLine(0).equals("is a test"));
- assertWithMessage(":4h:", content.getLine(1).equals("line 3"));
- content.replaceTextRange(9, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4i:", newText.equals("is a test"));
- assertWithMessage(":4j:", content.getLine(0).equals("is a test"));
- content.replaceTextRange(1, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4k:", newText.equals("i"));
- assertWithMessage(":4l:", content.getLine(0).equals("i"));
- content.replaceTextRange(0, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4m:", newText.equals(""));
- assertWithMessage(":4n:", content.getLine(0).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("This\n\r"));
- assertWithMessage(":5b:", content.getLineCount() == 3);
- assertWithMessage(":5c:", content.getLine(0).equals("This"));
- assertWithMessage(":5d:", content.getLine(1).equals(""));
- assertWithMessage(":5e:", content.getLine(2).equals(""));
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(4, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("L1\r\nL4\r\n"));
- assertWithMessage(":6b:", content.getLineCount() == 3);
- assertWithMessage(":6c:", content.getLine(0).equals("L1"));
- assertWithMessage(":6d:", content.getLine(1).equals("L4"));
- assertWithMessage(":6e:", content.getLine(2).equals(""));
- content.setText("\nL1\r\nL2");
- content.replaceTextRange(0, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("L1\r\nL2"));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("L1"));
- assertWithMessage(":7d:", content.getLine(1).equals("L2"));
- content.setText("\nL1\r\nL2\r\n");
- content.replaceTextRange(7, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", newText.equals("\nL1\r\nL2"));
- assertWithMessage(":8b:", content.getLineCount() == 3);
- assertWithMessage(":8c:", content.getLine(0).equals(""));
- assertWithMessage(":8d:", content.getLine(1).equals("L1"));
- assertWithMessage(":8e:", content.getLine(2).equals("L2"));
- content.setText("\nLine 1\nLine 2\n");
- content.replaceTextRange(0, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("\nLine 2\n"));
- assertWithMessage(":9b:", content.getLineCount() == 3);
- assertWithMessage(":9c:", content.getLine(0).equals(""));
- assertWithMessage(":9d:", content.getLine(1).equals("Line 2"));
- assertWithMessage(":9e:", content.getLine(2).equals(""));
- content.setText("Line 1\nLine 2\n");
- content.replaceTextRange(6, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":10a:", newText.equals("Line 1"));
- assertWithMessage(":10b:", content.getLineCount() == 1);
- assertWithMessage(":10c:", content.getLine(0).equals("Line 1"));
- content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");
- content.replaceTextRange(12, 17, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));
- assertWithMessage(":11b:", content.getLineCount() == 3);
- assertWithMessage(":11c:", content.getLine(0).equals("Line one is a longer line"));
- assertWithMessage(":11d:", content.getLine(1).equals("Line 3"));
- assertWithMessage(":11e:", content.getLine(2).equals(""));
- }
-
- public void test_Empty() {
- StyledTextContent content = getContentInstance();
- assertWithMessage(":1a:", content.getLineCount() == 1);
- assertWithMessage(":1b:", content.getLine(0).equals(""));
- content.setText("test");
- content.replaceTextRange(0, 4, "");
- assertWithMessage(":2a:", content.getLineCount() == 1);
- assertWithMessage(":2b:", content.getLine(0).equals(""));
- }
-
- public void test_Insert() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(0, 0, "test\n ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("test\n This\nis a test\r"));
- assertWithMessage(":1b:", content.getLineCount() == 4);
- assertWithMessage(":1c:", content.getLine(0).equals("test"));
- assertWithMessage(":1d:", content.getLine(1).equals(" This"));
- assertWithMessage(":1e:", content.getLine(2).equals("is a test"));
- assertWithMessage(":1f:", content.getLine(3).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 0, "*** ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\n*** is a test\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals("*** is a test"));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("Line 1\r\nLine 2");
- content.replaceTextRange(0, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("\rLine 1\r\nLine 2"));
- assertWithMessage(":3b:", content.getLineCount() == 3);
- assertWithMessage(":3c:", content.getLine(0).equals(""));
- assertWithMessage(":3d:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":3e:", content.getLine(2).equals("Line 2"));
- content.replaceTextRange(9, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));
- assertWithMessage(":3g:", content.getLineCount() == 4);
- assertWithMessage(":3h:", content.getLine(0).equals(""));
- assertWithMessage(":3i:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":3j:", content.getLine(2).equals(""));
- assertWithMessage(":3k:", content.getLine(3).equals("Line 2"));
- content.setText("This\nis a test\r");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("\nThis\nis a test\r"));
- assertWithMessage(":4b:", content.getLineCount() == 4);
- assertWithMessage(":4c:", content.getLine(0).equals(""));
- assertWithMessage(":4d:", content.getLine(1).equals("This"));
- assertWithMessage(":4e:", content.getLine(2).equals("is a test"));
- assertWithMessage(":4f:", content.getLine(3).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(7, 0, "\r\nnewLine");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));
- assertWithMessage(":5b:", content.getLineCount() == 4);
- assertWithMessage(":5c:", content.getLine(0).equals("This"));
- assertWithMessage(":5d:", content.getLine(1).equals("is"));
- assertWithMessage(":5e:", content.getLine(2).equals("newLine a test"));
- assertWithMessage(":5f:", content.getLine(3).equals(""));
- content.setText("");
- content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));
- assertWithMessage(":6b:", content.getLineCount() == 4);
- assertWithMessage(":6c:", content.getLine(0).equals("This"));
- assertWithMessage(":6d:", content.getLine(1).equals("is"));
- assertWithMessage(":6e:", content.getLine(2).equals("newLine a test"));
- assertWithMessage(":6f:", content.getLine(3).equals(""));
- // insert at end
- content.setText("This");
- content.replaceTextRange(4, 0, "\n ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("This\n "));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("This"));
- assertWithMessage(":7d:", content.getLine(1).equals(" "));
- content.setText("This\n");
- content.replaceTextRange(5, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7e:", newText.equals("This\n\n"));
- assertWithMessage(":7f:", content.getLineCount() == 3);
- assertWithMessage(":7g:", content.getLine(0).equals("This"));
- assertWithMessage(":7h:", content.getLine(1).equals(""));
- assertWithMessage(":7i:", content.getLine(2).equals(""));
- // insert at beginning
- content.setText("This");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", newText.equals("\nThis"));
- assertWithMessage(":8b:", content.getLineCount() == 2);
- assertWithMessage(":8c:", content.getLine(0).equals(""));
- assertWithMessage(":8d:", content.getLine(1).equals("This"));
- // insert text
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 0, "*** ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("This\n*** is a test\r"));
- assertWithMessage(":9b:", content.getLineCount() == 3);
- assertWithMessage(":9c:", content.getLine(0).equals("This"));
- assertWithMessage(":9d:", content.getLine(1).equals("*** is a test"));
- assertWithMessage(":9e:", content.getLine(2).equals(""));
- content.setText("This\n");
- content.replaceTextRange(5, 0, "line");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":10a:", newText.equals("This\nline"));
- assertWithMessage(":10b:", content.getLineCount() == 2);
- assertWithMessage(":10c:", content.getLine(0).equals("This"));
- assertWithMessage(":10d:", content.getLine(1).equals("line"));
- assertWithMessage(":10e:", content.getLineAtOffset(8) == 1);
- assertWithMessage(":10f:", content.getLineAtOffset(9) == 1);
- // insert at beginning
- content.setText("This\n");
- content.replaceTextRange(0, 0, "line\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":11a:", newText.equals("line\nThis\n"));
- assertWithMessage(":11b:", content.getLineCount() == 3);
- assertWithMessage(":11c:", content.getLine(0).equals("line"));
- assertWithMessage(":11d:", content.getLine(1).equals("This"));
- assertWithMessage(":11e:", content.getLineAtOffset(5) == 1);
- content.setText("Line 1\r\nLine 2\r\nLine 3");
- content.replaceTextRange(0, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));
- assertWithMessage(":12b:", content.getLineCount() == 4);
- assertWithMessage(":12c:", content.getLine(0).equals(""));
- assertWithMessage(":12d:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":12e:", content.getLine(2).equals("Line 2"));
- assertWithMessage(":12f:", content.getLine(3).equals("Line 3"));
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(7, 0, "Line1a\nLine1b\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));
- assertWithMessage(":13b:", content.getLineCount() == 5);
- assertWithMessage(":13c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":13d:", content.getLine(1).equals("Line1a"));
- assertWithMessage(":13e:", content.getLine(2).equals("Line1b"));
- assertWithMessage(":13f:", content.getLine(3).equals("Line 2"));
- assertWithMessage(":13g:", content.getLine(4).equals("Line 3"));
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(11, 0, "l1a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));
- assertWithMessage(":14b:", content.getLineCount() == 3);
- assertWithMessage(":14c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":14d:", content.getLine(1).equals("Linel1a 2"));
- assertWithMessage(":14e:", content.getLine(2).equals("Line 3"));
- content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");
- content.replaceTextRange(19, 0, "very, very, ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));
- assertWithMessage(":15b:", content.getLineCount() == 3);
- assertWithMessage(":15c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));
- assertWithMessage(":15e:", content.getLine(2).equals("Line 3"));
- }
-
- public void test_Line_Conversion() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getLineCount() == 5);
- assertWithMessage(":1b:", content.getLine(0).equals("This"));
- assertWithMessage(":1c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":1d:", content.getLine(1).equals("is a test"));
- assertWithMessage(":1e:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":1f:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":1g:", content.getLine(2).equals("repeat"));
- assertWithMessage(":1h:", content.getOffsetAtLine(2) == 15);
- assertWithMessage(":1i:", content.getLine(3).equals("end"));
- assertWithMessage(":1j:", content.getOffsetAtLine(3) == 22);
- assertWithMessage(":1k:", content.getLine(4).equals(""));
- assertWithMessage(":1l:", content.getOffsetAtLine(4) == 26);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getLineCount() == 2);
- assertWithMessage(":2b:", content.getLine(1).equals("is a test"));
- assertWithMessage(":2c:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":2d:", content.getLineAtOffset(5) == 0);
- content.setText("This\r\nis a test\r");
- assertWithMessage(":3a:", content.getLineCount() == 3);
- assertWithMessage(":3b:", content.getLine(1).equals("is a test"));
- assertWithMessage(":3c:", content.getLineAtOffset(15) == 1);
- content.setText("\r\n");
- assertWithMessage(":4a:", content.getLineCount() == 2);
- assertWithMessage(":4b:", content.getLine(0).equals(""));
- assertWithMessage(":4c:", content.getLine(1).equals(""));
- assertWithMessage(":4d:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":4e:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":4f:", content.getLineAtOffset(2) == 1);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":5a:", content.getLineCount() == 5);
- assertWithMessage(":5b:", content.getLine(0).equals(""));
- assertWithMessage(":5c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":5d:", content.getLine(1).equals(""));
- assertWithMessage(":5e:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":5f:", content.getLine(2).equals(""));
- assertWithMessage(":5g:", content.getOffsetAtLine(2) == 3);
- assertWithMessage(":5h:", content.getLine(3).equals(""));
- assertWithMessage(":5i:", content.getOffsetAtLine(3) == 4);
- assertWithMessage(":5j:", content.getLine(4).equals(""));
- assertWithMessage(":5k:", content.getOffsetAtLine(4) == 6);
- content.setText("test\r\rtest2\r\r");
- assertWithMessage(":6a:", content.getLineCount() == 5);
- assertWithMessage(":6b:", content.getLine(0).equals("test"));
- assertWithMessage(":6c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":6d:", content.getLine(1).equals(""));
- assertWithMessage(":6e:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":6f:", content.getLine(2).equals("test2"));
- assertWithMessage(":6g:", content.getOffsetAtLine(2) == 6);
- assertWithMessage(":6h:", content.getLine(3).equals(""));
- assertWithMessage(":6i:", content.getOffsetAtLine(3) == 12);
- assertWithMessage(":6j:", content.getLine(4).equals(""));
- assertWithMessage(":6k:", content.getOffsetAtLine(4) == 13);
- }
-
- public void test_Line_To_Offset() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":1b:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":1c:", content.getOffsetAtLine(2) == 15);
- assertWithMessage(":1d:", content.getOffsetAtLine(3) == 22);
- assertWithMessage(":1e:", content.getOffsetAtLine(4) == 26);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":2b:", content.getOffsetAtLine(1) == 6);
- content.setText("\r\n");
- assertWithMessage(":3a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":3b:", content.getOffsetAtLine(1) == 2);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":4a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":4b:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":4c:", content.getOffsetAtLine(2) == 3);
- assertWithMessage(":4d:", content.getOffsetAtLine(3) == 4);
- assertWithMessage(":4e:", content.getOffsetAtLine(4) == 6);
- content.setText("\r\ntest\r\n");
- assertWithMessage(":5a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":5b:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":5c:", content.getOffsetAtLine(2) == 8);
- }
-
- public void test_Offset_To_Line() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":1b:", content.getLineAtOffset(3) == 0);
- assertWithMessage(":1c:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":1d:", content.getLineAtOffset(25) == 3);
- assertWithMessage(":1e:", content.getLineAtOffset(26) == 4);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getLineAtOffset(5) == 0);
- assertWithMessage(":2b:", content.getLineAtOffset(6) == 1);
- assertWithMessage(":2c:", content.getLineAtOffset(10) == 1);
- content.setText("\r\n");
- assertWithMessage(":3a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":3b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":3c:", content.getLineAtOffset(2) == 1);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":4a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":4b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":4c:", content.getLineAtOffset(2) == 1);
- assertWithMessage(":4d:", content.getLineAtOffset(3) == 2);
- assertWithMessage(":4e:", content.getLineAtOffset(4) == 3);
- assertWithMessage(":4f:", content.getLineAtOffset(5) == 3);
- assertWithMessage(":4g:", content.getLineAtOffset(6) == 4);
- content.setText("\r\n\r\n");
- assertWithMessage(":5a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":5b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":5c:", content.getLineAtOffset(2) == 1);
- assertWithMessage(":5d:", content.getLineAtOffset(3) == 1);
- assertWithMessage(":5e:", content.getLineAtOffset(4) == 2);
- content.setText("\r\r\r\n\r\n");
- assertWithMessage(":6a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":6b:", content.getLineAtOffset(1) == 1);
- assertWithMessage(":6c:", content.getLineAtOffset(2) == 2);
- assertWithMessage(":6d:", content.getLineAtOffset(4) == 3);
- content.setText("");
- assertWithMessage(":7a:", content.getLineAtOffset(0) == 0);
- content = getContentInstance();
- assertWithMessage(":8a:", content.getLineAtOffset(0) == 0);
- }
-
- public void test_Replace() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 4, "a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("This\na test\r"));
- assertWithMessage(":1b:", content.getLineCount() == 3);
- assertWithMessage(":1c:", content.getLine(0).equals("This"));
- assertWithMessage(":1d:", content.getLine(1).equals("a test"));
- assertWithMessage(":1e:", content.getLine(2).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 2, "was");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\nwas a test\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals("was a test"));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("This is a test\r");
- content.replaceTextRange(5, 2, "was");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("This was a test\r"));
- assertWithMessage(":3b:", content.getLineCount() == 2);
- assertWithMessage(":3c:", content.getLine(0).equals("This was a test"));
- assertWithMessage(":3d:", content.getLineAtOffset(15) == 0);
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(0, 7, "La\nLb\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));
- assertWithMessage(":4b:", content.getLine(0).equals("La"));
- assertWithMessage(":4c:", content.getLine(1).equals("Lb"));
- assertWithMessage(":4d:", content.getLine(2).equals("Line 2"));
- assertWithMessage(":4e:", content.getLine(3).equals("Line 3"));
- content.setText(getTestText());
- newText = content.getTextRange(0, content.getCharCount());
- int start = content.getOffsetAtLine(6);
- int end = content.getOffsetAtLine(11);
- content.replaceTextRange(start, end - start, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", content.getLineCount() == 12);
- assertWithMessage(":5a:", content.getLine(5).equals(""));
- assertWithMessage(":5a:", content.getLine(6).equals(""));
- start = content.getOffsetAtLine(7);
- content.replaceTextRange(start, content.getCharCount() - start, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", content.getLineCount() == 8);
- assertWithMessage(":5a:", content.getLine(5).equals(""));
- assertWithMessage(":5a:", content.getLine(6).equals(""));
- assertWithMessage(":5a:", content.getLine(7).equals(""));
- }
-
- public void test_Special_Cases() {
- String newText;
- StyledTextContent content = getContentInstance();
- assertWithMessage(":0a:", content.getLineCount() == 1);
- assertWithMessage(":0b:", content.getOffsetAtLine(0) == 0);
- content.setText("This is the input/output text component.");
- content.replaceTextRange(0, 0, "\n");
- assertWithMessage(":1a:", content.getLine(0).equals(""));
- content.replaceTextRange(1, 0, "\n");
- assertWithMessage(":1b:", content.getLine(0).equals(""));
- content.replaceTextRange(2, 0, "\n");
- assertWithMessage(":1c:", content.getLine(0).equals(""));
- content.replaceTextRange(3, 0, "\n");
- assertWithMessage(":1d:", content.getLine(0).equals(""));
- content.replaceTextRange(4, 0, "\n");
- assertWithMessage(":1e:", content.getLine(0).equals(""));
- content.replaceTextRange(5, 0, "\n");
- assertWithMessage(":1f:", content.getLine(0).equals(""));
- content.replaceTextRange(6, 0, "\n");
- assertWithMessage(":1g:", content.getLine(0).equals(""));
- content.replaceTextRange(7, 0, "\n");
- assertWithMessage(":1h:", content.getLine(0).equals(""));
- content.setText("This is the input/output text component.");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("\nThis is the input/output text component."));
- assertWithMessage(":2b:", content.getLine(0).equals(""));
- assertWithMessage(":2c:", content.getLine(1).equals("This is the input/output text component."));
- content.replaceTextRange(1, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2d:", newText.equals("\n\nThis is the input/output text component."));
- assertWithMessage(":2e:", content.getLine(0).equals(""));
- assertWithMessage(":2f:", content.getLine(1).equals(""));
- assertWithMessage(":2g:", content.getLine(2).equals("This is the input/output text component."));
- content.replaceTextRange(2, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("\n\n\nThis is the input/output text component."));
- assertWithMessage(":3b:", content.getLine(0).equals(""));
- assertWithMessage(":3c:", content.getLine(1).equals(""));
- assertWithMessage(":3d:", content.getLine(2).equals(""));
- assertWithMessage(":3e:", content.getLine(3).equals("This is the input/output text component."));
- content.replaceTextRange(3, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));
- assertWithMessage(":3g:", content.getLine(0).equals(""));
- assertWithMessage(":3h:", content.getLine(1).equals(""));
- assertWithMessage(":3i:", content.getLine(2).equals(""));
- assertWithMessage(":3j:", content.getLine(3).equals(""));
- assertWithMessage(":3k:", content.getLine(4).equals("This is the input/output text component."));
- content.replaceTextRange(3, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("\n\n\nThis is the input/output text component."));
- assertWithMessage(":4b:", content.getLine(0).equals(""));
- assertWithMessage(":4c:", content.getLine(1).equals(""));
- assertWithMessage(":4d:", content.getLine(2).equals(""));
- assertWithMessage(":4e:", content.getLine(3).equals("This is the input/output text component."));
- content.replaceTextRange(2, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4f:", newText.equals("\n\nThis is the input/output text component."));
- assertWithMessage(":4g:", content.getLine(0).equals(""));
- assertWithMessage(":4h:", content.getLine(1).equals(""));
- assertWithMessage(":4i:", content.getLine(2).equals("This is the input/output text component."));
- content.replaceTextRange(2, 0, "a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("\n\naThis is the input/output text component."));
- assertWithMessage(":5b:", content.getLine(0).equals(""));
- assertWithMessage(":5c:", content.getLine(1).equals(""));
- assertWithMessage(":5d:", content.getLine(2).equals("aThis is the input/output text component."));
- // delete only part of a delimiter
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(0, 3, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5e:", newText.equals("\nL2\r\nL3\r\nL4\r\n"));
- assertWithMessage(":5f:", content.getLineCount() == 5);
- assertWithMessage(":5g:", content.getLine(0).equals(""));
- assertWithMessage(":5h:", content.getLine(1).equals("L2"));
- assertWithMessage(":5i:", content.getLine(2).equals("L3"));
- assertWithMessage(":5j:", content.getLine(3).equals("L4"));
- assertWithMessage(":5k:", content.getLine(4).equals(""));
- // replace part of a delimiter
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(3, 1, "test\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("L1\rtest\nL2\r\nL3\r\nL4\r\n"));
- assertWithMessage(":6b:", content.getLineCount() == 6);
- assertWithMessage(":6c:", content.getLine(0).equals("L1"));
- assertWithMessage(":6d:", content.getLine(1).equals("test"));
- assertWithMessage(":6e:", content.getLine(2).equals("L2"));
- assertWithMessage(":6f:", content.getLine(3).equals("L3"));
- assertWithMessage(":6g:", content.getLine(4).equals("L4"));
- assertWithMessage(":6h:", content.getLine(5).equals(""));
- content.setText("abc\r\ndef");
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("ac\r\ndef"));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("ac"));
- assertWithMessage(":7d:", content.getLine(1).equals("def"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7e:", newText.equals("a\r\ndef"));
- assertWithMessage(":7f:", content.getLineCount() == 2);
- assertWithMessage(":7g:", content.getLine(0).equals("a"));
- assertWithMessage(":7h:", content.getLine(1).equals("def"));
- content.replaceTextRange(1, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7i:", newText.equals("adef"));
- assertWithMessage(":7j:", content.getLineCount() == 1);
- assertWithMessage(":7k:", content.getLine(0).equals("adef"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7l:", newText.equals("aef"));
- assertWithMessage(":7m:", content.getLineCount() == 1);
- assertWithMessage(":7n:", content.getLine(0).equals("aef"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7o:", newText.equals("af"));
- assertWithMessage(":7p:", content.getLineCount() == 1);
- assertWithMessage(":7q:", content.getLine(0).equals("af"));
- content.setText("abc");
- content.replaceTextRange(0, 1, "1");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", content.getLineCount() == 1);
- assertWithMessage(":8b:", newText.equals("1bc"));
- assertWithMessage(":8c:", content.getLine(0).equals("1bc"));
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8d:", newText.equals("\n1bc"));
- assertWithMessage(":8e:", content.getLineCount() == 2);
- assertWithMessage(":8f:", content.getLine(0).equals(""));
- assertWithMessage(":8g:", content.getLine(1).equals("1bc"));
- content = getContentInstance();
- content.replaceTextRange(0, 0, "a");
- content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
- content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
- assertWithMessage(":9b:", content.getLineCount() == 6);
- assertWithMessage(":9c:", content.getLine(0).equals("package test;"));
- assertWithMessage(":9d:", content.getLine(1).equals("\t/*Line 1"));
- assertWithMessage(":9e:", content.getLine(2).equals("\t * Line 2"));
- assertWithMessage(":9f:", content.getLine(3).equals("\t */"));
- assertWithMessage(":9g:", content.getLine(4).equals("public class SimpleClass {"));
- assertWithMessage(":9h:", content.getLine(5).equals("}"));
- }
-
- public void test_Text_Changed_Event() {
- StyledTextContent content = getContentInstance();
- content.addTextChangeListener(this);
- verify = 1;
- content.setText("testing");
- content.replaceTextRange(0, 0, "\n");
- verify = 2;
- content.setText("\n\n");
- content.replaceTextRange(0, 2, "a");
- verify = 3;
- content.setText("a");
- content.replaceTextRange(0, 1, "\n\n");
- verify = 5;
- content.setText("Line 1\r\nLine 2");
- content.replaceTextRange(0, 0, "\r");
- verify = 6;
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(21, 7, "");
- verify = 7;
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- verify = 8;
- content.setText("\nL1\r\nL2\r\n");
- content.replaceTextRange(7, 2, "");
- verify = 9;
- content.setText("L1\r\n");
- content.replaceTextRange(2, 2, "test");
- verify = 0;
- content.removeTextChangeListener(this);
- }
-
- public void textChanged(TextChangedEvent event) {
- }
-
- public void textChanging(TextChangingEvent event) {
- switch (verify) {
- case 1 :
- {
- assertWithMessage(":1a:", event.replaceLineCount == 0);
- assertWithMessage(":1b:", event.newLineCount == 1);
- break;
- }
- case 2 :
- {
- assertWithMessage(":2a:", event.replaceLineCount == 2);
- assertWithMessage(":2b:", event.newLineCount == 0);
- break;
- }
- case 3 :
- {
- assertWithMessage(":3a:", event.replaceLineCount == 0);
- assertWithMessage(":3b:", event.newLineCount == 2);
- break;
- }
- case 4 :
- {
- assertWithMessage(":4a:", event.replaceLineCount == 0);
- assertWithMessage(":4b:", event.newLineCount == 1);
- break;
- }
- case 5 :
- {
- assertWithMessage(":5a:", event.replaceLineCount == 0);
- assertWithMessage(":5b:", event.newLineCount == 1);
- break;
- }
- case 6 :
- {
- assertWithMessage(":6a:", event.replaceLineCount == 1);
- assertWithMessage(":6b:", event.newLineCount == 0);
- break;
- }
- case 8 :
- {
- assertWithMessage(":8a:", event.replaceLineCount == 1);
- assertWithMessage(":8b:", event.newLineCount == 0);
- break;
- }
- case 9 :
- {
- assertWithMessage(":9a:", event.replaceLineCount == 1);
- assertWithMessage(":9b:", event.newLineCount == 0);
- break;
- }
- case 10 :
- {
- assertWithMessage(":10a:", event.replaceLineCount == 0);
- assertWithMessage(":10b:", event.newLineCount == 0);
- break;
- }
- case 11 :
- {
- assertWithMessage(":11a:", event.replaceLineCount == 0);
- assertWithMessage(":11b:", event.newLineCount == 0);
- break;
- }
- case 12 :
- {
- assertWithMessage(":12a:", event.replaceLineCount == 0);
- assertWithMessage(":12b:", event.newLineCount == 0);
- break;
- }
- case 13 :
- {
- assertWithMessage(":13a:", event.replaceLineCount == 0);
- assertWithMessage(":13b:", event.newLineCount == 0);
- break;
- }
- case 14 :
- {
- assertWithMessage(":14a:", event.replaceLineCount == 0);
- assertWithMessage(":14b:", event.newLineCount == 1);
- break;
- }
- case 15 :
- {
- assertWithMessage(":15a:", event.replaceLineCount == 1);
- assertWithMessage(":15b:", event.newLineCount == 2);
- break;
- }
- case 16 :
- {
- assertWithMessage(":16a:", event.replaceLineCount == 0);
- assertWithMessage(":16b:", event.newLineCount == 1);
- break;
- }
- case 17 :
- {
- assertWithMessage(":17a:", event.replaceLineCount == 0);
- assertWithMessage(":17b:", event.newLineCount == 2);
- break;
- }
- case 18 :
- {
- assertWithMessage(":18a:", event.replaceLineCount == 0);
- assertWithMessage(":18b:", event.newLineCount == 1);
- break;
- }
- case 19 :
- {
- assertWithMessage(":19a:", event.replaceLineCount == 0);
- assertWithMessage(":19b:", event.newLineCount == 4);
- break;
- }
- case 20 :
- {
- assertWithMessage(":20a:", event.replaceLineCount == 0);
- assertWithMessage(":20b:", event.newLineCount == 2);
- break;
- }
- }
- }
-
- public void textSet(TextChangedEvent event) {
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
deleted file mode 100644
index 2876f483c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
+++ /dev/null
@@ -1,98 +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.ui.tests.other;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here.
- * Creation date: (3/20/2001 6:19:58 PM)
- * @author: David Williams
- */
-public class StyledTextTest {
- /**
- * StyledTextTest constructor comment.
- */
- public StyledTextTest() {
- super();
- }
-
- /**
- * Don't forget, the *swt*.dll will have to be copied to program directory for this to work.
- */
- public static void main(String[] args) {
-
- try {
- Shell shell = new Shell();
- GridLayout layout = new GridLayout();
- shell.setLayout(layout);
-
- Button button = new Button(shell, SWT.PUSH);
- button.setText("Action");
- button.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- System.out.println("button pushed");
- }
- });
-
- StyledText text = new StyledText(shell, SWT.BORDER + SWT.H_SCROLL + SWT.V_SCROLL);
- GridData data = new GridData(GridData.FILL_BOTH);
- text.setLayoutData(data);
-
- //
- // String fileName = System.getProperty("user.dir") + "\\" + "japanese_utf-16.txt";
- // String encoding = "UnicodeBig";
-
- String fileName = System.getProperty("user.dir") + "\\" + "japanese_cp1252.txt";
- String encoding = "Cp1252";
- //sun.io.ByteToCharConverter.getDefault().toString();
-
- System.out.println("Test file: " + fileName);
- System.out.println(" Encoding: " + encoding);
-
- InputStream in = new FileInputStream(fileName);
- InputStreamReader inStream = new InputStreamReader(in, encoding);
- //Reader inStream = new FileReader(fileName);
- StringBuffer sb = new StringBuffer();
- while (inStream.ready()) {
- sb.append((char) inStream.read());
- }
- String inputString = sb.toString();
- System.out.println("Length of input: " + inputString.length());
- //
- text.setText(inputString);
-
- shell.setSize(400, 200);
- shell.open();
-
- Display display = shell.getDisplay();
- while (shell != null && !shell.isDisposed()) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- }
- catch (Exception t) {
- t.printStackTrace();
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
deleted file mode 100644
index b9f0cfb8d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1798 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class UnitTests extends TestCase {
-
- protected IStructuredDocument fModel;
- protected IDOMModel tree;
- protected int eventCase = 1;
- protected boolean eventResult;
-
- public static final int GENERIC_NODES_REPLACED_EVENT_CASE = 1001;
- public static final int GENERIC_REGIONS_REPLACED_EVENT_CASE = 1002;
- public static final int GENERIC_REGION_CHANGED_EVENT_CASE = 1003;
- public static final int GENERIC_NEW_MODEL_EVENT_CASE = 1004;
- public static final int GENERIC_NO_CHANGE_EVENT_CASE = 1005;
-
- protected class StructuredDocumentListenerProxy implements IStructuredDocumentListener {
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
- }
-
- protected StructuredDocumentListenerProxy proxy = new StructuredDocumentListenerProxy();
-
- /**
- * MinimizationTest constructor comment.
- */
- public UnitTests(String name) {
- super(name);
- }
-
- protected void handleEvent(StructuredDocumentEvent structuredDocumentEvent) {
- eventResult = false;
- switch (eventCase) {
- case 1 :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 2 :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 3 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 4 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 5 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
- break;
- }
- case 6 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
- if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
- eventResult = true; // ok
- }
- }
- break;
- }
- case 7 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
-
- break;
- }
- case 8 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- //if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
- //if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
- eventResult = true; // ok
- }
- break;
- }
- case 9 :
- case 10 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
- if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
- eventResult = true; // ok
- }
- break;
- }
- case 11 :
- case 12 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
- if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
- eventResult = true; // ok
- }
- break;
- }
- case 13 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size())
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size())
- eventResult = true; // ok
- }
- break;
- }
- case 14 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
- break;
- }
- case 15 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- RegionChangedEvent regionChangedEvent = (RegionChangedEvent) structuredDocumentEvent;
- IStructuredDocumentRegion documentRegion = ((RegionChangedEvent) structuredDocumentEvent).getStructuredDocumentRegion();
- if ("b ".equals(documentRegion.getFullText(regionChangedEvent.getRegion()))) {
- eventResult = true; // ok
- }
- }
- break;
- }
- case 16 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (0 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 17 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 18 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 19 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 20 :
- case 21 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 22 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 23 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 24 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 25 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 26 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- // JSP5
- case 27 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 28 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 29 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 30 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- // JSP6
- case 31 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 32 :
- {
- // changed 2002, 9/12 to fit -- this is definitely a change
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- RegionsReplacedEvent regionsReplacedEvent = (RegionsReplacedEvent) structuredDocumentEvent;
- if (1 == regionsReplacedEvent.getOldRegions().size()) {
- ITextRegion region = regionsReplacedEvent.getOldRegions().get(0);
- IStructuredDocumentRegion documentRegion = regionsReplacedEvent.getStructuredDocumentRegion();
- String text = documentRegion.getText(region);
- if ("<% aaa %>".equals(text)) {
- eventResult = true; // ok
- }
-
- }
- }
- else if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- StructuredDocumentRegionsReplacedEvent nodesReplacedEvent = (StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent;
- IStructuredDocumentRegionList regions = nodesReplacedEvent.getNewStructuredDocumentRegions();
-
- if (1 == regions.getLength()) {
- IStructuredDocumentRegion region = regions.item(0);
- String text = region.getText();
- //System.out.println(text);
- if ("<c<% aaa ".equals(text)) {
- eventResult = true;
- }
- }
-
- }
- break;
- }
- case 33 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- // if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 34 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- case 35 :
- {
- // chanced to RegionsReplaced 2002, 9/11 (attribute value to region container)
- // String startString = "<p><img src=\"file.gif\"><p>";
- // String changes = "<";
- // String expectedString = "<p><img src=\"file<.gif\"><p>";
-
- // if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 36 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 37 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 38 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 39 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 40 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- case GENERIC_NODES_REPLACED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_REGIONS_REPLACED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_REGION_CHANGED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_NEW_MODEL_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof NewDocumentEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_NO_CHANGE_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- default :
- {
- if (structuredDocumentEvent instanceof NewDocumentEvent) {
- eventResult = true; // ok
- }
- }
- }
- }
-
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- if (args.length == 0) {
- runAll();
- }
- else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
- }
-
- protected static void runAll() {
- junit.textui.TestRunner.run(suite());
-
- }
-
- public static void runOne(String methodName) {
- TestSuite testSuite = new TestSuite();
- TestCase test = new UnitTests(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
-
- }
-
- /**
- * Set up an XML model
- */
- protected void setUpXML() {
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- fModel = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- fModel.addDocumentChangedListener(proxy);
-
- tree = new DOMModelImpl();
-
- if (tree != null) {
- fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
- tree.setStructuredDocument(fModel);
- }
-
- }
-
- /**
- * Set up a JSP model
- */
- protected void setUpJSP() {
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- fModel = mm.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- fModel = StructuredDocumentFactory.getNewStructuredDocumentInstance(new JSPSourceParser());
-
- fModel.addDocumentChangedListener(proxy);
-
- tree = new DOMModelImpl();
-
- if (tree != null) {
- fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
- tree.setStructuredDocument(fModel);
- }
-
- }
-
- /**
- */
- public void simpleTest() {
-
- setUpJSP();
- eventCase = 99;
- String startString = "";
- String changes = "<a></a>";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- //
- fModel.setText(null, startString);
-
- //
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void simpleTest2() {
-
- setUpXML();
- eventCase = 99;
- String startString = "";
- String changes = "<a></a>";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void simpleTest3() {
-
- setUpXML();
- eventCase = 99;
- String startString = "<a></a>";
- String changes = "";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:16:02 PM)
- * @return junit.framework.Test
- */
- protected static Test suite() {
- return new TestSuite(UnitTests.class);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:28:59 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testDeleteBeginning() {
-
- setUpXML();
- eventCase = 4;
- String expectedString = "<GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 10, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:27:31 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testDeleteEnd() {
-
- setUpXML();
- eventCase = 3;
- String expectedString = "<ABC><DEF>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 10, 5, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- */
- public void testEmbedded() {
-
- setUpJSP();
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<p><img src=\"file.gif\"><p>";
- String changes = "<";
- String expectedString = "<p><img src=\"file<.gif\"><p>";
- int startOfChanges = 17;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- eventCase = 35;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("part 1: text update", result);
- assertTrue("part 1: event type", eventResult);
-
- eventCase = 36;
- startString = expectedString;
- changes = "%";
- expectedString = "<p><img src=\"file<%.gif\"><p>";
- startOfChanges = 18;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 2: text update", result);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 37;
- startString = expectedString;
- changes = " ";
- expectedString = "<p><img src=\"file<% .gif\"><p>";
- startOfChanges = 19;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 3: text update", result);
- assertTrue("part 3: event type", eventResult);
-
- eventCase = 38;
- startString = expectedString;
- changes = "ab ";
- expectedString = "<p><img src=\"file<% ab .gif\"><p>";
- startOfChanges = 20;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 4: text update", result);
- assertTrue("part 4: event type", eventResult);
-
- eventCase = 39;
- startString = expectedString;
- changes = "%";
- expectedString = "<p><img src=\"file<% ab %.gif\"><p>";
- startOfChanges = 23;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 5: text update", result);
- assertTrue("part 5: event type", eventResult);
-
- eventCase = 40;
- startString = expectedString;
- changes = ">";
- expectedString = "<p><img src=\"file<% ab %>.gif\"><p>";
- startOfChanges = 24;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 6: text update", result);
- assertTrue("part 6: event type", eventResult);
-
- }
-
- /**
- */
- public void testEmbeddedJSP2() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<a >c</a>";
- String changes = "<%= b %>";
- String expectedString = "<a <%= b %>>c</a>";
- int startOfChanges = 3;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testDeepEmbeddedJSP() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<script><a >c</a></script>";
- String changes = "<%= b %>";
- String expectedString = "<script><a <%= b %> >c</a></script>";
- int startOfChanges = 11;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
- String testText = testR.getText();
- assertTrue("text retrieve", testText.equals("<a <%= b %> >"));
- testText = testR.getFullText();
- assertTrue("text retrieve", testText.equals("<a <%= b %> >"));
-
- ITextRegionList regionList = testR.getRegions();
-
- ITextRegion region = regionList.get(0);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<"));
-
- region = regionList.get(1);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("a"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("a "));
-
- region = regionList.get(2);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<%= b %>"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("<%= b %> "));
-
- // ===
-
- ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
- ITextRegionList eRegions = cRegion.getRegions();
- ITextRegion eRegion = eRegions.get(0);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
-
- eRegion = eRegions.get(1);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(" b "));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" b "));
-
- eRegion = eRegions.get(2);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("%>"));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("%>"));
-
- eRegion = eRegions.get(3);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(""));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" "));
-
- // ====
-
- region = regionList.get(3);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals(">"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals(">"));
-
- }
-
- public void testDeepEmbeddedJSP2() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<script><a >c</a></script>";
- String changes = "<%= b %";
- String expectedString = "<script><a <%= b % >c</a></script>";
- int startOfChanges = 11;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
- String testText = testR.getText();
- assertTrue("text retrieve", testText.equals("<a <%= b % >"));
- testText = testR.getFullText();
- assertTrue("text retrieve", testText.equals("<a <%= b % >"));
-
- ITextRegionList regionList = testR.getRegions();
-
- ITextRegion region = regionList.get(0);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<"));
-
- region = regionList.get(1);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("a"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("a "));
-
- region = regionList.get(2);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<%= b % >"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("<%= b % >"));
-
- // ===
-
- ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
- ITextRegionList eRegions = cRegion.getRegions();
- ITextRegion eRegion = eRegions.get(0);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
-
- eRegion = eRegions.get(1);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(" b % >"));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" b % >"));
-
-
- // ====
- }
-
- public void testDeepEmbeddedJSP3() {
- // CMVC 245586
- // this is a test to make sure ContextRegionContainer returns what we expect
- setUpJSP();
- String startString = "<html><head><script> <%! String testvar = \"testvar\"; %> var test = <%= testvar %> </script></head></html>";
- String expectedText = "<%! String testvar = \"testvar\"; %>";
- ((XMLSourceParser) fModel.getParser()).addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false)); //$NON-NLS-1$
- fModel.setText(null, startString);
-
- fModel.getRegionList();
-
- IStructuredDocumentRegion scriptBlockRegion = fModel.getRegionAtCharacterOffset(21);
- ITextRegionList blockRegions = scriptBlockRegion.getRegions();
- ITextRegionContainer jspDecl = (ITextRegionContainer) blockRegions.get(1);
- String fullText = jspDecl.getFullText();
-
- //assertTrue("ContextRegionContainer.getFullText()", fullText.equals(expectedText));
- assertEquals("ContextRegionContainer.getFullText() value incorrect: ", expectedText, fullText);
- }
-
- public void testJSP1() {
-
- setUpJSP();
- eventCase = 23;
- String startString = "abcd<%= abc %>efgh";
- String expectedString = "abcd< %= abc %>efgh";
- String changes = " ";
- int startOfChanges = 5;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testJSP2() {
-
- setUpJSP();
- eventCase = 24;
- String startString = "abcd<% abc %>efgh";
- String expectedString = "abcd< % abc %>efgh";
- String changes = " ";
- int startOfChanges = 5;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testJSP3() {
-
- setUpJSP();
- eventCase = 25;
- String startString = "<%= abc %>";
- String expectedString = "< %= abc %>";
- String changes = " ";
- int startOfChanges = 1;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- public void testJSP4() {
-
- setUpJSP();
- eventCase = 26;
- String startString = "<% abc %>";
- String expectedString = "< % abc %>";
- String changes = " ";
- int startOfChanges = 1;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- Give a JSP scriptlet :
- <% aaa %>
- When an user types "<bb>" just before
- the JSP scriptlet :
- (1) When '<' is typed, regionsReplaced()
- is called for "<%".
- (2) When 'b' is typed, nodesReplaced()
- is called for "<<%" and " aaa ".
- (3) When 'b' is typed again, finally,
- nodesReplaced() is called for
- "<b<% aaa" and "%>".
- The end JSP IStructuredDocumentRegion should be
- reparsed at (1), but not wait until (3).
-
- */
- public void testJSP5() {
-
- setUpJSP();
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<% aaa %><p>";
- String changes = "<";
- String expectedString = "<<% aaa %><p>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- eventCase = 27;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- assertEquals("part 1: text update", expectedString, resultString);
- assertTrue("part 1: event type", eventResult);
-
- // step 2
- // ? does assertTrue prevent rest from executing if 'false'?
- // ans: yes
- eventCase = 28;
- startString = expectedString;
- changes = "b";
- expectedString = "<b<% aaa %><p>";
- startOfChanges = 1;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- assertEquals("part 2: text update", expectedString, resultString);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 29;
- startString = expectedString;
- changes = "b";
- expectedString = "<bb<% aaa %><p>";
- startOfChanges = 2;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- assertEquals("part 3: text update", expectedString, resultString);
- assertTrue("part 3: event type", eventResult);
-
- eventCase = 30;
- startString = expectedString;
- changes = ">";
- expectedString = "<bb><% aaa %><p>";
- startOfChanges = 3;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- assertEquals("part 4: text update", expectedString, resultString);
- assertTrue("part 4: event type", eventResult);
- }
-
- /**
- Example 4)
-
- Given two JSP scriptlets :
- <% aaa %><% bbb %>
- When an user types "<cccc>" just before
- the JSP scriptlet, watch the IStructuredDocument events
- on each character typing.
- You will see the next JSP IStructuredDocumentRegion is reparsed
- (to be broken into other type of IStructuredDocumentRegion)
- one by one on each event.
- But it should be at once at the first event.
- Old Component: wsa.web.pageediting
- New Component: wsa.web.xmleditor
-
-
- */
- public void testJSP6() {
- // caution ... we're re-using event checks from JSP5
-
- setUpJSP();
-
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<% aaa %><% bbb %>";
- String changes = "<";
- String expectedString = "<<% aaa %><% bbb %>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
- eventCase = 31;
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
- assertTrue("part 1: text update", result);
- assertTrue("part 1: event type", eventResult);
-
- eventCase = 32;
- startString = expectedString;
- changes = "c";
- expectedString = "<c<% aaa %><% bbb %>";
- startOfChanges = 1;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 2: text update", result);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 33;
- startString = expectedString;
- changes = "c";
- expectedString = "<cc<% aaa %><% bbb %>";
- startOfChanges = 2;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 3: text update", result);
- assertTrue("part 3: event type", eventResult);