This commit was manufactured by cvs2svn to create tag 'v200905060217'.
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index 62260a4..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_tests.feature_*.zip
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- 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 bfdf708..0000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_tests.feature/epl-v10.html b/features/org.eclipse.wst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- 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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 6c7982c..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index 6085777..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="3.0.1.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.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.css.ui.tests.performance"
- 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"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests.performance"
- 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 5644598..0000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- 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 bfdf708..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- 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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 bce1c91..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index f4464e1..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="3.0.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <requires>
- <import feature="org.eclipse.wst.xml_ui.feature" version="3.0.5"/>
- <import feature="org.eclipse.test" version="3.3.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.dtd.core.tests"
- download-size="0"
- 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.sse.ui.tests.performance"
- 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.ui.tests.performance"
- 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.tests.performance"
- 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 303e665..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.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 f35525c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- 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 2dd8b5c..0000000
--- 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 ef2ac65..0000000
--- 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 c59368c..0000000
--- 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 f724958..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.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 b09eedd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +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.204.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.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom,
- org.eclipse.jst.jsp.core.tests.model,
- org.eclipse.jst.jsp.core.tests.taglibindex
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- 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-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 2199df3..0000000
--- 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 ebcd377..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,25 +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,\
- META-INF/,\
- testfiles/,\
- about.html,\
- plugin.properties
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 93d3d51..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
deleted file mode 100644
index 139f204..0000000
--- 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 d98679f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,71 +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.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestFixedCMDocuments;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestTaglibCMTests;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-import org.eclipse.jst.jsp.core.tests.dom.TestImportedNodes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelIncludes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelRelease;
-import org.eclipse.jst.jsp.core.tests.model.TestModelWithNoFile;
-import org.eclipse.jst.jsp.core.tests.source.JSPTokenizerTest;
-import org.eclipse.jst.jsp.core.tests.translation.JSPJavaTranslatorCoreTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPActionValidatorTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPBatchValidatorTest;
-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("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");
-
- 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, "JSP Model Tests"));
- addTest(new TestSuite(TestModelWithNoFile.class, "JSP Model with no file Tests"));
- // temporarily removed since unstable, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213754
- // addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests"));
- addTest(new TestSuite(JSPTokenizerTest.class, "Special Parsing Tests"));
- addTest(new TestSuite(JSPJavaTranslatorCoreTest.class));
- addTest(new TestSuite(TestModelIncludes.class));
- addTest(new TestSuite(JSPCorePreferencesTest.class));
- addTest(new TestSuite(JSPedCSSSourceParserTest.class, "Special Parsing Tests for JSP-CSS content"));
- addTest(new TestSuite(JSPJavaValidatorTest.class, "JSP Java Validator Tests"));
- addTest(new TestSuite(TestImportedNodes.class, "Imported Nodes Tests"));
- addTest(new TestSuite(TestFixedCMDocuments.class, "Fixed CMDocument Creation Tests"));
- addTest(new TestSuite(TestTaglibCMTests.class, "Custom Tag Library Content Model Tests"));
- addTest(new TestSuite(JSPActionValidatorTest.class, "JSP Action Validator Tests"));
- addTest(new TestSuite(JSPBatchValidatorTest.class, "JSP Batch Validator Tests"));
-
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 10dda5f..0000000
--- 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 58eabf6..0000000
--- 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 57f180c..0000000
--- 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 183caf9..0000000
--- 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 794f832..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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/TestCeanupFormat.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
deleted file mode 100644
index 7a4df41..0000000
--- 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 c1c838e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.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;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- *
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
- /**
- * Constructor for TestModelManager.
- *
- * @param name
- */
- public TestModelManager(String name) {
- super(name);
- }
-
- public void testModelManager() throws IOException {
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- assertTrue("modelManager must not be null", modelManager != null);
-
- try {
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
- assertTrue("basic XML empty model could not be created", model != null);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testNullArgument() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
- Exception e = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- model = modelManager.getModelForEdit((String) null, null, null);
- } catch (IllegalArgumentException exception) {
- e = exception;
- assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
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 6539f3f..0000000
--- 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 ad456c9..0000000
--- 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 394b7df..0000000
--- 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("=======================================");
- }
- assertTrue(false);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 0483882..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>
- /t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2>
- </t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- t3>
- </t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>/t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2></t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 > <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 ><t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 >t3></t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index cbace4d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
- action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
- height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG
- src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java
- servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to
- store the counter. If you have not already installed and configured
- your database for the WebSphere samples, refer to <A
- href="../Configuration/DBConfig.html">Database Configuration</A> for
- instructions. </FONT></P>
- <P><FONT size="-1"><A
- href="javascript:document.myForm.submit()" target="_self"> <B>Run
- this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
- name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a
- counter every time it is invoked </FONT>
- <UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that
- invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides
- information about the servlet to the WebSphere Application
- Server </FONT>
- </UL>
- </UL>
- <P><FONT size="-1">The Application Server processes
- .jsp files with its JSP 1.0 processor servlet. It handles the
- <jsp:include ... /> tag as a server-side include, replacing
- the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
- cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
- cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
- width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1"> How to use this sample on your
- web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any
- HTML page you have on your site. Rename the HTML file with a .jsp
- file extension, put the Java .class and .servlet files in the
- classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca18..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
- <HEAD>
-<META http-equiv
-=
-"Content-Type"
-content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name = "myForm" method="post" action="../Controllers/SampleController">
- <TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2">
- <IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the <jsp:include ... /> tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b8413..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
- <!--
- No space
- -->
- <!--
- OneSpace
- -->
- <!--
- One tab
- -->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.-->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
-
- -->
- <!--
-
-
-
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
-
-
-
- -->
- <item type="appetizer">
- <!-- a
- b-->
- <!-- a
- b -->
- <!--
- a
- b-->
- <!--
- a
- b -->
- <!--
- a
- b
- -->
- <!-- a
- b
- -->
- <!--
-
-
-
- a
-
-
-
- b
-
-
-
- -->
- <desc>Prosciutto ham with melon</desc>
- <!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 2969878..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <!-- comment on a new line -->
- <menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
- One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
- <item type="appetizer">
-<!-- a
- b-->
-<!-- a
- b -->
-<!--
-a
- b-->
-<!--
-a
- b -->
-<!--
-a
- b
--->
-<!-- a
- b
- -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
- <desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a00..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price units="usd" units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price
- units="usd"
- units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bc..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc> <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/> <!-- inline comment after tag --></price>
-<price units="usd"> <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount=promotion price=57>
- <description>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber="custNumber"/>
- <BillTo custNumber= "custNumber"/>
- <BillTo custNumber ="custNumber"/>
- <BillTo custNumber = "custNumber"/>
- <BillTo custNumber="custNumber" name="Craig" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name="name" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name = "Craig" phone="phone"/>
- <BillTo custNumber="custNumber" name="name" phone="phone"/>
- <BillTo custNumber = "X5739" name="Craig Salter" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount="promotion" price="57">
- <description>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </Header>
- <Item discount=promotion price=57>
- <description>A wedding ring
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
- type="hidden" name="command"
- value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
- name="previous_page" value="Login/Login.jsp"> <A
- href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40"
- value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40"
- value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name" v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
- xmi.version="1.0"
- timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel
- xmi.name="UML"
- xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1"
- xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension
- xmi.extender="IXT"
- xmi.extenderID="">
- <ixts s="IDL">
- <ixttv
- t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D" />
- <ixttv
- t="is_unit"
- v="TRUE" />
- <ixttv
- t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv
- t="is_loaded"
- v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv
- t="charSet"
- v="0" />
- <ixttv
- t="version"
- v="43" />
- <ixttv
- t="_written"
- v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>
- XMI Toolkit
- </XMI.exporter>
-
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public"/>
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
- />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D"
- />
- <ixttv
- t="is_unit"
- v="TRUE"
- />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat""
- />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" /></ixts></XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/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 8a49f9e..0000000
--- 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 7b9be5a..0000000
--- 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 01ad2f9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
- abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Create">
- <TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Delete">
- <TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Edit">
- <TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
- <html:hidden property="action" />
- <TABLE border="0" width="100%">
-
- <TR>
- <TH align="right"><bean:message key="prompt.username" />:</TH>
- <TD align="left"><bean:write name="user" property="username"
- filter="true" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
- <TD align="left"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:text property="host" size="50" />
- </logic:equal> <logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:hidden property="host" write="true" />
- </logic:notEqual></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
- <TD align="left"><html:text property="username" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
- <TD align="left"><html:password property="password" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
- <TD align="left"><html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label" />
- </html:select></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
- <TD align="left"><html:checkbox property="autoConnect" /></TD>
- </TR>
-
- <TR>
- <TD align="right"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal></TD>
- <TD align="left"><logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset" />
- </html:reset>
- </logic:notEqual> <html:cancel>
- <bean:message key="button.cancel" />
- </html:cancel></TD>
- </TR>
-
- </TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
- <tr>
- <th align="right">
- <bean:message key="prompt.username"/>:
- </th>
- <td align="left">
- <bean:write name="user" property="username" filter="true"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailHostname"/>:
- </th>
- <td align="left">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:text property="host" size="50"/>
- </logic:equal>
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:hidden property="host" write="true"/>
- </logic:notEqual>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailUsername"/>:
- </th>
- <td align="left">
- <html:text property="username" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailPassword"/>:
- </th>
- <td align="left">
- <html:password property="password" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailServerType"/>:
- </th>
- <td align="left">
- <html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.autoConnect"/>:
- </th>
- <td align="left">
- <html:checkbox property="autoConnect"/>
- </td>
- </tr>
-
- <tr>
- <td align="right">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- </td>
- <td align="left">
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset"/>
- </html:reset>
- </logic:notEqual>
-
- <html:cancel>
- <bean:message key="button.cancel"/>
- </html:cancel>
- </td>
- </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa784..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e48..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag >
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/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 1f679b9..0000000
--- 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 6858790..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,134 +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.contentmodels;
-
-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.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class TestTaglibCMTests extends TestCase {
- private static final String TESTFILES_PATHSTRING = "/testfiles/";
- private static final String PROJECT_NAME = "testLoadTaglibs";
- private static final String TAG_NAME = "logic:empty";
-
- public TestTaglibCMTests(String name) {
- super(name);
- }
-
- public TestTaglibCMTests() {
- super();
- }
-
- public static Test suite() {
- return new TestTaglibCMTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace(TESTFILES_PATHSTRING + PROJECT_NAME, Path.ROOT.append(PROJECT_NAME).toString());
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", Path.ROOT.append(PROJECT_NAME).append("web stuff/WEB-INF/lib/struts.jar").toString());
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- }
- assertTrue(project.isAccessible());
- }
-
- public void testLoadCustomTagsThroughJSPSyntax() throws IOException, CoreException {
- IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/test1.jsp"));
-
- 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"));
-
- 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"));
-
- 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();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f83..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index ff92ba2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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 cfb55d5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,198 +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.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
- private static ModelHandlerRegistry getModelHandlerRegistry() {
- ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
- return registry;
- }
-
- public TestModelHandlers() {
- super();
- }
-
- public void testCreation() {
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- assertTrue("model handler registry must exist", registry != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- 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 testDirtyStateForEmbeddedContentTypeSubXML() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("rdf.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateForDefaultEmbeddedContentType() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("default.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-
- public void testDirtyStateWithNoPageDirective() throws Exception {
- String name = "bug243243";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.isAccessible()) {
- project = BundleResourceUtil.createSimpleProject(name, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
- }
- IFile testFile = project.getFile("nodirective.jsp");
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
- assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
- model.releaseFromRead();
- project.delete(true, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
deleted file mode 100644
index 74e69ee..0000000
--- 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 71105b5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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 0377392..0000000
--- 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 a908c51..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-/**
- * Tests for JSP include directives
- */
-public class TestModelIncludes extends TestCase {
- String wtp_autotest_noninteractive = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests the custom tag content model when single line fragments are used
- * without trailing white space
- *
- * @throws Exception
- */
- public void testContentModelSingleLineIncludedFileWithNoSpacesButWithTaglibInInclude() throws Exception {
- String projectName = "prj119576_a";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/prj119576_a/WebContent/body2.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- Element element = (Element) model.getIndexedRegion(75);
- CMElementDeclaration ed = ModelQueryUtil.getModelQuery(model).getCMElementDeclaration(element);
- assertNotNull("no (TLD) element declaration found for " + element.getNodeName(), ed);
- assertTrue("not a wrapping content model element declaration: " + ed.getNodeName(), ed instanceof CMNodeWrapper);
- assertTrue("not a taglib content model element declaration: " + ed.getNodeName(), ((CMNodeWrapper) ed).getOriginNode() instanceof TLDElementDeclaration);
- String tagClassName = ((TLDElementDeclaration) ((CMNodeWrapper) ed).getOriginNode()).getTagclass();
- assertNotNull("no tag class name found", tagClassName);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * multiple lines
- *
- * @throws Exception
- */
- public void testTranslateMultiLineIncludedFileWithSpacesAndScriptletInInclude() throws Exception {
- String projectName = "prj119576_c";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found\n" + source, source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * single line and document region and no trailing white space.
- *
- * @throws Exception
- */
- public void testTranslateSingleLineIncludedFileWithNoSpacesButScriptletInInclude() throws Exception {
- String projectName = "prj119576_b";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found", source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
deleted file mode 100644
index 76f539c..0000000
--- 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 cca9267..0000000
--- 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 ef81df8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,229 +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.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsp.core.internal.contenttype.BooleanStack;
-import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-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();
- BooleanStack.maxDepth = 500;
- tokenizer = new JSPTokenizer();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- BooleanStack.maxDepth = 100;
- 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());
- }
- }
-
- // Need to simulate typing characters into the document to cause the stack overflow.
- 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 71a8c05..0000000
--- 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 c3f5573..0000000
--- 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 ddde555..0000000
--- 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 8169d29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.translation;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-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.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.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.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.jst.jsp.core.tests.validation.ReporterForTest;
-import org.eclipse.jst.jsp.core.tests.validation.ValidationContextForTest;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-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";
-
- 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);
-
- if (model.getFactoryRegistry().getFactoryFor(IJSPTranslation.class) == null) {
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
- }
- 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());
- 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");
- 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_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));
- }
- 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")) {
- 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);
- }
- }
-
- // 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("Problem markers found", reporter.getMessages().size() == 0);
-
- // clean up if we got to the end
- project.delete(true, true, null);
- }
-}
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 d289dec..0000000
--- 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 9520642..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ /dev/null
@@ -1,153 +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);
-
- assertTrue("jsp action validator found errors when it should not have", 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 7f654ec..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.validation.ReporterHelper;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Batch Validator
- */
-public class JSPBatchValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "batchvalidation";
- Object originalWorkspaceValue = null;
- IEclipsePreferences workspaceScope = null;
- IEclipsePreferences projectScope = null;
- Object[] validatorIds = new String[]{"org.eclipse.jst.jsp.core.JSPContentValidator", "org.eclipse.jst.jsp.core.JSPBatchValidator"};
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
- protected void setUp() throws Exception {
- super.setUp();
-
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- if (!getProject().exists()) {
- BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", getProject().exists());
-
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
- IFile fragment = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String qualifier = JSPCorePlugin.getDefault().getBundle().getSymbolicName();
- workspaceScope = new InstanceScope().getNode(qualifier);
- projectScope = new ProjectScope(fragment.getProject()).getNode(qualifier);
- originalWorkspaceValue = workspaceScope.get(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, null);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
- if (originalWorkspaceValue != null)
- workspaceScope.put(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, originalWorkspaceValue.toString());
- else
- workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- }
-
- /**
- * Tests validating 2 jsp files. See
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=214441
- *
- * @throws Exception
- */
- public void testValidating2Files() throws Exception {
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath1 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jsp";
- IFile file1 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
- assertTrue(file1.exists());
-
- String filePath2 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors2.jsp";
- IFile file2 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
- assertTrue(file2.exists());
-
- helper.setURIs(new String[]{filePath1, filePath2});
-
- validator.validate(helper, reporter);
- assertTrue("jsp errors were not found in both files", reporter.getMessages().size() == 2);
- }
-
- public void testFragmentValidationPreferenceOnProject() throws Exception {
- JSPBatchValidator validator1 = new JSPBatchValidator();
- JSPContentValidator validator2 = new JSPContentValidator();
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
- ValidationResult result = null;
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- // enable workspace-wide but disable in project, no problem markers
- // expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertEquals("Problems found while fragment validation was disabled in project but enabled on workspace", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
- /*
- * disable workspace-wide but enable in project, some problem markers
- * expected
- */
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
- projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- JSPFContentProperties.setProperty(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problems not found while fragment validation was enabled for project but disabled on workspace", 0 < (((ReporterHelper)result.getReporter(null)).getMessages().size()));
- }
-
- public void testFragmentValidationPreferenceOnWorkspace() throws Exception {
- JSPBatchValidator validator1 = new JSPBatchValidator();
- JSPContentValidator validator2 = new JSPContentValidator();
- String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- ValidationResult result = null;
-
- // disable workspace-wide, no problem markers expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertEquals("Problem markers found while fragment validation was disabled", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
- // enable workspace-wide, some problem markers expected
- workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- ValidationFramework.getDefault().validate(new IProject[]{getProject()}, true, false, new NullProgressMonitor());
- ValidationFramework.getDefault().join(new NullProgressMonitor());
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problem markers not found while fragment validation was enabled on workspace", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
-
- // check default value is true
- workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
-
- result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
- result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
- assertTrue("Problem markers not found while fragment validation was preferences were default", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
- }
-
- /**
- * @return
- */
- private IProject getProject() {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/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 622071d..0000000
--- 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 ab7667d..0000000
--- 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 81d7453..0000000
--- 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 1d47410..0000000
--- 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 1c4b700..0000000
--- 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 49ab4db..0000000
--- 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 06f5e7c..0000000
--- 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 6e4a6ec..0000000
--- 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 f36aaa3..0000000
--- 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 29b6482..0000000
--- 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 cf760e6..0000000
--- 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 1d40579..0000000
--- 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 ddd9993..0000000
--- 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 83fff30..0000000
--- 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 23ac7c0..0000000
--- 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 671d71d..0000000
--- 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 c2678fb..0000000
--- 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 de5f2ac..0000000
--- 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 709b113..0000000
--- 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 bdb584b..0000000
--- 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 19723c5..0000000
--- 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 a86aee5..0000000
--- 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 b00d5b4..0000000
--- 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 238ad9e..0000000
--- 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 38ddb8c..0000000
--- 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 5e63836..0000000
--- 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 18709a8..0000000
--- 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 4f03d5a..0000000
--- 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 2e39e57..0000000
--- 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 e98a251..0000000
--- 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 01b344e..0000000
--- 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 0216ce5..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 bfaf629..0000000
--- 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 8abadc7..0000000
--- 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 99c4331..0000000
--- 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 bfdd673..0000000
--- 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/batchvalidation/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- 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 96a356a..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 0957ef8..0000000
--- 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 36b7230..0000000
--- 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 5ab5b55..0000000
--- 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 afafcd1..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 d5aec8f..0000000
--- 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 80341f8..0000000
--- 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 167796c..0000000
--- 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 0bb9d17..0000000
--- 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 fd534a9..0000000
--- 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 254272e..0000000
--- 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 af3a82b..0000000
--- 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 7cf9d88..0000000
--- 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 254272e..0000000
--- 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 af3a82b..0000000
--- 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 951882c..0000000
--- 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 edb36ca..0000000
--- 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 eb59416..0000000
--- 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 84f2b19..0000000
--- 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 43db39a..0000000
--- 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 2c1da55..0000000
--- 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 dd3b084..0000000
--- 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 254272e..0000000
--- 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 47cea3c..0000000
--- 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 d3f9436..0000000
--- 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 9b89ce0..0000000
--- 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 ac2daa5..0000000
--- 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 652ebe7..0000000
--- 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 382b355..0000000
--- 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 10c7724..0000000
--- 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 14a2df6..0000000
--- 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 5ec3b3b..0000000
--- 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 a375624..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 d03194c..0000000
--- 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 060f5d1..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 4600e2b..0000000
--- 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 770dfe4..0000000
--- 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 e69de29..0000000
--- 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 34906a0..0000000
--- 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 4dc2f5b..0000000
--- 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 5d094dc..0000000
--- 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 5ec3b3b..0000000
--- 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 2a08dba..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 fbabe44..0000000
--- 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 62ebcc8..0000000
--- 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 91f4f01..0000000
--- 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 2be00cd..0000000
--- 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 10e7250..0000000
--- 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 e616ade..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 0a9f2ba..0000000
--- 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 22e550e..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 04f9bc5..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 1d5f5d4..0000000
--- 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 5041b27..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 04f9bc5..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 1a98c41..0000000
--- 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 4803032..0000000
--- 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 5ec3b3b..0000000
--- 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 a375624..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 ecdb748..0000000
--- 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 14a721c..0000000
--- 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 57da683..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 cc2ae42..0000000
--- 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 ac7bfe4..0000000
--- 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 fe8bc9f..0000000
--- 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 ffc0129..0000000
--- 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 76ed56f..0000000
--- 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 eead6ed..0000000
--- 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 254272e..0000000
--- 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 ebad27b..0000000
--- 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 1853669..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 5ec3b3b..0000000
--- 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 e3720e7..0000000
--- 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 bf80a5b..0000000
--- 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 0ca9502..0000000
--- 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 e69de29..0000000
--- 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 b63ab41..0000000
--- 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 1db7a00..0000000
--- 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 e69de29..0000000
--- 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 3638108..0000000
--- 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 6935c88..0000000
--- 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 e69de29..0000000
--- 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 24a759b..0000000
--- 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 b63ab41..0000000
--- 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 30509bf..0000000
--- 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 e69de29..0000000
--- 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 4292126..0000000
--- 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 bdda8a5..0000000
--- 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 e69de29..0000000
--- 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 24a759b..0000000
--- 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 add958d..0000000
--- 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 30509bf..0000000
--- 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 e69de29..0000000
--- 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 57efa60..0000000
--- 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 e69de29..0000000
--- 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 8e971e7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_265380/test265380.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- 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 e3720e7..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 bf80a5b..0000000
--- 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 3baff4b..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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/j/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
deleted file mode 100644
index 233be1d..0000000
--- 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 63bc5f5..0000000
--- 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 ebc7d97..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
deleted file mode 100644
index 233be1d..0000000
--- 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 304ac0b..0000000
--- 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 cc2ae42..0000000
--- 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 6225fab..0000000
--- 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 fe8bc9f..0000000
--- 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 ffc0129..0000000
--- 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 8ee0c15..0000000
--- 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 39b9b4c..0000000
--- 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 254272e..0000000
--- 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 1a98c41..0000000
--- 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 af23273..0000000
--- 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 379a44c..0000000
--- 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 55549b4..0000000
--- 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 58db5bd..0000000
--- 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 a539fd6..0000000
--- 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 6c2d86f..0000000
--- 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 4cdb542..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 cc2ae42..0000000
--- 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 6225fab..0000000
--- 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 fe8bc9f..0000000
--- 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 ffc0129..0000000
--- 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 8ee0c15..0000000
--- 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 39b9b4c..0000000
--- 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 254272e..0000000
--- 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 1a98c41..0000000
--- 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 0ba8bed..0000000
--- 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 379a44c..0000000
--- 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 828d240..0000000
--- 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 eecf27e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 cc2ae42..0000000
--- 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 349f4b2..0000000
--- 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 fe8bc9f..0000000
--- 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 ffc0129..0000000
--- 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 8ee0c15..0000000
--- 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 39b9b4c..0000000
--- 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 254272e..0000000
--- 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 1a98c41..0000000
--- 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 73560f8..0000000
--- 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 6aa2289..0000000
--- 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 71c73cf..0000000
--- 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 503c7a0..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 db32f9f..0000000
--- 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/testLoadTaglibs/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
deleted file mode 100644
index f363448..0000000
--- 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 45399cd..0000000
--- 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 e69de29..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 e8d3327..0000000
--- 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 29650a4..0000000
--- 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 e73f832..0000000
--- 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/testTranslatorMessagesWithIncludes/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- 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 147f011..0000000
--- 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 e69de29..0000000
--- 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 53c815a..0000000
--- 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 1990ad7..0000000
--- 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 b2faa53..0000000
--- 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 fd72975..0000000
--- 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 e69de29..0000000
--- 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/testavailable1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
deleted file mode 100644
index 8d5f4fb..0000000
--- 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 5baaadd..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 0a9f2ba..0000000
--- 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 5baaadd..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 0a9f2ba..0000000
--- 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 a335f6a..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 04f9bc5..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 5ec3b3b..0000000
--- 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 274293f..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 e69de29..0000000
--- 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 04f9bc5..0000000
--- 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 a3d07f0..0000000
--- 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 2be00cd..0000000
--- 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 e69de29..0000000
--- 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 5f2075a..0000000
--- 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 254272e..0000000
--- 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 e69de29..0000000
--- 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 749285c..0000000
--- 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 62ebcc8..0000000
--- 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 f0e8347..0000000
--- 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 91f4f01..0000000
--- 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 2be00cd..0000000
--- 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 10e7250..0000000
--- 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 18acb71..0000000
--- 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 e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/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 ce73933..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d6..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index d7925ce..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.201.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.0,4.0.0)",
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 56b8544..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,21 +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,\
- META-INF/
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 eea9f1f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 54097e0..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
- public static Test suite() {
- return new JSPEncodingTestSuite();
- }
-
- public JSPEncodingTestSuite() {
- super("JSP Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public JSPEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public JSPEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public JSPEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 7fdecd2..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static JSPEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
-
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public JSPEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index 16777c1..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public JSPEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = JSPEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testdefect4205wpsjsp() throws IOException {
- String filename = fileLocation + "defect_4205_wps.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testJSPEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true,
- * it appears incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "testUTF16.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16WithJapaneseChars() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16leXmlStyle() throws IOException {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 0c919a9..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,350 +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.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fCharset;
- private String fContentType;
- private String fContentTypeValue;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
- private String fLanguage;
-
- private void doTestFile(String filename, String expectedName) throws Exception {
- doTestFile(filename, expectedName, null, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- JSPHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new JSPHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
-
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
-
- String foundContentType = getContentType();
- if (expectedContentType == null) {
- assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
- }
- else {
- assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- public void testNormalNonDefault() throws Exception {
- String filename = fileLocation + "NormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8");
- }
-
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * This method should be exactly the same as what is in
- * JSPResourceEncodingDetector
- *
- * @param contentType
- */
- private void parseContentTypeValue(String contentType) {
- Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
- String[] parts = pattern.split(contentType);
- if (parts.length > 0) {
- // if only one item, it can still be charset instead of
- // contentType
- if (parts.length == 1) {
- if (parts[0].length() > 6) {
- String checkForCharset = parts[0].substring(0, 7);
- if (checkForCharset.equalsIgnoreCase("charset")) {
- int eqpos = parts[0].indexOf('=');
- eqpos = eqpos + 1;
- if (eqpos < parts[0].length()) {
- fCharset = parts[0].substring(eqpos);
- fCharset = fCharset.trim();
- }
- }
- else {
- fContentType = parts[0];
- }
- }
- }
- else {
- fContentType = parts[0];
- }
- }
- if (parts.length > 1) {
- fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws Exception {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = null;
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
-
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- else if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fXMLDecEncodingName = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fPageEncodingValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fLanguage = valueToken.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws Exception {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testMinimalPageDirective() throws Exception {
- String filename = fileLocation + "minimalPageDirective.jsp";
- doTestFile(filename, null, null, "text/html");
- }
-
- public void testIllFormed() throws Exception {
- String filename = fileLocation + "testIllFormed.jsp";
- doTestFile(filename, null);
- }
-
- public void testIllFormed2() throws Exception {
- String filename = fileLocation + "testIllFormed2.jsp";
- doTestFile(filename, "UTF-8");
- }
-
- public void testIllformedNormalNonDefault() throws Exception {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8", null, "text/html");
- }
-
- public void testEmptyFile() throws Exception {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirective() throws Exception {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalPageDirectiveWithXMLDecl() throws Exception {
- String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
- doTestFile(filename, "ISO-8859-1", null, "text/html");
- }
-
-
- public void testNoPageDirectiveAtFirst() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirectiveInLargeFile() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
- }
-
- public void testNormalCaseWithNeither() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3", null, "text/html");
- }
-
- public void testUTF16le() throws Exception {
- String filename = fileLocation + "utf16le.jsp";
- doTestFile(filename, "UTF-16LE", null, "text/html");
- }
-
- public void testUTF16be() throws Exception {
- String filename = fileLocation + "utf16be.jsp";
- doTestFile(filename, "UTF-16BE", null, "text/html");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.zzRefill(JSPHeadTokenizer.java:359)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.primGetNextToken(JSPHeadTokenizer.java:598)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.getNextToken(JSPHeadTokenizer.java:254)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
-
- public void testUTF16BOM() throws Exception {
- String filename = fileLocation + "utf16BOM.jsp";
- doTestFile(filename, "UTF-16", null, null);
- }
- */
-
- public void testUTF16leXmlStyle() throws Exception {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFile(filename, "UTF-16LE", null, null);
- }
-
- public String getLanguage() {
- return fLanguage;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index a532152..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
- super.doTest(expectedContentType, filePath, expectedException);
-
- IFile file = (IFile) getTestProject().findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
- checkResults(expectedJSPContentType, streamJSPContentType);
-
-
- String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
- checkResults(expectedJSPContentType, fileJSPContentType);
-
-
- }
-
- private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
- if (expectedJSPContentType == null) {
- assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
- }
- else {
- assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
- }
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
- }
- public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
- }
- public void testFile79() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
- }
-
-
- public void testFile90() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le.jsp", null, "text/html");
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16be.jsp", null, "text/html");
- }
-
- public void testFile105() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16BOM.jsp", null, null);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le_xmlStyle.jsp", null, null);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 8ed692e..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
-
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e68..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cf..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次：<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e3..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b4..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 7656902..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a08..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c18..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3b..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 88e271a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbe..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests/.cvsignore b/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
deleted file mode 100644
index 3a5e932..0000000
--- 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 71a50f1..0000000
--- 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 afa5c91..0000000
--- 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 2dd8b5c..0000000
--- 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 ef2ac65..0000000
--- 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 c59368c..0000000
--- 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 f724958..0000000
--- 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 73b4e4e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +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.202.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.0,4.0.0)",
- 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.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 2199df3..0000000
--- 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 874b2da..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ /dev/null
@@ -1,22 +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 = plugin.xml,\
- testfiles.zip,\
- test.xml,\
- projecttestfiles/,\
- testfiles/,\
- jspuitests.jar,\
- META-INF/,\
- about.html,\
- plugin.properties
-jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/
-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 ecd1be5..0000000
--- 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 8652797..0000000
--- 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 e47777b..0000000
--- 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 28a3785..0000000
--- 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 16f4e25..0000000
--- 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 161e3f5..0000000
--- 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 75ebdb8..0000000
--- 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/plugin.properties b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
deleted file mode 100644
index be2912a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-# properties file for org.eclipse.jst.jsp.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor for JSP Tests
-view.name.0 = Embedded JSP Structured Text Viewer
-taglibview.name.0=TaglibIndex Delta Trace View
-_UI_SHOW_TRANSLATION=Show 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 cb2f478..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ /dev/null
@@ -1,43 +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.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>
-</plugin>
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 c50a9a9..0000000
--- 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 32204f2..0000000
--- 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 773a303..0000000
--- 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/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 d0f7382..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
+++ /dev/null
@@ -1,168 +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.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();
- }
-
- /*
- * (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 new Path(fModel.getBaseLocation()).lastSegment() + ".java";
- }
-
- /*
- * (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 b18d497..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ /dev/null
@@ -1,114 +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);
- }
-}
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 64e1eb1..0000000
--- 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 6cce0fa..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
-import org.eclipse.jst.jsp.ui.tests.contentdescription.TestContentDescription;
-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;
-
-
-
-
-public class JSPUITestSuite extends TestSuite {
- public static Test suite() {
- return new JSPUITestSuite();
- }
-
- public JSPUITestSuite() {
- super("SSE JSP UI Test Suite");
-
- addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
- addTest(new TestSuite(UnitTests.class, "UnitTests"));
- addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
- addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
- addTest(new TestSuite(JSPJavaTranslatorTest.class, "JSPJavaTranslatorTest"));
- addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
- addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfoProviderTest"));
- addTest(new TestSuite(JSPTranslationTest.class, "JSPTranslationTest"));
- addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistryText"));
- addTest(new TestSuite(JSPUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationJSP.class));
- addTest(new TestSuite(TestEditorConfigurationJSP.class));
-
- // moved from jsp core tests because they require UI
- addTest(new TestSuite(TestPageDirective.class));
- addTest(new TestSuite(FileBufferDocumentTester.class));
- addTest(new TestSuite(TestModelClone.class));
-
- addTest(new TestSuite(TestModelsFromFiles.class, "TestModelsFromFiles"));
- addTest(new TestSuite(TestModelEmbeddedContentType.class, "TestModelEmbeddedContentType"));
-
- addTest(new TestSuite(TestContentDescription.class, "Content Description Tests"));
- addTest(new TestSuite(JSPHTMLValidatorTest.class, "JSPHTMLValidatorTest"));
- // pa_TODO fix this test
- //addTest(new TestSuite(JSPSearchTests.class));
- }
-}
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 f61d946..0000000
--- 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 22b1072..0000000
--- 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 29405ed..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
+++ /dev/null
@@ -1,123 +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.expressions.EvaluationContext;
-import org.eclipse.core.resources.IMarker;
-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.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.ide.IDE;
-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(ExecutionEvent event) throws ExecutionException {
- // IDE.openEditor(event.getApplicationContext(), createEditorInput(),
- // JavaUI.ID_CU_EDITOR, true);
- EvaluationContext evaluationContext = (EvaluationContext) event.getApplicationContext();
- if (evaluationContext != null) {
- Object selection = evaluationContext.getDefaultVariable();
- if (selection instanceof List) {
- List list = (List) selection;
- if (!list.isEmpty()) {
- if (list.get(0) instanceof IDOMNode) {
- IDOMModel model = ((IDOMNode) list.get(0)).getModel();
- INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
- if (adapter != null) {
- // create an IEditorInput for the Java editor
- IStorageEditorInput input = new JSPTranslationEditorInput(model);
- try {
- IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaUI.ID_CU_EDITOR, true);
- // Now add the problems we found
- if (editor instanceof ITextEditor) {
- IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
- translation.reconcileCompilationUnit();
- List problemsList = translation.getProblems();
- IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
- AnnotationTypeLookup lookup = new AnnotationTypeLookup();
- for (int i = 0; i < problems.length; i++) {
- if (problems[i] instanceof IJSPProblem)
- continue;
- int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
- Position position = new Position(problems[i].getSourceStart(), length);
- Annotation annotation = null;
- String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
- if (problems[i].isError()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
- }
- else if (problems[i].isWarning()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
- }
- annotation = new Annotation(type, false, problems[i].getMessage());
- if (annotation != null) {
- annotationModel.addAnnotation(annotation, position);
- }
- }
- }
- }
- catch (PartInitException e) {
- e.printStackTrace();
- Display.getCurrent().beep();
- }
- }
- }
- }
- }
- }
- return 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 e6ea06b..0000000
--- 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 90ae561..0000000
--- 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 154156d..0000000
--- 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 f6b3dd0..0000000
--- 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 7adfab6..0000000
--- 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/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 7936096..0000000
--- 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/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 3e99414..0000000
--- 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, 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.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(\"\"+\n testJspString") + 14;
- assertEquals("incorrect cursor position >" + cursorStart, 667, 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 87ad400..0000000
--- 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, 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.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:", 1009, javaOffset);
-
- // (<%= | %>)
- int javaTestPostition = translation.getJavaText().indexOf("out.print(\"\"+\n \n);") + 14;
- // 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; 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), javaPos, expectedJavaPos);
- }
- 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(920,31));
- fXMLJSPPositions.put(new Position(961,7), new Position(952,7));
- fXMLJSPPositions.put(new Position(1018,14), new Position(89,14));
- fXMLJSPPositions.put(new Position(640,2), new Position(888,2));
- fXMLJSPPositions.put(new Position(406,24), new Position(759,24));
- fXMLJSPPositions.put(new Position(685,19), new Position(897,19));
- fXMLJSPPositions.put(new Position(650,26), new Position(861,26));
- fXMLJSPPositions.put(new Position(563,9), new Position(848,9));
- fXMLJSPPositions.put(new Position(461,23), new Position(784,23));
- fXMLJSPPositions.put(new Position(522,8), new Position(822,8));
- fXMLJSPPositions.put(new Position(323,44), new Position(274,45));
- fXMLJSPPositions.put(new Position(245,43), new Position(229,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/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 f8c7c02..0000000
--- 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 9e65437..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource
+++ /dev/null
@@ -1,36 +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 = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-out.print(""+
- testJspString
-);
-
-
- if( request.getAttribute("SoapURL") != null )
- {
-
-out.print(""+
- (String)request.getAttribute("SoapURL")
-);
-
- }
- else
- {
-
- }
- } 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 e63843c..0000000
--- 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 20eb369..0000000
--- 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_TESTS_2F_jsp_include_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 = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
- 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(""+
-
-);
- } 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 614ac03..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
+++ /dev/null
@@ -1,35 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import java.util.List;
-public class __2F_INCLUDES_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 = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-String consec1 = "test";
-String consec2 = "two";
-out.print(""+
-myFunc()
-);
-out.print(""+
-myFunc2()
-);
-javax.swing.AbstractButton jb = new javax.swing.JButton();
-String includedString = "incd";
- jb.
-{ // <logic:iterate>
-} // </logic:iterate>
- } 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 4657f58..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_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 = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-
-int a = 1;
-if (a
-<
- 2) {
- out.println("x");
-}
-
-String test = "";
-
-
-
-int a = 1;
-if (a < 2) {
- out.println("x");
-}
-
-
-
- test.toUpperCase();
- } 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 a5f3546..0000000
--- 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 e013669..0000000
--- 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 08f1fdd..0000000
--- 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 ceb218f..0000000
--- 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 d880b15..0000000
--- 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 f248994..0000000
--- 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 87f8aa0..0000000
--- 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 82eccdf..0000000
--- 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 e2ffeec..0000000
--- 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 c2dcaba..0000000
--- 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, 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 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 373d95f..0000000
--- 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 d6d59ce..0000000
--- 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 3aed216..0000000
--- 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 2876f48..0000000
--- 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 15c4963..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1851 +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();
-
- boolean result = (expectedString.equals(resultString));
- assertTrue("part 1: text update", result);
- 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();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 2: text update", result);
- 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();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 3: text update", result);
- 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();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 4: text update", result);
- 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);
-
- eventCase = 34;
- startString = expectedString;
- changes = ">";
- expectedString = "<cc><% aaa %><% bbb %>";
- startOfChanges = 3;
- 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);
-
- }
-
- /**
- * this test easily returns "ok" even with the no-space bug. Its mostly to
- * "hand examine" the structuredDocument created from the initial setText.
- */
- public void testJSPDirective() {
-
- setUpJSP();
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<%@include%>";
- String changes = "T";
- String expectedString = "<%@include%>T";
- int startOfChanges = 12;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // ?
- // assertTrue(result); // && eventResult);
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:53:08 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod10() {
-
- setUpXML();
- eventCase = 10;
- String expectedString = "<TD></TD>";
-
- fModel.setText(null, "<TD></TD><TD></TD>");
-
- fModel.replaceText(null, 9, 9, "");
- 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/2/2001 10:56:04 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod11() {
-
- setUpXML();
- eventCase = 11;
- String expectedString = "<XXX><TD></TD><XXX>";
-
- fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
- fModel.replaceText(null, 5, 9, "");
- 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/2/2001 10:59:39 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod12() {
-
- setUpXML();
- eventCase = 12;
- String expectedString = "<XXX><TD></TD><XXX>";
-
- fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
- fModel.replaceText(null, 14, 9, "");
- 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/2/2001 11:00:59 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod13() {
-
- setUpXML();
- eventCase = 13;
- String expectedString = "<ABC><JKL><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 5, 5, "<JKL>");
- 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/2/2001 11:02:19 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod14() {
-
- setUpXML();
- eventCase = 14;
- String expectedString = "<a>\r\r </a>";
-
- fModel.setText(null, "<a>\r<b>\r </a>");
-
- fModel.replaceText(null, 4, 3, "");
- 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/2/2001 11:03:53 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod15() {
-
- setUpXML();
- eventCase = 15;
- String expectedString = "<a><b ></b></a>";
-
- fModel.setText(null, "<a><b></b></a>");
-
- fModel.replaceText(null, 5, 0, " ");
- 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/2/2001 11:05:27 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod16() {
-
- setUpXML();
- eventCase = 16;
- String expectedString = "<a><b z></b></a>";
-
- fModel.setText(null, "<a><b ></b></a>");
-
- fModel.replaceText(null, 6, 0, "z");
- 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/2/2001 11:06:33 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod17() {
-
- setUpXML();
- eventCase = 17;
- String expectedString = "<a><b z=\"t\"></b></a>";
-
- fModel.setText(null, "<a><b z></b></a>");
-
- fModel.replaceText(null, 6, 1, "z=\"t\"");
- 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/2/2001 11:09:17 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod18() {
-
- setUpXML();
- eventCase = 18;
- String expectedString = "<a><c z></b></a>";
-
- fModel.setText(null, "<a><b z></b></a>");
-
- fModel.replaceText(null, 4, 3, "c z");
- 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/2/2001 11:10:30 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod19() {
-
- eventCase = 19;
- setUpJSP();
- fModel.setText(null, "<BODY>\r<IMG src=\"<%=\r</BODY>\r");
- String expectedString = "<BODY>\r<IMG src=\"<%=Q\r</BODY>\r";
-
- fModel.replaceText(null, 20, 0, "Q");
- 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/2/2001 11:12:05 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod20() {
-
- setUpJSP();
-
- eventCase = 20;
- String expectedString = "<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
- fModel.setText(null, "<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
- fModel.replaceText(null, 28, 1, "\rBODY {\r\r}");
- 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/2/2001 11:32:23 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod21() {
-
- setUpJSP();
-
- eventCase = 21;
- String expectedString = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
- fModel.setText(null, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
- fModel.replaceText(null, 343, 1, "\rBODY {\r\r}");
- 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:45:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod9() {
-
- setUpXML();
- eventCase = 9;
- String expectedString = "<TD></TD>";
-
- fModel.setText(null, "<TD></TD><TD></TD>");
-
- fModel.replaceText(null, 0, 9, "");
- 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:45:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethodAttributeNameReplace1() {
-
- //testEvent = 22;
- //tags = "<tagName abc=\"bsf\">";
- //testStructuredDocumentReplacement(testEvent, tags, "abcde","<tagName abcde=\"bsf\">", 9, 3);
-
- setUpXML();
- eventCase = 22;
- String startString = "<tagName abc=\"bsf\">";
- String expectedString = "<tagName abcde=\"bsf\">";
- String changes = "abcde";
- int startOfChanges = 9;
- int lengthToReplace = 3;
-
- 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:35:41 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testModifyMiddle() {
-
- setUpXML();
- eventCase = 5;
- String expectedString = "<ABC><JKL><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 15, "<ABC><JKL><GHI>");
- 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:06:33 PM)
- */
- public void testNoChange1() {
-
- setUpXML();
- eventCase = 1;
- String expectedString = "<ABC><DEF><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 10, 0, "");
- 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:26:05 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testNoChange2() {
-
- setUpXML();
- eventCase = 2;
- String expectedString = "<ABC><DEF><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 15, "<ABC><DEF><GHI>");
- 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:38:25 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimilarStart() {
-
- setUpXML();
- eventCase = 6;
- String expectedString = "<P><B></B><B></B></P>";
-
- fModel.setText(null, "<P><B></B></P>");
-
- fModel.replaceText(null, 3, 0, "<B></B>");
- 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:43:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimilarStartEnd() {
-
- setUpXML();
- eventCase = 8;
- String expectedString = "<P><B><B></B></B></P>";
-
- fModel.setText(null, "<P><B></B></P>");
-
- fModel.replaceText(null, 6, 0, "<B></B>");
- 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:41:46 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimiliarEnd() {
-
- setUpXML();
- eventCase = 7;
- String expectedString = "<P><B></B><P><P>";
-
- fModel.setText(null, "<P><B></B><P>");
-
- fModel.replaceText(null, 10, 0, "<P>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- */
- public void testTagReDetection() {
-
- setUpJSP();
- // (nsd) 2003.12.10 - changed from NodesReplaced to RegionsReplaced since the start condition was changed
- // from being 3 document regions to 4 since "script" is not 'nestable'
- //eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-
- // reverted 2004.04.05
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-// eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<p>test<<SCRIPT>";
- String changes = "S";
- String expectedString = "<p>test<S<SCRIPT>";
- int startOfChanges = 8;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // ? assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void testTagReDetection2() {
-
- setUpJSP();
- eventCase = GENERIC_REGION_CHANGED_EVENT_CASE;
- String startString = "<p>test<<SCRIPT>";
- String changes = "S";
- String expectedString = "<p>test<<SCRIPTS>";
- int startOfChanges = 15;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void testTagReDetection3() {
-
- setUpJSP();
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<p>test<test>";
- String changes = "%";
- String expectedString = "<p>test<%test>";
- int startOfChanges = 8;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- if (fModel != null)
- fModel.removeDocumentChangedListener(proxy);
- }
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- public void testPageDirective() {
- boolean verbose = false;
- setUpJSP();
- eventCase = 999; //GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<%@page lang=\"java\" <SCRIPT>var <% test %> String</SCRIPT>";
- String changes = "s";
- String expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
- int startOfChanges = 18;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- if (verbose) {
- Debug.dump(fModel, true);
- }
-
- StructuredDocumentEvent structuredDocumentEvent = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- //assertTrue("event type", eventResult);
-
- if (verbose) {
- System.out.println();
- System.out.println("structured document:");
- IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
- Debug.dump(document, true);
- }
-
- // now delete quote
- changes = "";
- expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
- startOfChanges = 19;
- lengthToReplace = 1;
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
- assertTrue("text update", result);
-
- if (verbose) {
- System.out.println();
- System.out.println("structured document:");
- IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
- Debug.dump(document, true);
- }
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
deleted file mode 100644
index 0416699..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
+++ /dev/null
@@ -1,204 +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.pagedirective;
-
-import java.io.IOException;
-
-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.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.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-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.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Node;
-
-/**
- * @author davidw
- */
-public class TestPageDirective extends TestCase {
-
- class MyEmbeddedFactory implements INodeAdapterFactory {
-
- public INodeAdapter adapt(INodeNotifier object) {
- return null;
- }
-
- public INodeAdapterFactory copy() {
- return null;
- }
-
- public boolean isFactoryForType(Object type) {
- return type instanceof MyAdaptedClass;
- }
-
- public void release() {
- // noop
- }
- }
-
- class MyAdaptedClass {
- // dummy class is key
- }
-
- /**
- * Constructor for TestPageDirective.
- * @param name
- */
- public TestPageDirective(String name) {
- super(name);
- }
-
- public void testBasicPD() 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\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- }
-
- public void testBasicChangedPD() 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\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- // change to javascript
- model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be javascript", "javascript".equals(language));
-
- }
-
- public void testBasicChangedPDBack() 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\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- // change to javascript
- model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be javascript", "javascript".equals(language));
-
- // change back to java
- model.getStructuredDocument().replaceText(this, 43, 10, "java");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertEquals("java", language);
- }
-
- public void testSetEmbeddedType(){
- IStructuredModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
- EmbeddedTypeHandler embeddedXMLHandler = new EmbeddedXML();
- pageDirectiveAdapter.setEmbeddedType(embeddedXMLHandler);
-
- EmbeddedTypeHandler handler = pageDirectiveAdapter.getEmbeddedType();
- assertTrue("incorrect embedded handler", handler == embeddedXMLHandler);
- }
-
- public void testAdapt() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- Node ownerNode = model.getDocument();
-
- ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) ownerNode, ModelQueryAdapter.class);
- assertNotNull("could not adapt embedded adapter", embeddedAdapter);
- }
-
- public void testAddEmbeddedFactory() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.addEmbeddedFactory(new MyEmbeddedFactory());
- }
-
- public void testSetLanguage() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.setLanguage("text/xml");
- assertTrue("set language failed", pageDirectiveAdapter.getLanguage().equals("text/xml"));
- }
-
- public void testGetTarget() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- INodeNotifier notifier = pageDirectiveAdapter.getTarget();
- assertNotNull("target is null", notifier);
- }
-
- public void testRelease() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.release();
- // considered "success" if doesn't through exception
- assertTrue(true);
- }
-
- private IDOMModel createUnmanagedHTMLModel() {
- // 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\" %>");
- return (IDOMModel)model;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
deleted file mode 100644
index 760ff87..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ /dev/null
@@ -1,305 +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.partitioning;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-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.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerJSP extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerJSP(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- public void testJSP1() throws IOException, BadLocationException { // DW 05/01/2003 I modified this test, after creating test6,
- // and changing partioner to pick up end *> as part of page directive
- // partition (for highlighting to work right).
- int expectedPartitions = 8;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example01.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testJSP2() throws IOException, BadLocationException {
- int expectedPartitions = 11;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example02.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testJSP3() throws IOException, BadLocationException {
- int expectedPartitions = 5;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example03.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, ICSSPartitions.STYLE, IHTMLPartitions.HTML_DEFAULT,});
- }
-
- public void testJSP4() throws IOException, BadLocationException {
- int expectedPartitions = 8;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example04.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, "org.eclipse.wst.html.SCRIPT.language.MYLANGUAGE", IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_COMMENT, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testJSP5() throws IOException, BadLocationException {
- int expectedPartitions = 17;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example05.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testJSP6() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example06.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE});
- }
-
- public void testBug131463() throws IOException, BadLocationException {
- int expectedPartitions = 13;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/bug131463.jsp");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IXMLPartitions.XML_CDATA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IJSPPartitions.JSP_CONTENT_JAVA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_JAVA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_DIRECTIVE});
- }
-
- public void testPerfJSP() throws IOException, BadLocationException {
- //int expectedPartitions = 6;
- //XXX FIXME!
- //nt nPartitions =
- doTimedComputePartitioningTest("testfiles/jsp/company300k.jsp");
- //assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- //checkSeams();
- //verifyPartitionTypes(partitions, new String[]{IXMLPartitions.ST_XML_PI, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_DECLARATION, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_COMMENT, IXMLPartitions.ST_DEFAULT_XML});
- }
-
- public void testEmpty() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one
- * another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default
- * partitioner for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Compute the partitions for the given filename using the default
- * partitioner for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
- long startTime = System.currentTimeMillis();
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- long endTime = System.currentTimeMillis();
- if (DEBUG_PRINT_RESULT) {
-
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- System.out.println("Time to compute " + partitions.length + ": " + (endTime - startTime) + " (msecs)");
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file,
- * using the default partitioner for that file type. This test allows for
- * verifying the zero-length partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- *
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- *
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp
deleted file mode 100644
index 7172196..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<jsp:text>
- <![CDATA[ <?xml version="1.0" encoding="ISO-8859-1" ?> ]]>
-</jsp:text>
-<jsp:scriptlet>
- <![CDATA[
- String test = "something";
- ]]>
-</jsp:scriptlet>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
deleted file mode 100644
index cadf5e7..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
+++ /dev/null
@@ -1,8099 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>The Ultimate A Company</title>
- </head>
- <body>
- <p>
- <img src="../banner.gif" height="51" width="659" alt="" />
- </p>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <p>
- <img src="../footer.gif" height="25" width="659" alt="" />
- </p>
- </body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
deleted file mode 100644
index cc7c54d..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html" %>
-<jsp:directive.page contentType=text/html" />
-<HTML id="<% java code "string" section %>">
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
deleted file mode 100644
index a6d0ec9..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
- <p>
- <% testing "123" test test;
- // test
- one two three
- %>
- <!-- 78 -->
- <table id = "<% test %>" attrib=junk>
- </BODY>
- </HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
deleted file mode 100644
index 8ffd310..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<SCRIPT>
-java script section
-</SCRIPT>
-<STYLE>
- style section
- </STYLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
deleted file mode 100644
index 6808704..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<script language="MyLanguage"><%= "A" %>
- </SCRIPT>
-<%-- --%>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
deleted file mode 100644
index a6151d3..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<formatting>
-<script type="text/javascript">
-// Copyright 2000,2001 by www.example.com
- document.URL ="a";
-</script>
-
-<% String a = "a"; %>
-<%-- test comment --%>
-<%=
-
-" aaaaa "
-
-%>
-<%! %>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
deleted file mode 100644
index 85173f4..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@page language="javascript" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java
deleted file mode 100644
index 4255367..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java
+++ /dev/null
@@ -1,130 +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.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-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.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * @author pavery
- */
-public class AdapterFactoryRegistryTest extends TestCase {
-
- private final String CLASSNAME_HTML_FACTORY = "org.eclipse.wst.html.ui.internal.registry.AdapterFactoryProviderForHTML";
- private final String CLASSNAME_DTD_FACTORY = "org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD";
- private final String CLASSNAME_JSP_FACTORY = "org.eclipse.jst.jsp.ui.internal.registry.AdapterFactoryProviderForJSP";
- private final String CLASSNAME_CSS_FACTORY = "org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS";
- private final String CLASSNAME_XML_FACTORY = "org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML";
-
-
- public void testCreate() {
- AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
- assertNotNull(instance);
- }
-
- public void testGetAllFactories() {
- AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
- Iterator it = instance.getAdapterFactories();
- Object provider = null;
-
- // all providers expected classnames added here
- List known = new ArrayList();
- known.add(CLASSNAME_HTML_FACTORY);
- known.add(CLASSNAME_DTD_FACTORY);
- known.add(CLASSNAME_JSP_FACTORY);
- known.add(CLASSNAME_CSS_FACTORY);
- known.add(CLASSNAME_XML_FACTORY);
-
- while (it.hasNext()) {
- provider = it.next();
- known.remove(provider.getClass().getName());
- // System.out.println(provider.getClass().getName());
- }
-
- // should have encountered all expected adapter factories.
- assertEquals("unknown (extra) adapter factories found", 0, known.size());
- }
-
- public void testGetFactoriesXML() {
-
- List known = new ArrayList();
- known.add(CLASSNAME_XML_FACTORY);
-
- getFactoriesForContentType(known, ContentTypeIdForXML.ContentTypeID_XML, CLASSNAME_HTML_FACTORY);
- }
-
- public void testGetFactoriesHTML() {
-
- List known = new ArrayList();
- known.add(CLASSNAME_JSP_FACTORY);
-
- getFactoriesForContentType(known, ContentTypeIdForJSP.ContentTypeID_JSP, CLASSNAME_XML_FACTORY);
- }
-
- public void testGetFactoriesJSP() {
-
- List known = new ArrayList();
- known.add(CLASSNAME_HTML_FACTORY);
-
- getFactoriesForContentType(known, ContentTypeIdForHTML.ContentTypeID_HTML, CLASSNAME_DTD_FACTORY);
- }
-
- public void testGetFactoriesDTD() {
-
- List known = new ArrayList();
- known.add(CLASSNAME_DTD_FACTORY);
-
- getFactoriesForContentType(known, "org.eclipse.wst.dtd.core.dtdsource", CLASSNAME_HTML_FACTORY);
- }
-
- public void testGetFactoriesCSS() {
-
- List known = new ArrayList();
- known.add(CLASSNAME_CSS_FACTORY);
-
- getFactoriesForContentType(known, ContentTypeIdForCSS.ContentTypeID_CSS, CLASSNAME_JSP_FACTORY);
- }
-
- /**
- * Compare to a expected list of AdapterFactoryProviders (may be smaller
- * than the actual list) for a given contentTypeId. At minimum these
- * expected providers must be found to pass.
- *
- * @param expected
- * @param contentTypeId
- */
- private void getFactoriesForContentType(List expected, String contentTypeId, String notExpectedClassname) {
-
- AdapterFactoryRegistryImpl instance = (AdapterFactoryRegistryImpl) AdapterFactoryRegistryImpl.getInstance();
- Iterator it = instance.getAdapterFactories(contentTypeId);
- Object provider = null;
- while (it.hasNext()) {
- provider = it.next();
- expected.remove(provider.getClass().getName());
-
- // System.out.println("encountered provider: " +
- // provider.getClass().getName());
- assertTrue("!provider: " + notExpectedClassname + " shouldn't be in the list!", !notExpectedClassname.equals(provider.getClass().getName()));
- }
- // we should have at least found the expected factory (or factories)
- assertTrue("extra providers (expected none): " + expected, expected.isEmpty());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
deleted file mode 100644
index 2e4083d..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
+++ /dev/null
@@ -1,251 +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.search;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchDocument;
-import org.eclipse.jdt.core.search.SearchPattern;
-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.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchScope;
-import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport;
-import org.eclipse.jst.jsp.ui.internal.java.search.BasicJSPSearchRequestor;
-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.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.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * Tests for JSPSearchSupport
- * @author pavery
- */
-public class JSPSearchTests extends TestCase implements IJavaSearchConstants {
-
- /**
- * to accept search matches
- * addCheckMatch(...) for matches you expect, run search support, checkValid() to see if all expected got hit
- */
- class TestJspSearchRequestor extends BasicJSPSearchRequestor {
-
- private List matches = null;
-
- public TestJspSearchRequestor() {
- this.matches = new ArrayList();
- }
-
- // called by search framework
- protected void addSearchMatch(IStructuredDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
- this.matches.remove(new TestSearchMatch(jspFile.getName(), jspStart, jspEnd));
- }
-
- public void beginReporting() {
- // do nothing since we have no UI, don't access ISearchResultView
- }
-
- public void endReporting() {
- // do nothing since we have no UI, don't access ISearchResultView
- }
-
- public void addCheckMatch(String filename, int jspStart, int jspEnd) {
- this.matches.add(new TestSearchMatch(filename, jspStart, jspEnd));
- }
-
- public boolean checkValid() {
- return this.matches.isEmpty();
- }
-
- public void clear() {
- this.matches.clear();
- }
- }
-
- /**
- * to validate search matches (checkMatch matches a search hit)
- */
- class TestSearchMatch {
-
- public String filename = null;
- public int jspStart = -1;
- public int jspEnd = -1;
-
- public TestSearchMatch(String filename, int jspStart, int jspEnd) {
- this.filename = filename;
- this.jspStart = jspStart;
- this.jspEnd = jspEnd;
- }
-
- public boolean equals(Object obj) {
- if (!(obj instanceof TestSearchMatch))
- return false;
-
- TestSearchMatch possible = (TestSearchMatch) obj;
- return this.filename.equalsIgnoreCase(possible.filename) && this.jspStart == possible.jspStart && this.jspEnd == possible.jspEnd;
- }
- }
-
- private ProjectUnzipUtility projUtil = null;
- private boolean isSetup = false;
-
- public JSPSearchTests() {
- super("JSP Search Tests");
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- this.projUtil = new ProjectUnzipUtility();
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "jspsearch_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- this.projUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- this.projUtil.initJavaProject("judo");
-
- //JSPSearchSupport.getInstance().indexWorkspaceAndWait();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- // do nothing
- }
-
- public void testIndexWorkspace() {
- JSPSearchSupport support = JSPSearchSupport.getInstance();
- SearchDocument doc = JSPSearchSupport.getInstance().getSearchDocument("/judo/searchTestJSP.java");
- assertNotNull("couldn't retrieve:'/judo/searchTestJSP.java'", doc);
-
- doc = support.getSearchDocument("/judo/searchTestJSP2.java");
- assertNotNull("couldn't retrieve:'/judo/searchTestJSP2.java'", doc);
-
- doc = support.getSearchDocument("/judo/searchTestJSP3.java");
- assertNotNull("couldn't retrieve:'/judo/searchTestJSP3.java'", doc);
- }
-
- public void testSearchField() {
-
- TestJspSearchRequestor requestor = new TestJspSearchRequestor();
- requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
- JSPSearchSupport.getInstance().search("searchForThis", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
- assertTrue("did not find all expected matches: searchForThis", requestor.checkValid());
- }
-
- public void testSearchMethod() {
-
- TestJspSearchRequestor requestor = new TestJspSearchRequestor();
- requestor.addCheckMatch("searchTestJSP.jsp", 143, 158);
- requestor.addCheckMatch("searchTestJSP.jsp", 298, 315);
- JSPSearchSupport.getInstance().search("searchForMethod", new JSPSearchScope(), METHOD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
- assertTrue("did not find all expected matches: searchForMethod", requestor.checkValid());
- }
-
- public void testSearchPatternMatch() {
-
- TestJspSearchRequestor requestor = new TestJspSearchRequestor();
- requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
- requestor.addCheckMatch("searchTestJSP2.jsp", 116, 129);
- requestor.addCheckMatch("searchTestJSP2.jsp", 152, 165);
- JSPSearchSupport.getInstance().search("search*", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
- assertTrue("did not find all expected matches: search*", requestor.checkValid());
- }
-
- public void testSearchProjectClasses() {
-
- TestJspSearchRequestor requestor = new TestJspSearchRequestor();
- requestor.addCheckMatch("searchTestJSP3.jsp", 148, 157);
- requestor.addCheckMatch("searchTestJSP3.jsp", 170, 179);
- requestor.addCheckMatch("searchTestJSP3.jsp", 263, 273);
- requestor.addCheckMatch("searchTestJSP3.jsp", 299, 309);
- requestor.addCheckMatch("searchTestJSP3.jsp", 408, 417);
- requestor.addCheckMatch("searchTestJSP3.jsp", 430, 439);
- JSPSearchSupport.getInstance().search("Jellybean*", new JSPSearchScope(), TYPE, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
- assertTrue("did not find all expected matches: search*", requestor.checkValid());
- }
-
- public void testSearchLocalVariable() {
-
- IDOMModel xmlModel = null;
- try {
- IPath jspTestFilePath = new Path("judo/SEARCH/searchTestJSP3.jsp");
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
- xmlModel = (IDOMModel) getStructuredModelForRead(file);
- setupAdapterFactory(xmlModel);
-
- IDOMDocument doc = xmlModel.getDocument();
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) doc.getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- IJavaElement element = translation.getElementsFromJspRange(377, 384)[0];
-
- TestJspSearchRequestor requestor = new TestJspSearchRequestor();
- requestor.addCheckMatch("searchTestJSP3.jsp", 377, 384);
- JSPSearchSupport.getInstance().search(element, new JSPSearchScope(), requestor);
- assertTrue("did not find all expected matches: search*", requestor.checkValid());
- }
- finally {
- if (xmlModel != null)
- xmlModel.releaseFromRead();
- }
- }
-
- 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;
- }
-
- /**
- * add the factory for JSPTranslationAdapter here
- * @param sm
- */
- private void setupAdapterFactory(IStructuredModel sm) {
-
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- sm.getFactoryRegistry().addFactory(factory);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
deleted file mode 100644
index 22b6b20..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
+++ /dev/null
@@ -1,303 +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.ui.tests.threaded;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.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.core.runtime.jobs.Job;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Created for: https://bugs.eclipse.org/bugs/show_bug.cgi?id=116523
- */
-public class ThreadedModelReadEditTest extends TestCase {
-
- private final String PROJECT_NAME = "PROJECT_116523";
- private static boolean isSetup = false;
-
- private class TranslateJob extends Job {
- String fFilePath = null;
- public TranslateJob(String filename, String jobname) {
- super(jobname);
- fFilePath = filename;
- }
- protected IStatus run(IProgressMonitor monitor) {
- IFile f = getOrCreateFile(fFilePath);
- JSPTranslator trans = new JSPTranslator();
- IStructuredModel sModel = null;
- try {
- sModel = StructuredModelManager.getModelManager().getModelForRead(f);
- if(sModel != null) {
- trans.reset((IDOMNode)sModel.getIndexedRegion(0), new NullProgressMonitor());
- trans.translate();
- }
-
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
-
- return Status.OK_STATUS;
- }
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if(!isSetup) {
- doSetup();
- isSetup = true;
- }
- }
-
- private void doSetup() {
- createProject();
- }
- /*
- * create 100 test files
- * repeat doTest() on those 100 files 5x
- */
-// public void test_116523() {
-//
-// // try and do some concurrent editing/indexing
-// for(int j=0; j<5; j++) {
-// for(int i=0; i<100; i++)
-// doTest("test_" + i + ".jsp");
-// }
-// }
-// /*
-// * doTest() on same file 100x
-// */
-// public void test_116523_2() {
-//
-// // try and do some concurrent editing/indexing
-// for(int i=0; i<100; i++)
-// doTest("test_1.jsp");
-// }
-
- /*
- * doTest() (insert text & edit dom)
- * and force JSPTranslation on another thread
- *
- * repeat lots of times
- */
- public void test_116523_3() {
- String filename = "t_test_1.jsp";
-
- getOrCreateFile(PROJECT_NAME + "/" + filename);
-
- for(int j=0; j<100; j++) {
- TranslateJob translateJob = new TranslateJob(PROJECT_NAME + "/" + filename, "JSP Translate Job");
- translateJob.schedule();
- performEdits(filename);
- }
- }
-
- private void performEdits(String filePath) {
-
- IFile blankJspFile = getOrCreateFile(PROJECT_NAME + "/" + filePath);
-
- // document edit
- iDocumentInsert(blankJspFile, "<logic:iterate id=\"iterateID\" type=\"java.util.List\" indexId=\"indexID\"></logic:iterate>\n",0);
-
- // dom edit
- HashMap attrs = new HashMap();
- attrs.put("uri", "struts-logic.tld");
- attrs.put("prefix", "logic");
- domInsertElement(blankJspFile, "jsp:directive.taglib", attrs, 0);
- }
-
- protected IFile getOrCreateFile(String filePath) {
- IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankJspFile != null && !blankJspFile.exists()) {
- try {
- blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankJspFile;
- }
-
- public void domInsertElement(IFile file, String tagName, HashMap attributes, int insertionPoint) {
- IStructuredModel sModel = null;
- try {
- sModel = StructuredModelManager.getModelManager().getModelForEdit(file);
- if(sModel != null) {
- Document domDoc = (Document)sModel.getAdapter(Document.class );
- IndexedRegion r = sModel.getIndexedRegion(insertionPoint);
- if(r instanceof Node) {
- Element e = domDoc.createElement(tagName);
- Iterator iter = attributes.keySet().iterator();
- // set attributes
- while (iter.hasNext()) {
- String attr = (String) iter.next();
- String val = (String)attributes.get(attr);
-
- Attr attrNode = domDoc.createAttribute(attr);
- attrNode.setValue(val);
- e.setAttributeNode(attrNode);
- }
- domDoc.insertBefore(e, (Node)r);
- domDoc.insertBefore(domDoc.createTextNode("\n"), (Node)r);
- }
- sModel.save();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- finally {
- if(sModel != null)
- sModel.releaseFromEdit();
- }
- // System.out.println("inserted element, dom style");
- }
-
- public void iDocumentInsert(IFile file, String text, int insertionPoint) {
-
- // get the file's text buffer
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- IPath path = file.getFullPath();
- try {
- bufferManager.connect(path, null);
-
- IDocument doc = null;
-
- ITextFileBuffer buff = bufferManager.getTextFileBuffer(file.getFullPath());
- doc = buff.getDocument();
-
- boolean saveWhenDone = !buff.isDirty();
-
- InsertEdit insertEdit = new InsertEdit(insertionPoint, text);
- insertEdit.apply(doc);
-
- // if the document was not previously dirty, save it
- if (saveWhenDone)
- buff.commit(null, false);
- }
- catch (BadLocationException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- finally {
- try {
- bufferManager.disconnect(path, null);
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- // System.out.println("inserted text, file buffer style");
- }
-
-// private void structuredDocInsert(String filePath) {
-// // PROJECT_NAME + "/blank.jsp"
-// IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-// if (blankJspFile != null) {
-// try {
-// blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
-// }
-// catch (CoreException e) {
-// e.printStackTrace();
-// }
-// }
-//
-// IStructuredModel sModel = null;
-// try {
-// sModel = StructuredModelManager.getModelManager().getModelForEdit(blankJspFile);
-// if (sModel != null) {
-// IStructuredDocument sDoc = sModel.getStructuredDocument();
-//
-// String insertText1 = "<logic:iterate id=\"iterateID\" type=\"java.util.List\" indexId=\"indexID\"></logic:iterate>\n";
-// String insertText2 = "<%@taglib uri=\"struts-logic.tld\" prefix=\"logic\" %>\n";
-//
-// sDoc.replace(0, 0, insertText1);
-// sDoc.replace(0, 0, insertText2);
-//
-// JSPSearchSupport.getInstance().addJspFile(blankJspFile);
-// }
-// }
-// catch (IOException e) {
-// e.printStackTrace();
-// }
-// catch (CoreException e) {
-// e.printStackTrace();
-// }
-// catch (BadLocationException e) {
-// e.printStackTrace();
-// }
-// finally {
-// if (sModel != null)
-// sModel.releaseFromEdit();
-// }
-// }
-
- private void createProject() {
-
- // create project
- String[] natureIds = {ProjectUtil.JAVA_NATURE_ID};
- IProject proj = ProjectUtil.createProject(PROJECT_NAME, null, natureIds);
-
- // copy files into workspace
- IFile f = ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/116523/struts.jar", PROJECT_NAME + "/struts.jar");
- assertTrue(f.exists());
- f = ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/116523/struts-logic.tld", PROJECT_NAME + "/struts-logic.tld");
- assertTrue(f.exists());
-
- // add struts to classpath
- ProjectUtil.addLibraryEntry(proj, "struts.jar");
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
deleted file mode 100644
index 8e270ff..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.w3c.dom.Document;
-
-/**
- */
-public class CommonXML {
-
- public synchronized static DocumentBuilder getDocumentBuilder() {
- DocumentBuilder result = null;
- try {
- result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
- DocumentBuilder result = null;
- try {
- DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
- instance.setValidating(validating);
- result = instance.newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public static void serialize(Document document, OutputStream ostream) throws IOException {
- Source domSource = new DOMSource(document);
- try {
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- try {
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
- }
- catch (IllegalArgumentException e) {
- // unsupported properties
- }
- serializer.transform(domSource, new StreamResult(ostream));
- }
- catch (TransformerConfigurationException e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerFactoryConfigurationError e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerException e) {
- throw new IOException(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
deleted file mode 100644
index 6b232b2..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
- /**
- * Constructor for AllTests.
- * @param name
- */
- private static String now = null;
-
-
- public static String now() {
- // just calculate once, so whole run as same timestamp
- if (DateUtil.now == null) {
- DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
- Calendar calendar = Calendar.getInstance();
- Date today = calendar.getTime();
- DateUtil.now = format.format(today);
- }
- return DateUtil.now;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
deleted file mode 100644
index 8d82c47..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
- public static String JSP_EDITOR_TESTS_PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests";
-
- static File previousResultsDirectory = null;
- static private String logSubDirectoryPath;
-
- private static boolean notTriedYet = true;
-
- public static class DirFilenameFilter implements FilenameFilter {
- String startOfAcceptableNames;
-
- public DirFilenameFilter(String startOfDirName) {
- startOfAcceptableNames = startOfDirName;
- }
-
- /**
- * @see java.io.FileFilter#accept(File)
- */
- public boolean accept(File pathname, String filename) {
- // we'll just assume if it starts with right key, it is a directory ... for now
- return filename.startsWith(startOfAcceptableNames);
- }
-
- }
-
- public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
- if (previousResultsDirectory == null && notTriedYet) {
- Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- //String installPath = url.getPath();
- // add known file so URL method below can be used
- // (doesn't seem to work for directory?)
- URL totalURL = new URL(url, "plugin.xml");
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File pluginHomeDir = new File(finalPath);
- FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
- File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
- // assume first in list is newest, then start looking with the
- // second item ... just to avoid "null" case checking
- if (allDirs.length > 0) {
- File currentNewest = allDirs[0];
- for (int i = 1; i < allDirs.length; i++) {
- File current = allDirs[i];
- // NOTE: we go by modified date, not by the actual time stamp in name.
- // This should work for all normal cases, but may not if someone does some
- // "funny" copying, or updating from repository.
- if (current.lastModified() > currentNewest.lastModified()) {
- currentNewest = current;
- }
- }
- previousResultsDirectory = currentNewest;
- }
- notTriedYet = false;
- }
- return previousResultsDirectory;
- }
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- //URL finalurl = Platform.asLocalURL(totalURL);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!dir.exists()) {
- // a little safety net, be sure the previous newest directory
- // is initialized, just in case no one else has done so
- if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
- FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- }
- // now its "safe" to make the new one
- dir.mkdirs();
- }
- return file;
- }
-
- /**
- * Just a general utility method
- * @param filename
- * @return String
- */
- public static String getExtension(String filename) {
- String extension = null;
- int dotPostion = filename.lastIndexOf('.');
- if (dotPostion > -1) {
- extension = filename.substring(dotPostion + 1);
- }
- else {
- extension = new String();
- }
- return extension;
- }
-
- /**
- * General purpose utility method to ensure the log
- * directory exists, and returns the name.
- */
- public static String getLogDirectory() {
- if (logSubDirectoryPath == null) {
- String mainDirectory = "/logs";
- File dir = new File(mainDirectory);
- ensureExists(dir);
- String subDirectory = TimestampUtil.timestamp();
- logSubDirectoryPath = mainDirectory + "/" + subDirectory;
- File subdir = new File(logSubDirectoryPath);
- ensureExists(subdir);
- }
- return logSubDirectoryPath;
- }
-
- public static void ensureExists(File dir) {
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public static String getPerformanceOutputLogName() {
- String result = null;
- String directoryName = FileUtil.getLogDirectory();
- String extension = ".out";
- String baseName = "sedTests";
- long now = System.currentTimeMillis();
- String nowStr = String.valueOf(now);
- result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 85d48c9..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,392 +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.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
- }
-
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- // (nsd) redundant?
- // String inFileName = inFile.getAbsolutePath();
- // //"c:/example.zip";
- // File sourceZipFile = new File(inFileName);
- File sourceZipFile = inFile;
-
- // Specify destination where file will be unzipped
- // String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- IProject currentProject = null;
- try {
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
-
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- // System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- int currentByte;
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fos = new FileOutputStream(destFile);
- BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
- try {
- // read and write until last byte is encountered
- while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
- dest.write(data, 0, currentByte);
- }
- }
- finally {
- dest.flush();
- dest.close();
- is.close();
- fos.close();
- }
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- if (projectFolderName == null) {
- projectFolderName = destFile.getName();
- fCreatedProjects.add(projectFolderName);
-
- currentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- }
- }
- }
- }
- finally {
- zipFile.close();
- }
-
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- // proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- // proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- Platform.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), new NullProgressMonitor());
- // resynch
- refreshWorkspace();
- // change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-
- if (!proj.exists()) {
-
- proj.create(new NullProgressMonitor());
- }
- if (!proj.isOpen()) {
- proj.open(null);
- }
- // need to add java nature, or else project won't "exist()" in the
- // java
- // element sense
- IProjectDescription desc = proj.getDescription();
- List natures = new ArrayList(Arrays.asList(desc.getNatureIds()));
- if (!natures.contains(JavaCore.NATURE_ID))
- natures.add(JavaCore.NATURE_ID);
- desc.setNatureIds((String[]) natures.toArray(new String[0]));
- proj.setDescription(desc, new NullProgressMonitor());
- Platform.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
- refreshWorkspace();
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- // proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- // proj = null;
- }
- refreshWorkspace();
- }
- };
- // WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- // ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java
deleted file mode 100644
index 1365652..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java
+++ /dev/null
@@ -1,187 +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.ui.tests.util;
-
-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 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;
-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.ui.tests.JSPUITestsPlugin;
-
-/**
- * Some utilities for creating projects, and copying files into the workspace.
- */
-public class ProjectUtil {
-
- 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();
- }
- }
-
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = JSPUITestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = JSPUITestsPlugin.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;
- }
-
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @param entryname path relative to TEST plugin starting w/ a "/"
- * (eg. "/testfiles/bugnumber/struts-logic.tld")
- * @param fullPath path relative to junit test workpace
- * (eg. "/myruntimeproj/struts-logic.tld")
- * @return
- */
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return file[0];
- }
-
- public static IProject createProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java
deleted file mode 100644
index 0106abb..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/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.ui.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
deleted file mode 100644
index 2c9b993..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
- private static Date timestamp = null;
- private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
- // private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
- private static String nowShort = null;
-
- public static String timestamp() {
-
- if (TimestampUtil.nowShort == null) {
- TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
- }
- return TimestampUtil.nowShort;
- }
-
- protected static Date ensureTimestamp() {
- // just calculate 'timestamp' once per class loading,
- // so this 'timestamp' remains the same during
- // entire run.
- if (TimestampUtil.timestamp == null) {
- Calendar calendar = Calendar.getInstance();
- TimestampUtil.timestamp = calendar.getTime();
- }
- return TimestampUtil.timestamp;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
deleted file mode 100644
index a3f107a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- }
-
- public void subTask(String name) {
- }
-
- public void worked(int work) {
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java
deleted file mode 100644
index f678005..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java
+++ /dev/null
@@ -1,95 +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.jst.jsp.ui.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests HTML validator on jsp file
- */
-public class JSPHTMLValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "bug_143209";
-
- 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());
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests jsp expression in html attributes in jsp file
- *
- * @throws Exception
- */
- public void testJSPinAttributes() throws Exception {
- JSPContentValidator validator = new JSPContentValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/usejspinattribute.jsp";
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- assertTrue("jsp in attributes are errors when they should not be (in .jsp)", reporter.getMessages().isEmpty());
- }
-
- /**
- * Tests jsp expression in html attributes in html file
- *
- * @throws Exception
- */
- public void testJSPinAttributesHTML() throws Exception {
- JSPContentValidator validator = new JSPContentValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/usejspinattribute.html";
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- assertTrue("jsp in attributes are not errors when they should be (in .html)", !reporter.getMessages().isEmpty());
- }
-
- /**
- * Tests bad attribute names in jsp file false
- *
- * @throws Exception
- */
- public void testBadAttributeName() throws Exception {
- JSPContentValidator validator = new JSPContentValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/badattributenames.jsp";
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- assertTrue("bad attribute name is not error when it should be", !reporter.getMessages().isEmpty());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java
deleted file mode 100644
index fea98ac..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java
+++ /dev/null
@@ -1,59 +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.ui.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;
-
-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.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java
deleted file mode 100644
index 3f613fa..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java
+++ /dev/null
@@ -1,36 +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.ui.tests.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-class ValidationContextForTest implements IValidationContext {
- private String fURI = null;
-
- public void setURI(String uri) {
- fURI = uri;
- }
-
- public String[] getURIs() {
- if (fURI != null)
- return new String[]{fURI};
- 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.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
deleted file mode 100644
index cfd3d22..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
+++ /dev/null
@@ -1,256 +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.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationJSP extends TestCase {
-
- private StructuredTextViewerConfigurationJSP fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationJSP() {
- super("TestViewerConfigurationJSP");
- }
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if(PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationJSP();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetAnnotationHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
- assertNotNull("AnnotationHover is null", hover);
- }
-
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IJSPPartitions.JSP_DEFAULT);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length > 0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 1);
- }
-
- /**
- * Not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNotNull("there is no content formatter", cf);
- }
-
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if(strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 1);
- }
-
- public void testGetIndentPrefixes() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
- if(prefixes != null) {
- return;
- }
- }
- assertTrue("there are no configured indent prefixes", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationControlCreator() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("InformationControlCreator is null", infoCreator);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationPresenter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter is null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if(providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler is null", r);
- }
-
- public void testGetTextHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{IHTMLPartitions.HTML_DEFAULT,
- IHTMLPartitions.SCRIPT,
- IJSPPartitions.JSP_DEFAULT,
- IJSPPartitions.JSP_DIRECTIVE,
- IJSPPartitions.JSP_CONTENT_JAVA,
- IXMLPartitions.XML_DEFAULT};
-
- for (int i = 0; i < hoverPartitions.length; i++) {
- ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
- assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
deleted file mode 100644
index e162a43..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
+++ /dev/null
@@ -1,496 +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.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestJSP extends ViewPart {
- private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
- private final String DEFAULT_VIEWER_CONTENTS = "<%@ page contentType=\"text/html; charset=ISO-8859-1\" %>\n";
-
- StructuredTextViewer fSourceViewer = null;
- private StructuredTextViewerConfiguration fConfig = null;
- private IContentOutlinePage fContentOutlinePage = null;
- private ISelectionChangedListener fHighlightRangeListener = null;
-
- /**
- * Sets the viewer's highlighting text range to the text range indicated
- * by the selected Nodes.
- */
- protected class NodeRangeSelectionListener implements ISelectionChangedListener {
- public void selectionChanged(SelectionChangedEvent event) {
- if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
- IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- else {
- fSourceViewer.resetVisibleRegion();
- }
- }
- }
-
- protected class NumberInputDialog extends Dialog {
- public NumberInputDialog(Shell shell) {
- super(shell);
- }
-
- public Text start;
- int startValue;
- public Text length;
- int lengthValue;
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(composite, SWT.NULL);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- container.setLayout(new GridLayout(2, true));
- setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
- Label label = new Label(container, SWT.NULL);
- label.setText("Start");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- label = new Label(container, SWT.NULL);
- label.setText("Length");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- start = new Text(container, SWT.BORDER);
- startValue = fSourceViewer.getVisibleRegion().getOffset();
- start.setText("" + startValue);
- start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- length = new Text(container, SWT.BORDER);
- lengthValue = fSourceViewer.getVisibleRegion().getLength();
- length.setText("" + lengthValue);
- length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // start.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == start) {
- // try {
- // startValue = Integer.decode(start.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // startValue = 0;
- // }
- // }
- // }
- // });
- // length.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == length) {
- // try {
- // lengthValue = Integer.decode(length.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // lengthValue = 0;
- // }
- // }
- // }
- // });
-
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- protected void okPressed() {
- try {
- startValue = Integer.decode(start.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- startValue = 0;
- }
- try {
- lengthValue = Integer.decode(length.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- lengthValue = 0;
- }
- super.okPressed();
- }
- }
-
- protected void addActions(IContributionManager mgr) {
- if (mgr != null) {
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "New JSP";
- }
-
- public void run() {
- super.run();
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- setupViewerForNew();
- fSourceViewer.setEditable(true);
- }
- });
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility";
- }
-
- public void run() {
- super.run();
- NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All";
- }
-
- public void run() {
- super.run();
- fSourceViewer.resetVisibleRegion();
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- sourceViewer.resetVisibleRegion();
- sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- sourceViewer.resetVisibleRegion();
- }
- }
- });
- mgr.add(new Separator());
- // no longer able to set input to NULL
- // mgr.add(new Action() {
- // public String getText() {
- // return getToolTipText();
- // }
- //
- // public String getToolTipText() {
- // return "Set Input to NULL";
- // }
- // public void run() {
- // super.run();
- // viewer.setInput(null);
- // }
- // });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input from Active Editor";
- }
-
- public void run() {
- super.run();
- ITextEditor textEditor = getActiveEditor();
- if (textEditor != null) {
- setupViewerForEditor(textEditor);
- fSourceViewer.setEditable(true);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(true);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection As ReadOnly";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(false);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Stop Following Selection";
- }
-
- public void run() {
- super.run();
- stopFollowSelection();
- }
- });
- }
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
- */
- public void createPartControl(Composite parent) {
- IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
- addActions(mgr);
-
- // create source viewer & its content type-specific viewer
- // configuration
- fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationJSP();
-
- // set up the viewer with a document & viewer config
- setupViewerForNew();
-
- setupViewerPreferences();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- stopFollowSelection();
- fSourceViewer.unconfigure();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
- fSourceViewer.getControl().setFocus();
- }
-
- /**
- * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
- */
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- }
-
- /**
- * Set up source viewer with any additional preferences it should have Ex:
- * font, tab width
- */
- private void setupViewerPreferences() {
- fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
- }
-
- /**
- * Set up source viewer with a new document & configure it
- */
- private void setupViewerForNew() {
- stopFollowSelection(); // if was following selection, stop
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- doc.set(DEFAULT_VIEWER_CONTENTS);
-
- fSourceViewer.setDocument(doc);
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(fConfig);
- }
-
- /**
- * Returns the current active text editor if possible
- *
- * @return ITextEditor
- */
- private ITextEditor getActiveEditor() {
- ITextEditor editor = null;
- IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editorPart instanceof ITextEditor)
- editor = (ITextEditor) editorPart;
- if (editor == null && editorPart != null)
- editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
- return editor;
- }
-
- /**
- * Sets up the viewer with the same document/input as the given editor
- *
- * @param ITextEditor
- * editor - the editor to use *cannot to be null*
- */
- private void setupViewerForEditor(ITextEditor editor) {
- stopFollowSelection(); // if was following selection, stop
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- fSourceViewer.setDocument(doc);
-
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(new StructuredTextViewerConfigurationJSP());
- }
-
- /**
- * Hooks up the viewer to follow the selection made in the active editor
- */
- private void followSelection() {
- ITextEditor editor = getActiveEditor();
- if (editor != null) {
- setupViewerForEditor(editor);
- if (fHighlightRangeListener == null)
- fHighlightRangeListener = new NodeRangeSelectionListener();
-
- fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
- if (fContentOutlinePage != null) {
- fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
- if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
- fSourceViewer.resetVisibleRegion();
-
- Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
- IndexedRegion startNode = (IndexedRegion) nodes[0];
- IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- }
- }
- }
-
- /**
- * Cease following the selection made in the editor
- */
- private void stopFollowSelection() {
- if (fContentOutlinePage != null) {
- fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
- fSourceViewer.resetVisibleRegion();
- fContentOutlinePage = null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/test.xml b/tests/org.eclipse.jst.jsp.ui.tests/test.xml
deleted file mode 100644
index 0b6ad65..0000000
--- a/tests/org.eclipse.jst.jsp.ui.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.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.ui.tests.JSPUITestSuite" />
- <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.ui.tests/testfiles.zip b/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
deleted file mode 100644
index eb480c5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld
deleted file mode 100644
index 1975973..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld
+++ /dev/null
@@ -1,642 +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.0</tlibversion>
-<jspversion>1.1</jspversion>
-<shortname>logic</shortname>
-<uri>http://jakarta.apache.org/struts/tags-logic</uri>
-<tag>
-<name>empty</name>
-<tagclass>org.apache.struts.taglib.logic.EmptyTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>equal</name>
-<tagclass>org.apache.struts.taglib.logic.EqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>forward</name>
-<tagclass>org.apache.struts.taglib.logic.ForwardTag</tagclass>
-<bodycontent>empty</bodycontent>
-<attribute>
-<name>name</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>greaterEqual</name>
-<tagclass>org.apache.struts.taglib.logic.GreaterEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>greaterThan</name>
-<tagclass>org.apache.struts.taglib.logic.GreaterThanTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>iterate</name>
-<tagclass>org.apache.struts.taglib.logic.IterateTag</tagclass>
-<teiclass>org.apache.struts.taglib.logic.IterateTei</teiclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>collection</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>id</name>
-<required>true</required>
-<rtexprvalue>false</rtexprvalue>
-</attribute>
-<attribute>
-<name>indexId</name>
-<required>false</required>
-<rtexprvalue>false</rtexprvalue>
-</attribute>
-<attribute>
-<name>length</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>offset</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>type</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>lessEqual</name>
-<tagclass>org.apache.struts.taglib.logic.LessEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>lessThan</name>
-<tagclass>org.apache.struts.taglib.logic.LessThanTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>match</name>
-<tagclass>org.apache.struts.taglib.logic.MatchTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>location</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>messagesNotPresent</name>
-<tagclass>org.apache.struts.taglib.logic.MessagesNotPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>message</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>messagesPresent</name>
-<tagclass>org.apache.struts.taglib.logic.MessagesPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>message</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notEmpty</name>
-<tagclass>org.apache.struts.taglib.logic.NotEmptyTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notEqual</name>
-<tagclass>org.apache.struts.taglib.logic.NotEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notMatch</name>
-<tagclass>org.apache.struts.taglib.logic.NotMatchTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>location</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notPresent</name>
-<tagclass>org.apache.struts.taglib.logic.NotPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>role</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>user</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>present</name>
-<tagclass>org.apache.struts.taglib.logic.PresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>role</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>user</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>redirect</name>
-<tagclass>org.apache.struts.taglib.logic.RedirectTag</tagclass>
-<attribute>
-<name>anchor</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>forward</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>href</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>page</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramId</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramName</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramProperty</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramScope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>transaction</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-</taglib>
-
-
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar
deleted file mode 100644
index db32f9f..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp
deleted file mode 100644
index 0f4c9d5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file="test189924.jsp" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp
deleted file mode 100644
index b9e32d1..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<%@page session = "false" %>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
deleted file mode 100644
index 394526f..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
+++ /dev/null
@@ -1,353 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-WML is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
- "http://www.wapforum.org/DTD/wml_1.1.xml">
- <wml>
- ...
- </wml>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % length "CDATA"> <!-- [0-9]+ for pixels or [0-9]+"%" for
- percentage length -->
-<!ENTITY % vdata "CDATA"> <!-- attribute value possibly containing
- variable references -->
-<!ENTITY % HREF "%vdata;"> <!-- URI, URL or URN designating a hypertext
- node. May contain variable references -->
-<!ENTITY % boolean "(true|false)">
-<!ENTITY % number "NMTOKEN"> <!-- a number, with format [0-9]+ -->
-<!ENTITY % coreattrs "id ID #IMPLIED
- class CDATA #IMPLIED">
-
-<!ENTITY % emph "em | strong | b | i | u | big | small">
-<!ENTITY % layout "br">
-
-<!ENTITY % text "#PCDATA | %emph;">
-
-<!-- flow covers "card-level" elements, such as text and images -->
-<!ENTITY % flow "%text; | %layout; | img | anchor | a | table">
-
-<!-- Task types -->
-<!ENTITY % task "go | prev | noop | refresh">
-
-<!-- Navigation and event elements -->
-<!ENTITY % navelmts "do | onevent">
-
-<!--================ Decks and Cards ================-->
-
-<!ELEMENT wml ( head?, template?, card+ )>
-<!ATTLIST wml
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!-- card intrinsic events -->
-<!ENTITY % cardev
- "onenterforward %HREF; #IMPLIED
- onenterbackward %HREF; #IMPLIED
- ontimer %HREF; #IMPLIED"
- >
-
-<!-- card field types -->
-<!ENTITY % fields "%flow; | input | select | fieldset">
-
-<!ELEMENT card (onevent*, timer?, (do | p)*)>
-<!ATTLIST card
- title %vdata; #IMPLIED
- newcontext %boolean; "false"
- ordered %boolean; "true"
- xml:lang NMTOKEN #IMPLIED
- %cardev;
- %coreattrs;
- >
-
-<!--================ Event Bindings ================-->
-
-<!ELEMENT do (%task;)>
-<!ATTLIST do
- type CDATA #REQUIRED
- label %vdata; #IMPLIED
- name NMTOKEN #IMPLIED
- optional %boolean; "false"
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT onevent (%task;)>
-<!ATTLIST onevent
- type CDATA #REQUIRED
- %coreattrs;
- >
-
-<!--================ Deck-level declarations ================-->
-
-<!ELEMENT head ( access | meta )+>
-<!ATTLIST head
- %coreattrs;
- >
-
-<!ELEMENT template (%navelmts;)*>
-<!ATTLIST template
- %cardev;
- %coreattrs;
- >
-
-<!ELEMENT access EMPTY>
-<!ATTLIST access
- domain CDATA #IMPLIED
- path CDATA #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
- http-equiv CDATA #IMPLIED
- name CDATA #IMPLIED
- forua %boolean; #IMPLIED
- content CDATA #REQUIRED
- scheme CDATA #IMPLIED
- %coreattrs;
- >
-
-<!--================ Tasks ================-->
-
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
- href %HREF; #REQUIRED
- sendreferer %boolean; "false"
- method (post|get) "get"
- accept-charset CDATA #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT prev (setvar)*>
-<!ATTLIST prev
- %coreattrs;
- >
-
-<!ELEMENT refresh (setvar)*>
-<!ATTLIST refresh
- %coreattrs;
- >
-
-<!ELEMENT noop EMPTY>
-<!ATTLIST noop
- %coreattrs;
- >
-
-<!--================ postfield ================-->
-
-<!ELEMENT postfield EMPTY>
-<!ATTLIST postfield
- name %vdata; #REQUIRED
- value %vdata; #REQUIRED
- %coreattrs;
- >
-
-<!--================ variables ================-->
-
-<!ELEMENT setvar EMPTY>
-<!ATTLIST setvar
- name %vdata; #REQUIRED
- value %vdata; #REQUIRED
- %coreattrs;
- >
-
-<!--================ Card Fields ================-->
-
-<!ELEMENT select (optgroup|option)+>
-<!ATTLIST select
- title %vdata; #IMPLIED
- name NMTOKEN #IMPLIED
- value %vdata; #IMPLIED
- iname NMTOKEN #IMPLIED
- ivalue %vdata; #IMPLIED
- multiple %boolean; "false"
- tabindex %number; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT optgroup (optgroup|option)+ >
-<!ATTLIST optgroup
- title %vdata; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT option (#PCDATA | onevent)*>
-<!ATTLIST option
- value %vdata; #IMPLIED
- title %vdata; #IMPLIED
- onpick %HREF; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT input EMPTY>
-<!ATTLIST input
- name NMTOKEN #REQUIRED
- type (text|password) "text"
- value %vdata; #IMPLIED
- format CDATA #IMPLIED
- emptyok %boolean; "false"
- size %number; #IMPLIED
- maxlength %number; #IMPLIED
- tabindex %number; #IMPLIED
- title %vdata; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT fieldset (%fields; | do)* >
-<!ATTLIST fieldset
- title %vdata; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT timer EMPTY>
-<!ATTLIST timer
- name NMTOKEN #IMPLIED
- value %vdata; #REQUIRED
- %coreattrs;
- >
-
-<!--================ Images ================-->
-
-<!ENTITY % IAlign "(top|middle|bottom)" >
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
- alt %vdata; #REQUIRED
- src %HREF; #REQUIRED
- localsrc %vdata; #IMPLIED
- vspace %length; "0"
- hspace %length; "0"
- align %IAlign; "bottom"
- height %length; #IMPLIED
- width %length; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!--================ Anchor ================-->
-
-<!ELEMENT anchor ( #PCDATA | br | img | go | prev | refresh )*>
-<!ATTLIST anchor
- title %vdata; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
- href %HREF; #REQUIRED
- title %vdata; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!--================ Tables ================-->
-
-<!ELEMENT table (tr)+>
-<!ATTLIST table
- title %vdata; #IMPLIED
- align CDATA #IMPLIED
- columns %number; #REQUIRED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT tr (td)+>
-<!ATTLIST tr
- %coreattrs;
- >
-
-<!ELEMENT td ( %text; | %layout; | img | anchor | a )*>
-<!ATTLIST td
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!--================ Text layout and line breaks ================-->
-
-<!ELEMENT em (%flow;)*>
-<!ATTLIST em
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT strong (%flow;)*>
-<!ATTLIST strong
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT b (%flow;)*>
-<!ATTLIST b
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT i (%flow;)*>
-<!ATTLIST i
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT u (%flow;)*>
-<!ATTLIST u
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT big (%flow;)*>
-<!ATTLIST big
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT small (%flow;)*>
-<!ATTLIST small
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ENTITY % TAlign "(left|right|center)">
-<!ENTITY % WrapMode "(wrap|nowrap)" >
-<!ELEMENT p (%fields; | do)*>
-<!ATTLIST p
- align %TAlign; "left"
- mode %WrapMode; #IMPLIED
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ELEMENT br EMPTY>
-<!ATTLIST br
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
- >
-
-<!ENTITY quot """> <!-- quotation mark -->
-<!ENTITY amp "&#38;"> <!-- ampersand -->
-<!ENTITY apos "'"> <!-- apostrophe -->
-<!ENTITY lt "&#60;"> <!-- less than -->
-<!ENTITY gt ">"> <!-- greater than -->
-<!ENTITY nbsp " "> <!-- non-breaking space -->
-<!ENTITY shy "­"> <!-- soft hyphen (discretionary hyphen) -->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
deleted file mode 100644
index df2103a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- This DTD is identified by the PUBLIC identifier:
- "-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
- "success %URI; #IMPLIED
- failure %URI; #IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
- maxspace %Number; #REQUIRED
- base %URI; #IMPLIED
- eventid CDATA #IMPLIED
- channelid CDATA #REQUIRED
- useraccessible %Boolean; "false"
- %ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
- href %URI; #REQUIRED
- lastmod %Number; #IMPLIED
- etag NMTOKEN #IMPLIED
- md5 NMTOKEN #IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
deleted file mode 100644
index 67ed0d2..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
+++ /dev/null
@@ -1,219 +0,0 @@
-<!--
-Push Access Protocol (PAP) v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
-
-PAP is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 1.0//EN"
- "http://www.wapforum.org/DTD/pap_1.0.dtd">
- <pap>
- ...
- </pap>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % State "(rejected | pending
- | delivered | undeliverable
- | expired | aborted
- | timeout | cancelled | unknown)">
- <!-- PPG Message State -->
-
-
-<!ELEMENT pap ( push-message
- | push-response
- | cancel-message
- | cancel-response
- | resultnotification-message
- | resultnotification-response
- | statusquery-message
- | statusquery-response
- | ccq-message
- | ccq-response
- | badmessage-response) >
-<!ATTLIST pap
- product-name CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
- push-id CDATA #REQUIRED
- deliver-before-timestamp %Datetime; #IMPLIED
- deliver-after-timestamp %Datetime; #IMPLIED
- source-reference CDATA #IMPLIED
- ppg-notify-requested-to CDATA #IMPLIED
- progress-notes-requested ( true | false ) "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
- address-value CDATA #REQUIRED
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
- priority ( high | medium | low ) "medium"
- delivery-method ( confirmed | preferconfirmed
- | unconfirmed | notspecified ) "notspecified"
- network CDATA #IMPLIED
- network-required ( true | false ) "false"
- bearer CDATA #IMPLIED
- bearer-required ( true | false ) "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- reply-time %Datetime; #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
- stage CDATA #REQUIRED
- note CDATA #IMPLIED
- time %Datetime; #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- received-time %Datetime; #IMPLIED
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
- push-id CDATA #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
- query-id CDATA #IMPLIED
- app-id CDATA #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
- query-id CDATA #IMPLIED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
- bad-message-fragment CDATA #IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd
deleted file mode 100644
index e3e97c5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SI is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
- "http://www.wapforum.org/DTD/si.dtd">
- <si>
- ...
- </si>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
- href %URI; #IMPLIED
- si-id CDATA #IMPLIED
- created %Datetime; #IMPLIED
- si-expires %Datetime; #IMPLIED
- action (signal-none|signal-low|
- signal-medium|signal-high|delete) "signal-medium"
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
- class NMTOKEN #REQUIRED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd
deleted file mode 100644
index f87311c..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SL is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
- "http://www.wapforum.org/DTD/sl.dtd">
- <sl>
- ...
- </sl>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
- href %URI; #REQUIRED
- action (execute-low|execute-high|cache) "execute-low"
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd
deleted file mode 100644
index 1b8a49b..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd
deleted file mode 100644
index 060f7df..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
- "http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
- "http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd
deleted file mode 100644
index df2103a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- This DTD is identified by the PUBLIC identifier:
- "-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
- "success %URI; #IMPLIED
- failure %URI; #IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
- maxspace %Number; #REQUIRED
- base %URI; #IMPLIED
- eventid CDATA #IMPLIED
- channelid CDATA #REQUIRED
- useraccessible %Boolean; "false"
- %ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
- href %URI; #REQUIRED
- lastmod %Number; #IMPLIED
- etag NMTOKEN #IMPLIED
- md5 NMTOKEN #IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd
deleted file mode 100644
index 67ed0d2..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd
+++ /dev/null
@@ -1,219 +0,0 @@
-<!--
-Push Access Protocol (PAP) v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
-
-PAP is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 1.0//EN"
- "http://www.wapforum.org/DTD/pap_1.0.dtd">
- <pap>
- ...
- </pap>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % State "(rejected | pending
- | delivered | undeliverable
- | expired | aborted
- | timeout | cancelled | unknown)">
- <!-- PPG Message State -->
-
-
-<!ELEMENT pap ( push-message
- | push-response
- | cancel-message
- | cancel-response
- | resultnotification-message
- | resultnotification-response
- | statusquery-message
- | statusquery-response
- | ccq-message
- | ccq-response
- | badmessage-response) >
-<!ATTLIST pap
- product-name CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
- push-id CDATA #REQUIRED
- deliver-before-timestamp %Datetime; #IMPLIED
- deliver-after-timestamp %Datetime; #IMPLIED
- source-reference CDATA #IMPLIED
- ppg-notify-requested-to CDATA #IMPLIED
- progress-notes-requested ( true | false ) "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
- address-value CDATA #REQUIRED
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
- priority ( high | medium | low ) "medium"
- delivery-method ( confirmed | preferconfirmed
- | unconfirmed | notspecified ) "notspecified"
- network CDATA #IMPLIED
- network-required ( true | false ) "false"
- bearer CDATA #IMPLIED
- bearer-required ( true | false ) "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- reply-time %Datetime; #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
- stage CDATA #REQUIRED
- note CDATA #IMPLIED
- time %Datetime; #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- received-time %Datetime; #IMPLIED
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
- push-id CDATA #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
- query-id CDATA #IMPLIED
- app-id CDATA #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
- query-id CDATA #IMPLIED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
- bad-message-fragment CDATA #IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd
deleted file mode 100644
index e3e97c5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SI is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
- "http://www.wapforum.org/DTD/si.dtd">
- <si>
- ...
- </si>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
- href %URI; #IMPLIED
- si-id CDATA #IMPLIED
- created %Datetime; #IMPLIED
- si-expires %Datetime; #IMPLIED
- action (signal-none|signal-low|
- signal-medium|signal-high|delete) "signal-medium"
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
- class NMTOKEN #REQUIRED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd
deleted file mode 100644
index f87311c..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SL is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
- "http://www.wapforum.org/DTD/sl.dtd">
- <sl>
- ...
- </sl>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
- href %URI; #REQUIRED
- action (execute-low|execute-high|cache) "execute-low"
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd
deleted file mode 100644
index 0d03c62..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd
deleted file mode 100644
index 060f7df..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
- "http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
- "http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd
deleted file mode 100644
index df2103a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- This DTD is identified by the PUBLIC identifier:
- "-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
- "success %URI; #IMPLIED
- failure %URI; #IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
- maxspace %Number; #REQUIRED
- base %URI; #IMPLIED
- eventid CDATA #IMPLIED
- channelid CDATA #REQUIRED
- useraccessible %Boolean; "false"
- %ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
- href %URI; #REQUIRED
- lastmod %Number; #IMPLIED
- etag NMTOKEN #IMPLIED
- md5 NMTOKEN #IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd
deleted file mode 100644
index 9f6e8fd..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd
+++ /dev/null
@@ -1,223 +0,0 @@
-<!--
-Push Access Protocol (PAP) v2.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
-
-PAP is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 2.0//EN"
- "http://www.wapforum.org/DTD/pap_2.0.dtd"
- [<?wap-pap-ver supported-versions="2.0,1.*"?>]>
- <pap>
- ...
- </pap>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % State "(rejected | pending
- | delivered | undeliverable
- | expired | aborted
- | timeout | cancelled | unknown)">
- <!-- PPG Message State -->
-
-
-<!ELEMENT pap ( push-message
- | push-response
- | cancel-message
- | cancel-response
- | resultnotification-message
- | resultnotification-response
- | statusquery-message
- | statusquery-response
- | ccq-message
- | ccq-response
- | badmessage-response) >
-<!ATTLIST pap
- product-name CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
- push-id CDATA #REQUIRED
- replace-push-id CDATA #IMPLIED
- replace-method ( pending-only
- | all ) "all"
- deliver-before-timestamp %Datetime; #IMPLIED
- deliver-after-timestamp %Datetime; #IMPLIED
- source-reference CDATA #IMPLIED
- ppg-notify-requested-to CDATA #IMPLIED
- progress-notes-requested ( true | false ) "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
- address-value CDATA #REQUIRED
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
- priority ( high | medium | low ) "medium"
- delivery-method ( confirmed | preferconfirmed
- | unconfirmed | notspecified ) "notspecified"
- network CDATA #IMPLIED
- network-required ( true | false ) "false"
- bearer CDATA #IMPLIED
- bearer-required ( true | false ) "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- reply-time %Datetime; #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
- stage CDATA #REQUIRED
- note CDATA #IMPLIED
- time %Datetime; #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
- push-id CDATA #REQUIRED
- sender-address CDATA #IMPLIED
- sender-name CDATA #IMPLIED
- received-time %Datetime; #IMPLIED
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
- push-id CDATA #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
- push-id CDATA #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
- push-id CDATA #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
- event-time %Datetime; #IMPLIED
- message-state %State; #REQUIRED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
- query-id CDATA #IMPLIED
- app-id CDATA #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
- query-id CDATA #IMPLIED
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
- code CDATA #REQUIRED
- desc CDATA #IMPLIED
- bad-message-fragment CDATA #IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd
deleted file mode 100644
index bbc046f..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Client Provisioning v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
-
-Connectivity Document Type Definition
-Connectivity is an XML language. Typical Usage:
-
- <?xml version="1.0"?>
- <!DOCTYPE wap-provisioningdoc PUBLIC "-//WAPFORUM//DTD PROV 1.0//EN"
- "http://www.wapforum.org/DTD/prov.dtd">
-
-<wap-provisioningdoc>
-...
-</wap-provisioningdoc>
-
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ELEMENT wap-provisioningdoc (characteristic+)>
-<!ATTLIST wap-provisioningdoc
- version CDATA #IMPLIED
->
-
-<!ELEMENT characteristic (parm*, characteristic*)>
-<!ATTLIST characteristic
- type CDATA #REQUIRED
-
->
-
-<!ELEMENT parm EMPTY>
-<!ATTLIST parm
- name CDATA #REQUIRED
- value CDATA #IMPLIED
->
-
-
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd
deleted file mode 100644
index e3e97c5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SI is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
- "http://www.wapforum.org/DTD/si.dtd">
- <si>
- ...
- </si>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-
-<!ENTITY % Datetime "CDATA"> <!-- ISO date and time -->
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
- href %URI; #IMPLIED
- si-id CDATA #IMPLIED
- created %Datetime; #IMPLIED
- si-expires %Datetime; #IMPLIED
- action (signal-none|signal-low|
- signal-medium|signal-high|delete) "signal-medium"
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
- class NMTOKEN #REQUIRED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd
deleted file mode 100644
index f87311c..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
-
-SL is an XML language. Typical usage:
- <?xml version="1.0"?>
- <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
- "http://www.wapforum.org/DTD/sl.dtd">
- <sl>
- ...
- </sl>
-
-Terms and conditions of use are available from the Wireless
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % URI "CDATA"> <!-- URI designating a
- hypertext node -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
- href %URI; #REQUIRED
- action (execute-low|execute-high|cache) "execute-low"
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
- All rights reserved.
--->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod
deleted file mode 100644
index 924ad2e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod
+++ /dev/null
@@ -1,103 +0,0 @@
-<!-- WML Deprecated Module .................................... -->
-<!-- file: wml-deprecated-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
- SYSTEM "wml-deprecated-1.mod"
-
- This module contains deprecated elements and attributes.
-
- Attributes: WML mode, XHTML align, XHTML vspace, XHTML hspace
-
- Elements: u, b, big, i, small
-
--->
-<!--
- p
-
- *WML mode
- *XHTML align
-
- Replacement: Use CSS style sheets
--->
-<!ATTLIST %p.qname;
- %att.mode.qname; (wrap | nowrap) #IMPLIED
- align (left | right | center) "left"
->
-<!--
- table
-
- *WML align
-
- Note: The WML align attribute is not the same as the XHTML attribute with the same name.
--->
-<!ATTLIST %table.qname;
- %att.align.qname; CDATA #IMPLIED
->
-<!--
- img
-
- *XHTML vspace, hspace, align
-
- Replacement: Use CSS style sheets
--->
-<!ATTLIST img
- vspace CDATA "0"
- hspace CDATA "0"
- align (top | middle | bottom) "bottom"
->
-<!--
- Inline Presentation
-
- *XHTML b, big, i, small
-
- Replacement: Use CSS style sheets
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- "xhtml-inlpres-1.mod">
-%xhtml-inlpres.mod;
-<!--
- u
-
- This element is not available in the XHTML inline presentation module.
- It was deprecated already in HTML 4.0.
-
- Replacement: Use CSS style sheets
--->
-<!ENTITY % u.content "( #PCDATA | %Inline.mix; )*">
-<!ENTITY % u.qname "u">
-<!ELEMENT %u.qname; %u.content;>
-<!ATTLIST %u.qname;
- %Common.attrib;
->
-<!--
- meta
-
- *WML forua attribute
--->
-<!ATTLIST %meta.qname;
- %att.forua.qname; %Boolean.datatype; "true"
->
-<!--
- html
-
- *WML use-xml-fragment attribute
--->
-<!ATTLIST %html.qname;
- %att.usexmlfragment.qname; %Boolean.datatype; "true"
->
-
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod
deleted file mode 100644
index d061af6..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- WML Modular Framework ...................................................... -->
-<!-- file: wml-framework-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
- SYSTEM "http://www.wapforum.org/dtd/wml-framework-1.mod"
-
- This is an extension of the XHTML Modular Framework module. In addition to the
- required XHTML entities it includes:
-
- *WML datatypes
- *WML namespace qualified names
- *WML document model
--->
-<!--
- XHTML notations
--->
-<!ENTITY % xhtml-notations.mod PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod">
-%xhtml-notations.mod;
-<!--
- WML datatypes
--->
-<!ENTITY % Boolean.datatype "(true|false)">
-<!--
- XHTML datatypes
--->
-<!ENTITY % xhtml-datatypes.mod PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod">
-%xhtml-datatypes.mod;
-<!--
- WML qualified names
--->
-<!ENTITY % wml-qname.mod PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
- "http://www.wapforum.org/DTD/wml-qname-1.mod">
-%wml-qname.mod;
-<!--
- XHTML qualified names
--->
-<!ENTITY % xhtml-qname.mod PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod">
-%xhtml-qname.mod;
-<!--
- XHTML global attributes
--->
-<!ENTITY % xhtml-inlstyle.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod">
-%xhtml-inlstyle.mod;
-<!ENTITY % XHTML.bidi "IGNORE">
-<!ENTITY % xhtml-attribs.mod PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod">
-%xhtml-attribs.mod;
-<!--
- XHTML character entities
--->
-<!ENTITY % xhtml-charent.mod PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod">
-%xhtml-charent.mod;
-<!--
- WML document model
--->
-<!ENTITY % wml-model.mod PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
- "http://www.wapforum.org/DTD/wml20-model-1.mod">
-%wml-model.mod;
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod
deleted file mode 100644
index 9ef5a55..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- WML Qualified Names Module ......................................... -->
-<!-- file: wml-qname-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
- SYSTEM "wml-qname-1.mod"
-
- This module declares WML names with the WML namespace prefix.
-
--->
-<!--
- The WML namespace name
--->
-<!ENTITY % WML.xmlns "http://www.wapforum.org/2001/wml">
-<!--
- WML namespace prefix
-
- On WML elements WML is declared as the default namespace.
- Namespace prefix is used only for WML attributes on XHTML elements.
--->
-<!ENTITY % WML.prefix "wml">
-<!--
- Parameter entity with the WML namespace prefix plus the ":".
- The actual prefix, WML.prefix, is declared in the WML DTD driver.
--->
-<!ENTITY % WML.pfx "%WML.prefix;:">
-<!--
- Attribute used to declare the WML namespace with the WML prefix.
--->
-<!ENTITY % WML.xmlns.extra.attrib "xmlns:%WML.prefix; %URI.datatype; #FIXED '%WML.xmlns;'">
-<!--
- All WML qualified names.
-
- Note that element names are not prefixed. Only attribute names are.
--->
-<!ENTITY % card.qname "%WML.pfx;card">
-<!ENTITY % do.qname "%WML.pfx;do">
-<!ENTITY % access.qname "%WML.pfx;access">
-<!ENTITY % go.qname "%WML.pfx;go">
-<!ENTITY % prev.qname "%WML.pfx;prev">
-<!ENTITY % refresh.qname "%WML.pfx;refresh">
-<!ENTITY % noop.qname "%WML.pfx;noop">
-<!ENTITY % onevent.qname "%WML.pfx;onevent">
-<!ENTITY % postfield.qname "%WML.pfx;postfield">
-<!ENTITY % setvar.qname "%WML.pfx;setvar">
-<!ENTITY % getvar.qname "%WML.pfx;getvar">
-<!ENTITY % timer.qname "%WML.pfx;timer">
-<!ENTITY % widget.qname "%WML.pfx;widget">
-<!ENTITY % anchor.qname "%WML.pfx;anchor">
-<!ENTITY % att.forua.qname "%WML.pfx;forua">
-<!ENTITY % att.value.qname "%WML.pfx;value">
-<!ENTITY % att.iname.qname "%WML.pfx;iname">
-<!ENTITY % att.name.qname "%WML.pfx;name">
-<!ENTITY % att.ivalue.qname "%WML.pfx;ivalue">
-<!ENTITY % att.format.qname "%WML.pfx;format">
-<!ENTITY % att.emptyok.qname "%WML.pfx;emptyok">
-<!ENTITY % att.localsrc.qname "%WML.pfx;localsrc">
-<!ENTITY % att.columns.qname "%WML.pfx;columns">
-<!ENTITY % att.align.qname "%WML.pfx;align">
-<!ENTITY % att.mode.qname "%WML.pfx;mode">
-<!ENTITY % att.onenterforward.qname "%WML.pfx;onenterforward">
-<!ENTITY % att.onenterbackward.qname "%WML.pfx;onenterbackward">
-<!ENTITY % att.ontimer.qname "%WML.pfx;ontimer">
-<!ENTITY % att.onpick.qname "%WML.pfx;onpick">
-<!ENTITY % att.newcontext.qname "%WML.pfx;newcontext">
-<!ENTITY % att.usexmlfragment.qname "%WML.pfx;use-xml-fragments">
-<!ENTITY % att.type.qname "%WML.pfx;type">
-<!--
- The u element is not declared in XHTML, because it has beed removed from the language.
- So it must be declared here. It is, however, deprecated in WML.
--->
-<!ENTITY % u.qname "u">
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod
deleted file mode 100644
index d485911..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod
+++ /dev/null
@@ -1,248 +0,0 @@
-<!-- WML 2.0 Special Module .................................... -->
-<!-- file: wml-special-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
- SYSTEM "wml-special-1.mod"
-
- This module contains declarations of the following WML elements.
-
- card, do, onevent, access, go, prev,
- refresh, noop, postfield, setvar, getvar
- timer, anchor
-
- It also contains WML extensions of XHTML elements.
--->
-<!-- ============================================ -->
-<!--
- WML Global attributes
--->
-<!-- ============================================ -->
-<!--
- WML Event attributes
-
- These are used on the XHTML body and html elements.
- The same attributes are also available on the WML card element, but
- without namespace prefix.
--->
-<!ENTITY % WML.event.attrib "%att.onenterforward.qname; CDATA #IMPLIED
- %att.onenterbackward.qname; CDATA #IMPLIED
- %att.ontimer.qname; CDATA #IMPLIED">
-<!-- ============================================ -->
-<!--
- WML Elements
--->
-<!-- ============================================ -->
-<!--
- Cards
-
- Use same content model as the HTML body element
--->
-<!ELEMENT %card.qname; %CardBody.mix;>
-<!ATTLIST %card.qname;
- %Common.attrib;
- newcontext %Boolean.datatype; "false"
- onenterforward CDATA #IMPLIED
- onenterbackward CDATA #IMPLIED
- ontimer CDATA #IMPLIED
->
-<!--
- Do
--->
-<!ELEMENT %do.qname; (%Tasks.class;)>
-<!ATTLIST %do.qname;
- %Common.attrib;
- type CDATA #REQUIRED
- label CDATA #IMPLIED
->
-<!--
- Onevent
--->
-<!ELEMENT %onevent.qname; %Tasks.class;>
-<!ATTLIST %onevent.qname;
- %Core.attrib;
- type CDATA #REQUIRED
->
-<!--
- Access
--->
-<!ELEMENT %access.qname; EMPTY>
-<!ATTLIST %access.qname;
- %Core.attrib;
- domain CDATA #IMPLIED
- path CDATA #IMPLIED
->
-<!--
- Go
--->
-<!ENTITY % cache-control '(no-cache)'>
-<!ELEMENT %go.qname; (%postfield.qname; | %setvar.qname;)*>
-<!ATTLIST %go.qname;
- %Core.attrib;
- href %URI.datatype; #REQUIRED
- sendreferer %Boolean.datatype; "false"
- type %ContentType.datatype; #IMPLIED
- method (post | get) "get"
- enctype %ContentType.datatype; "application/x-www-form-urlencoded"
- accept-charset CDATA #IMPLIED
- cache-control %cache-control; #IMPLIED
->
-<!--
- Prev
--->
-<!ELEMENT %prev.qname; (%setvar.qname;)*>
-<!ATTLIST %prev.qname;
- %Core.attrib;
->
-<!--
- Refresh
--->
-<!ELEMENT %refresh.qname; (%setvar.qname;)*>
-<!ATTLIST %refresh.qname;
- %Core.attrib;
->
-<!--
- Noop
--->
-<!ELEMENT %noop.qname; EMPTY>
-<!ATTLIST %noop.qname;
- %Core.attrib;
->
-<!--
- Postfield
--->
-<!ELEMENT %postfield.qname; EMPTY>
-<!ATTLIST %postfield.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-<!--
- Setvar
--->
-<!ELEMENT %setvar.qname; EMPTY>
-<!ATTLIST %setvar.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-<!--
- Getvar
--->
-<!ELEMENT %getvar.qname; EMPTY>
-<!ATTLIST %getvar.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- conversion (escape | noesc | unesc) "noesc"
->
-<!--
- Timer
--->
-<!ELEMENT %timer.qname; EMPTY>
-<!ATTLIST %timer.qname;
- %Core.attrib;
- name NMTOKEN #IMPLIED
- value CDATA #REQUIRED
->
-<!--
- Anchor
-
- Same content model as HTML a element, but extended with WML tasks.
--->
-<!ELEMENT %anchor.qname; (#PCDATA | %InlNoAnchor.mix; | %Tasks-nonoop.class;)*>
-<!ATTLIST %anchor.qname;
- %Common.attrib;
- accesskey CDATA #IMPLIED
->
-<!-- ============================================ -->
-<!--
- WML extensions of XHTML elements
--->
-<!-- ============================================ -->
-<!--
- select
-
- *WML iname, ivalue, value, and name attributes
- *XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %select.qname;
- %att.iname.qname; NMTOKEN #IMPLIED
- %att.value.qname; CDATA #IMPLIED
- %att.ivalue.qname; CDATA #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- input
-
- *WML format, emptyok, and name attributes
- *XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %input.qname;
- %att.format.qname; CDATA #IMPLIED
- %att.emptyok.qname; %Boolean.datatype; #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- textarea
-
- *WML format, emptyok, and name attributes
- *XHTML tabindex attribute (not in Basic Forms module)
--->
-<!ATTLIST %textarea.qname;
- %att.format.qname; CDATA #IMPLIED
- %att.emptyok.qname; %Boolean.datatype; #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- option
-
- *WML onpick attribute
--->
-<!ATTLIST %option.qname;
- %att.onpick.qname; CDATA #IMPLIED
->
-<!--
- img
-
- *WML localsrc attribute
--->
-<!ATTLIST img
- %att.localsrc.qname; CDATA #IMPLIED
- %att.type.qname; %ContentType.datatype; #IMPLIED
->
-<!--
- table
-
- *WML columns attribute
-
--->
-<!ATTLIST %table.qname;
- %att.columns.qname; %Number.datatype; #IMPLIED
->
-<!--
- body
-
- *WML newcontext
- *WML event attributes
--->
-<!ATTLIST %body.qname;
- %att.newcontext.qname; %Boolean.datatype; "false"
- %WML.event.attrib;
->
-<!--
- html
-
- *Declaration of WML namespace with prefix
- *WML event attributes
--->
-<!ATTLIST %html.qname;
- %WML.xmlns.extra.attrib;
- %WML.event.attrib;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd
deleted file mode 100644
index 40570a5..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd
+++ /dev/null
@@ -1,3609 +0,0 @@
-<!-- WML 2.0 DTD ...................................................... -->
-<!-- file: wml20.dtd -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This is the WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
- "-//WAPFORUM//DTD WML 2.0//EN"
-
- For example, if you are using WML 2.0 directly, use
- the FPI in the DOCTYPE declaration, with the xmlns attribute
- on the document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD WML 2.0//EN"
- "http://www.wapforum.org/dtd/wml20.dtd" >
- <html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wml="http://www.wapforum.org/2001/wml">
- ...
- </html>
-
--->
-<!-- ============================================ -->
-<!--
- Version, XML Namespaces, and profile information
--->
-<!-- ============================================ -->
-<!--
- Value of XHTML version attribute
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!--
- Value of XHTML profile attribute
-
- Reserved for future use with document profiles
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
- Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
- "http://www.wapforum.org/DTD/wml-framework-1.mod">
-<!-- WML Modular Framework ...................................................... -->
-<!-- file: wml-framework-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
- SYSTEM "http://www.wapforum.org/dtd/wml-framework-1.mod"
-
- This is an extension of the XHTML Modular Framework module. In addition to the
- required XHTML entities it includes:
-
- *WML datatypes
- *WML namespace qualified names
- *WML document model
--->
-<!--
- XHTML notations
--->
-<!ENTITY % xhtml-notations.mod PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Notations
-
- defines the following notations, many of these imported from
- other specifications and standards. When an existing FPI is
- known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
- PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
- PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
- PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
- PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
- PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
- PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
- PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
- PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
- PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
- PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
- PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-
-<!--
- WML datatypes
--->
-<!ENTITY % Boolean.datatype "(true|false)">
-<!--
- XHTML datatypes
--->
-<!ENTITY % xhtml-datatypes.mod PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Datatypes
-
- defines containers for the following datatypes, many of
- these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-
-<!--
- WML qualified names
--->
-<!ENTITY % wml-qname.mod PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
- "http://www.wapforum.org/DTD/wml-qname-1.mod">
-<!-- WML Qualified Names Module ......................................... -->
-<!-- file: wml-qname-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
- SYSTEM "wml-qname-1.mod"
-
- This module declares WML names with the WML namespace prefix.
-
--->
-<!--
- The WML namespace name
--->
-<!ENTITY % WML.xmlns "http://www.wapforum.org/2001/wml">
-<!--
- WML namespace prefix
-
- On WML elements WML is declared as the default namespace.
- Namespace prefix is used only for WML attributes on XHTML elements.
--->
-<!ENTITY % WML.prefix "wml">
-<!--
- Parameter entity with the WML namespace prefix plus the ":".
- The actual prefix, WML.prefix, is declared in the WML DTD driver.
--->
-<!ENTITY % WML.pfx "%WML.prefix;:">
-<!--
- Attribute used to declare the WML namespace with the WML prefix.
--->
-<!ENTITY % WML.xmlns.extra.attrib "xmlns:%WML.prefix; %URI.datatype; #FIXED '%WML.xmlns;'">
-<!--
- All WML qualified names.
-
- Note that element names are not prefixed. Only attribute names are.
--->
-<!ENTITY % card.qname "%WML.pfx;card">
-<!ENTITY % do.qname "%WML.pfx;do">
-<!ENTITY % access.qname "%WML.pfx;access">
-<!ENTITY % go.qname "%WML.pfx;go">
-<!ENTITY % prev.qname "%WML.pfx;prev">
-<!ENTITY % refresh.qname "%WML.pfx;refresh">
-<!ENTITY % noop.qname "%WML.pfx;noop">
-<!ENTITY % onevent.qname "%WML.pfx;onevent">
-<!ENTITY % postfield.qname "%WML.pfx;postfield">
-<!ENTITY % setvar.qname "%WML.pfx;setvar">
-<!ENTITY % getvar.qname "%WML.pfx;getvar">
-<!ENTITY % timer.qname "%WML.pfx;timer">
-<!ENTITY % widget.qname "%WML.pfx;widget">
-<!ENTITY % anchor.qname "%WML.pfx;anchor">
-<!ENTITY % att.forua.qname "%WML.pfx;forua">
-<!ENTITY % att.value.qname "%WML.pfx;value">
-<!ENTITY % att.iname.qname "%WML.pfx;iname">
-<!ENTITY % att.name.qname "%WML.pfx;name">
-<!ENTITY % att.ivalue.qname "%WML.pfx;ivalue">
-<!ENTITY % att.format.qname "%WML.pfx;format">
-<!ENTITY % att.emptyok.qname "%WML.pfx;emptyok">
-<!ENTITY % att.localsrc.qname "%WML.pfx;localsrc">
-<!ENTITY % att.columns.qname "%WML.pfx;columns">
-<!ENTITY % att.align.qname "%WML.pfx;align">
-<!ENTITY % att.mode.qname "%WML.pfx;mode">
-<!ENTITY % att.onenterforward.qname "%WML.pfx;onenterforward">
-<!ENTITY % att.onenterbackward.qname "%WML.pfx;onenterbackward">
-<!ENTITY % att.ontimer.qname "%WML.pfx;ontimer">
-<!ENTITY % att.onpick.qname "%WML.pfx;onpick">
-<!ENTITY % att.newcontext.qname "%WML.pfx;newcontext">
-<!ENTITY % att.usexmlfragment.qname "%WML.pfx;use-xml-fragments">
-<!ENTITY % att.type.qname "%WML.pfx;type">
-<!--
- The u element is not declared in XHTML, because it has beed removed from the language.
- So it must be declared here. It is, however, deprecated in WML.
--->
-<!ENTITY % u.qname "u">
-
-<!--
- XHTML qualified names
--->
-<!ENTITY % xhtml-qname.mod PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod">
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
- Revisions:
-#2000-10-22: added qname declarations for ruby elements
- ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
- This module is contained in two parts, labeled Section 'A' and 'B':
-
- Section A declares parameter entities to support namespace-
- qualified names, namespace declarations, and name prefixing
- for XHTML and extensions.
-
- Section B declares parameter entities used to provide
- namespace-qualified names for all XHTML element types:
-
- %applet.qname; the xmlns-qualified name for <applet>
- %base.qname; the xmlns-qualified name for <base>
- ...
-
- XHTML extensions would create a module similar to this one.
- Included in the XHTML distribution is a template module
- ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
- to activate namespace prefixing. The default value should
- inherit '%NS.prefixed;' from the DTD driver, so that unless
- overridden, the default behaviour follows the overall DTD
- prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
- the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
- the default namespace prefix string(s) to use when prefixing
- is enabled. This may be overridden in the DTD driver or the
- internal subset of an document instance. If no default prefix
- is desired, this may be declared as an empty string.
-
- NOTE: As specified in [XMLNAMES], the namespace prefix serves
- as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
- colonized prefix(es) (eg., '%XHTML.prefix;:') used when
- prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
- redeclared to contain any non-XHTML namespace declaration
- attributes for namespaces embedded in XHTML. The default
- is an empty string. XLink should be included here if used
- in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
- all XML Namespace declarations used in the DTD, plus the
- xmlns declaration for XHTML, its form dependent on whether
- prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
- "xmlns:%XHTML.prefix; %URI.datatype; #FIXED '%XHTML.xmlns;'
- %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
- "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
- XML namespace declaration attributes used by XHTML, including
- a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
- "%NS.decl.attrib;
- %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
- "xmlns %URI.datatype; #FIXED '%XHTML.xmlns;'
- %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
- namespace-qualified names for all XHTML element types.
--->
-
-<!-- module: xhtml-applet-1.mod -->
-<!ENTITY % applet.qname "%XHTML.pfx;applet" >
-
-<!-- module: xhtml-base-1.mod -->
-<!ENTITY % base.qname "%XHTML.pfx;base" >
-
-<!-- module: xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname "%XHTML.pfx;bdo" >
-
-<!-- module: xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname "%XHTML.pfx;h6" >
-
-<!-- module: xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname "%XHTML.pfx;hr" >
-
-<!-- module: xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname "%XHTML.pfx;div" >
-<!ENTITY % p.qname "%XHTML.pfx;p" >
-
-<!-- module: xhtml-edit-1.mod -->
-<!ENTITY % ins.qname "%XHTML.pfx;ins" >
-<!ENTITY % del.qname "%XHTML.pfx;del" >
-
-<!-- module: xhtml-form-1.mod -->
-<!ENTITY % form.qname "%XHTML.pfx;form" >
-<!ENTITY % label.qname "%XHTML.pfx;label" >
-<!ENTITY % input.qname "%XHTML.pfx;input" >
-<!ENTITY % select.qname "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname "%XHTML.pfx;legend" >
-<!ENTITY % button.qname "%XHTML.pfx;button" >
-
-<!-- module: xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname "%XHTML.pfx;a" >
-
-<!-- module: xhtml-image-1.mod -->
-<!ENTITY % img.qname "%XHTML.pfx;img" >
-
-<!-- module: xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname "%XHTML.pfx;cite" >
-<!ENTITY % code.qname "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname "%XHTML.pfx;q" >
-<!ENTITY % samp.qname "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname "%XHTML.pfx;strong" >
-<!ENTITY % var.qname "%XHTML.pfx;var" >
-
-<!-- module: xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname "%XHTML.pfx;b" >
-<!ENTITY % big.qname "%XHTML.pfx;big" >
-<!ENTITY % i.qname "%XHTML.pfx;i" >
-<!ENTITY % small.qname "%XHTML.pfx;small" >
-<!ENTITY % sub.qname "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname "%XHTML.pfx;tt" >
-
-<!-- module: xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname "%XHTML.pfx;br" >
-<!ENTITY % span.qname "%XHTML.pfx;span" >
-
-<!-- module: xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname "%XHTML.pfx;map" >
-<!ENTITY % area.qname "%XHTML.pfx;area" >
-
-<!-- module: xhtml-link-1.mod -->
-<!ENTITY % link.qname "%XHTML.pfx;link" >
-
-<!-- module: xhtml-list-1.mod -->
-<!ENTITY % dl.qname "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname "%XHTML.pfx;ul" >
-<!ENTITY % li.qname "%XHTML.pfx;li" >
-
-<!-- module: xhtml-meta-1.mod -->
-<!ENTITY % meta.qname "%XHTML.pfx;meta" >
-
-<!-- module: xhtml-param-1.mod -->
-<!ENTITY % param.qname "%XHTML.pfx;param" >
-
-<!-- module: xhtml-object-1.mod -->
-<!ENTITY % object.qname "%XHTML.pfx;object" >
-
-<!-- module: xhtml-script-1.mod -->
-<!ENTITY % script.qname "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname "%XHTML.pfx;noscript" >
-
-<!-- module: xhtml-struct-1.mod -->
-<!ENTITY % html.qname "%XHTML.pfx;html" >
-<!ENTITY % head.qname "%XHTML.pfx;head" >
-<!ENTITY % title.qname "%XHTML.pfx;title" >
-<!ENTITY % body.qname "%XHTML.pfx;body" >
-
-<!-- module: xhtml-style-1.mod -->
-<!ENTITY % style.qname "%XHTML.pfx;style" >
-
-<!-- module: xhtml-table-1.mod -->
-<!ENTITY % table.qname "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname "%XHTML.pfx;col" >
-<!ENTITY % tr.qname "%XHTML.pfx;tr" >
-<!ENTITY % th.qname "%XHTML.pfx;th" >
-<!ENTITY % td.qname "%XHTML.pfx;td" >
-
-<!-- module: xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names ...................... -->
-
-<!-- module: xhtml-image-2.mod -->
-<!ENTITY % alt.qname "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-
-<!--
- XHTML global attributes
--->
-<!ENTITY % xhtml-inlstyle.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Style
-
- This module declares the 'style' attribute, used to support inline
- style markup. This module must be instantiated prior to the XHTML
- Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
- "style CDATA #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
- "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-
-<!ENTITY % XHTML.bidi "IGNORE">
-<!ENTITY % xhtml-attribs.mod PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Common Attributes
-
- This module declares many of the common attributes for the XHTML DTD.
- %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
- "id ID #IMPLIED"
->
-
-<!ENTITY % class.attrib
- "class NMTOKENS #IMPLIED"
->
-
-<!ENTITY % title.attrib
- "title %Text.datatype; #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
- "%XHTML.xmlns.attrib;
- %id.attrib;
- %class.attrib;
- %title.attrib;
- %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
- "xml:lang %LanguageCode.datatype; #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
- "dir ( ltr | rtl ) #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
- "%dir.attrib;
- %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
- "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
- "%Core.attrib;
- %I18n.attrib;
- %Events.attrib;
- %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-
-<!--
- XHTML character entities
--->
-<!ENTITY % xhtml-charent.mod PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
- This module declares the set of character entities for XHTML,
- including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Latin 1 Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-lat1.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-lat1
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent" >
- %xhtml-lat1;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent"
-
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
--->
-
-<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-<!ENTITY iexcl "¡" ><!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent "¢" ><!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound "£" ><!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "¤" ><!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen "¥" ><!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "¦" ><!-- broken bar = broken vertical bar, U+00A6 ISOnum -->
-<!ENTITY sect "§" ><!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml "¨" ><!-- diaeresis = spacing diaeresis, U+00A8 ISOdia -->
-<!ENTITY copy "©" ><!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf "ª" ><!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo "«" ><!-- left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not "¬" ><!-- not sign, U+00AC ISOnum -->
-<!ENTITY shy "­" ><!-- soft hyphen = discretionary hyphen, U+00AD ISOnum -->
-<!ENTITY reg "®" ><!-- registered sign = registered trade mark sign, U+00AE ISOnum -->
-<!ENTITY macr "¯" ><!-- macron = spacing macron = overline = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg "°" ><!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "±" ><!-- plus-minus sign = plus-or-minus sign, U+00B1 ISOnum -->
-<!ENTITY sup2 "²" ><!-- superscript two = superscript digit two = squared, U+00B2 ISOnum -->
-<!ENTITY sup3 "³" ><!-- superscript three = superscript digit three = cubed, U+00B3 ISOnum -->
-<!ENTITY acute "´" ><!-- acute accent = spacing acute, U+00B4 ISOdia -->
-<!ENTITY micro "µ" ><!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para "¶" ><!-- pilcrow sign = paragraph sign, U+00B6 ISOnum -->
-<!ENTITY middot "·" ><!-- middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil "¸" ><!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1 "¹" ><!-- superscript one = superscript digit one, U+00B9 ISOnum -->
-<!ENTITY ordm "º" ><!-- masculine ordinal indicator, U+00BA ISOnum -->
-<!ENTITY raquo "»" ><!-- right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "¼" ><!-- vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "½" ><!-- vulgar fraction one half = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "¾" ><!-- vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "¿" ><!-- inverted question mark = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "À" ><!-- latin capital A with grave = latin capital A grave, U+00C0 ISOlat1 -->
-<!ENTITY Aacute "Á" ><!-- latin capital A with acute, U+00C1 ISOlat1 -->
-<!ENTITY Acirc "Â" ><!-- latin capital A with circumflex, U+00C2 ISOlat1 -->
-<!ENTITY Atilde "Ã" ><!-- latin capital A with tilde, U+00C3 ISOlat1 -->
-<!ENTITY Auml "Ä" ><!-- latin capital A with diaeresis, U+00C4 ISOlat1 -->
-<!ENTITY Aring "Å" ><!-- latin capital A with ring above = latin capital A ring, U+00C5 ISOlat1 -->
-<!ENTITY AElig "Æ" ><!-- latin capital AE = latin capital ligature AE, U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "Ç" ><!-- latin capital C with cedilla, U+00C7 ISOlat1 -->
-<!ENTITY Egrave "È" ><!-- latin capital E with grave, U+00C8 ISOlat1 -->
-<!ENTITY Eacute "É" ><!-- latin capital E with acute, U+00C9 ISOlat1 -->
-<!ENTITY Ecirc "Ê" ><!-- latin capital E with circumflex, U+00CA ISOlat1 -->
-<!ENTITY Euml "Ë" ><!-- latin capital E with diaeresis, U+00CB ISOlat1 -->
-<!ENTITY Igrave "Ì" ><!-- latin capital I with grave, U+00CC ISOlat1 -->
-<!ENTITY Iacute "Í" ><!-- latin capital I with acute, U+00CD ISOlat1 -->
-<!ENTITY Icirc "Î" ><!-- latin capital I with circumflex, U+00CE ISOlat1 -->
-<!ENTITY Iuml "Ï" ><!-- latin capital I with diaeresis, U+00CF ISOlat1 -->
-<!ENTITY ETH "Ð" ><!-- latin capital ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "Ñ" ><!-- latin capital N with tilde, U+00D1 ISOlat1 -->
-<!ENTITY Ograve "Ò" ><!-- latin capital O with grave, U+00D2 ISOlat1 -->
-<!ENTITY Oacute "Ó" ><!-- latin capital O with acute, U+00D3 ISOlat1 -->
-<!ENTITY Ocirc "Ô" ><!-- latin capital O with circumflex, U+00D4 ISOlat1 -->
-<!ENTITY Otilde "Õ" ><!-- latin capital O with tilde, U+00D5 ISOlat1 -->
-<!ENTITY Ouml "Ö" ><!-- latin capital O with diaeresis, U+00D6 ISOlat1 -->
-<!ENTITY times "×" ><!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "Ø" ><!-- latin capital O with stroke = latin capital O slash, U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "Ù" ><!-- latin capital U with grave, U+00D9 ISOlat1 -->
-<!ENTITY Uacute "Ú" ><!-- latin capital U with acute, U+00DA ISOlat1 -->
-<!ENTITY Ucirc "Û" ><!-- latin capital U with circumflex, U+00DB ISOlat1 -->
-<!ENTITY Uuml "Ü" ><!-- latin capital U with diaeresis, U+00DC ISOlat1 -->
-<!ENTITY Yacute "Ý" ><!-- latin capital Y with acute, U+00DD ISOlat1 -->
-<!ENTITY THORN "Þ" ><!-- latin capital THORN, U+00DE ISOlat1 -->
-<!ENTITY szlig "ß" ><!-- latin small sharp s = ess-zed, U+00DF ISOlat1 -->
-<!ENTITY agrave "à" ><!-- latin small a with grave = latin small a grave, U+00E0 ISOlat1 -->
-<!ENTITY aacute "á" ><!-- latin small a with acute, U+00E1 ISOlat1 -->
-<!ENTITY acirc "â" ><!-- latin small a with circumflex, U+00E2 ISOlat1 -->
-<!ENTITY atilde "ã" ><!-- latin small a with tilde, U+00E3 ISOlat1 -->
-<!ENTITY auml "ä" ><!-- latin small a with diaeresis, U+00E4 ISOlat1 -->
-<!ENTITY aring "å" ><!-- latin small a with ring above = latin small a ring, U+00E5 ISOlat1 -->
-<!ENTITY aelig "æ" ><!-- latin small ae = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "ç" ><!-- latin small c with cedilla, U+00E7 ISOlat1 -->
-<!ENTITY egrave "è" ><!-- latin small e with grave, U+00E8 ISOlat1 -->
-<!ENTITY eacute "é" ><!-- latin small e with acute, U+00E9 ISOlat1 -->
-<!ENTITY ecirc "ê" ><!-- latin small e with circumflex, U+00EA ISOlat1 -->
-<!ENTITY euml "ë" ><!-- latin small e with diaeresis, U+00EB ISOlat1 -->
-<!ENTITY igrave "ì" ><!-- latin small i with grave, U+00EC ISOlat1 -->
-<!ENTITY iacute "í" ><!-- latin small i with acute, U+00ED ISOlat1 -->
-<!ENTITY icirc "î" ><!-- latin small i with circumflex, U+00EE ISOlat1 -->
-<!ENTITY iuml "ï" ><!-- latin small i with diaeresis, U+00EF ISOlat1 -->
-<!ENTITY eth "ð" ><!-- latin small eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "ñ" ><!-- latin small n with tilde, U+00F1 ISOlat1 -->
-<!ENTITY ograve "ò" ><!-- latin small o with grave, U+00F2 ISOlat1 -->
-<!ENTITY oacute "ó" ><!-- latin small o with acute, U+00F3 ISOlat1 -->
-<!ENTITY ocirc "ô" ><!-- latin small o with circumflex, U+00F4 ISOlat1 -->
-<!ENTITY otilde "õ" ><!-- latin small o with tilde, U+00F5 ISOlat1 -->
-<!ENTITY ouml "ö" ><!-- latin small o with diaeresis, U+00F6 ISOlat1 -->
-<!ENTITY divide "÷" ><!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "ø" ><!-- latin small o with stroke, = latin small o slash, U+00F8 ISOlat1 -->
-<!ENTITY ugrave "ù" ><!-- latin small u with grave, U+00F9 ISOlat1 -->
-<!ENTITY uacute "ú" ><!-- latin small u with acute, U+00FA ISOlat1 -->
-<!ENTITY ucirc "û" ><!-- latin small u with circumflex, U+00FB ISOlat1 -->
-<!ENTITY uuml "ü" ><!-- latin small u with diaeresis, U+00FC ISOlat1 -->
-<!ENTITY yacute "ý" ><!-- latin small y with acute, U+00FD ISOlat1 -->
-<!ENTITY thorn "þ" ><!-- latin small thorn with, U+00FE ISOlat1 -->
-<!ENTITY yuml "ÿ" ><!-- latin small y with diaeresis, U+00FF ISOlat1 -->
-<!-- end of xhtml-lat1.ent -->
-
-
-<!ENTITY % xhtml-symbol
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent" >
-<!-- ...................................................................... -->
-<!-- ISO Math, Greek and Symbolic Character Entity Set for XHTML .......... -->
-<!-- file: xhtml-symbol.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-symbol
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent" >
- %xhtml-symbol;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent"
-
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 [SGML] list) do not clash with
- any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
- numbers are given for each character, in hex. Entity values are
- decimal conversions of the ISO 10646 values and refer to the
- document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof "ƒ" ><!-- latin small f with hook = function
- = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha "Α" ><!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta "Β" ><!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma "Γ" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
-<!ENTITY Delta "Δ" ><!-- greek capital letter delta, U+0394 ISOgrk3 -->
-<!ENTITY Epsilon "Ε" ><!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta "Ζ" ><!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta "Η" ><!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta "Θ" ><!-- greek capital letter theta, U+0398 ISOgrk3 -->
-<!ENTITY Iota "Ι" ><!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa "Κ" ><!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda "Λ" ><!-- greek capital letter lambda, U+039B ISOgrk3 -->
-<!ENTITY Mu "Μ" ><!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu "Ν" ><!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi "Ξ" ><!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron "Ο" ><!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi "Π" ><!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho "Ρ" ><!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma "Σ" ><!-- greek capital letter sigma, U+03A3 ISOgrk3 -->
-<!ENTITY Tau "Τ" ><!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon "Υ" ><!-- greek capital letter upsilon,
- U+03A5 ISOgrk3 -->
-<!ENTITY Phi "Φ" ><!-- greek capital letter phi, U+03A6 ISOgrk3 -->
-<!ENTITY Chi "Χ" ><!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi "Ψ" ><!-- greek capital letter psi, U+03A8 ISOgrk3 -->
-<!ENTITY Omega "Ω" ><!-- greek capital letter omega, U+03A9 ISOgrk3 -->
-<!ENTITY alpha "α" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
-<!ENTITY beta "β" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma "γ" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
-<!ENTITY delta "δ" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
-<!ENTITY epsilon "ε" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
-<!ENTITY zeta "ζ" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta "η" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta "θ" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
-<!ENTITY iota "ι" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa "κ" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
-<!ENTITY lambda "λ" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
-<!ENTITY mu "μ" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu "ν" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi "ξ" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron "ο" ><!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi "π" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho "ρ" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf "ς" ><!-- greek small letter final sigma, U+03C2 ISOgrk3 -->
-<!ENTITY sigma "σ" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
-<!ENTITY tau "τ" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon "υ" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
-<!ENTITY phi "φ" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi "χ" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi "ψ" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega "ω" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "ϑ" ><!-- greek small letter theta symbol, U+03D1 NEW -->
-<!ENTITY upsih "ϒ" ><!-- greek upsilon with hook symbol, U+03D2 NEW -->
-<!ENTITY piv "ϖ" ><!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull "•" ><!-- bullet = black small circle, U+2022 ISOpub -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip "…" ><!-- horizontal ellipsis = three dot leader, U+2026 ISOpub -->
-<!ENTITY prime "′" ><!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime "″" ><!-- double prime = seconds = inches, U+2033 ISOtech -->
-<!ENTITY oline "‾" ><!-- overline = spacing overscore, U+203E NEW -->
-<!ENTITY frasl "⁄" ><!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp "℘" ><!-- script capital P = power set = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image "ℑ" ><!-- blackletter capital I = imaginary part, U+2111 ISOamso -->
-<!ENTITY real "ℜ" ><!-- blackletter capital R = real part symbol, U+211C ISOamso -->
-<!ENTITY trade "™" ><!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym "ℵ" ><!-- alef symbol = first transfinite cardinal, U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef, U+05D0 although
- the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr "←" ><!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr "↑" ><!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr "→" ><!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr "↓" ><!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr "↔" ><!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr "↵" ><!-- downwards arrow with corner leftwards
- = carriage return, U+21B5 NEW -->
-<!ENTITY lArr "⇐" ><!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
- but also does not have any other character for that function. So ? lArr can
- be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr "⇑" ><!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr "⇒" ><!-- rightwards double arrow, U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have
- another character with this function so ?
- rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr "⇓" ><!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr "⇔" ><!-- left right double arrow, U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall "∀" ><!-- for all, U+2200 ISOtech -->
-<!ENTITY part "∂" ><!-- partial differential, U+2202 ISOtech -->
-<!ENTITY exist "∃" ><!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty "∅" ><!-- empty set = null set = diameter, U+2205 ISOamso -->
-<!ENTITY nabla "∇" ><!-- nabla = backward difference, U+2207 ISOtech -->
-<!ENTITY isin "∈" ><!-- element of, U+2208 ISOtech -->
-<!ENTITY notin "∉" ><!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni "∋" ><!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod "∏" ><!-- n-ary product = product sign, U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
- the same glyph might be used for both -->
-<!ENTITY sum "∑" ><!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
- though the same glyph might be used for both -->
-<!ENTITY minus "−" ><!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast "∗" ><!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic "√" ><!-- square root = radical sign, U+221A ISOtech -->
-<!ENTITY prop "∝" ><!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin "∞" ><!-- infinity, U+221E ISOtech -->
-<!ENTITY ang "∠" ><!-- angle, U+2220 ISOamso -->
-<!ENTITY and "∧" ><!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or "∨" ><!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap "∩" ><!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup "∪" ><!-- union = cup, U+222A ISOtech -->
-<!ENTITY int "∫" ><!-- integral, U+222B ISOtech -->
-<!ENTITY there4 "∴" ><!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim "∼" ><!-- tilde operator = varies with = similar to, U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
- although the same glyph might be used to represent both -->
-<!ENTITY cong "≅" ><!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp "≈" ><!-- almost equal to = asymptotic to, U+2248 ISOamsr -->
-<!ENTITY ne "≠" ><!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv "≡" ><!-- identical to, U+2261 ISOtech -->
-<!ENTITY le "≤" ><!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge "≥" ><!-- greater-than or equal to, U+2265 ISOtech -->
-<!ENTITY sub "⊂" ><!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup "⊃" ><!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
- font encoding and is not included. Should it be, for symmetry?
- It is in ISOamsn -->
-<!ENTITY nsub "⊄" ><!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube "⊆" ><!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe "⊇" ><!-- superset of or equal to, U+2287 ISOtech -->
-<!ENTITY oplus "⊕" ><!-- circled plus = direct sum, U+2295 ISOamsb -->
-<!ENTITY otimes "⊗" ><!-- circled times = vector product, U+2297 ISOamsb -->
-<!ENTITY perp "⊥" ><!-- up tack = orthogonal to = perpendicular, U+22A5 ISOtech -->
-<!ENTITY sdot "⋅" ><!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil "⌈" ><!-- left ceiling = apl upstile, U+2308 ISOamsc -->
-<!ENTITY rceil "⌉" ><!-- right ceiling, U+2309 ISOamsc -->
-<!ENTITY lfloor "⌊" ><!-- left floor = apl downstile, U+230A ISOamsc -->
-<!ENTITY rfloor "⌋" ><!-- right floor, U+230B ISOamsc -->
-<!ENTITY lang "〈" ><!-- left-pointing angle bracket = bra, U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than'
- or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang "〉" ><!-- right-pointing angle bracket = ket, U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than'
- or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz "◊" ><!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades "♠" ><!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs "♣" ><!-- black club suit = shamrock, U+2663 ISOpub -->
-<!ENTITY hearts "♥" ><!-- black heart suit = valentine, U+2665 ISOpub -->
-<!ENTITY diams "♦" ><!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- end of xhtml-symbol.ent -->
-
-
-<!ENTITY % xhtml-special
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Special Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-special.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-special
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent" >
- %xhtml-special;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent"
-
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
-
- Revisions:
-2000-10-28: added ' and altered XML Predefined Entities for compatibility
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 [SGML] list) do not clash with
- any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
- numbers are given for each character, in hex. Entity values are
- decimal conversions of the ISO 10646 values and refer to the
- document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY lt "&<" ><!-- less-than sign, U+003C ISOnum -->
-<!ENTITY gt ">" ><!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY amp "&&" ><!-- ampersand, U+0026 ISOnum -->
-<!ENTITY apos "'" ><!-- apostrophe, U+0027 ISOnum -->
-<!ENTITY quot """ ><!-- quotation mark = APL quote, U+0022 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig "Œ" ><!-- latin capital ligature OE, U+0152 ISOlat2 -->
-<!ENTITY oelig "œ" ><!-- latin small ligature oe, U+0153 ISOlat2 -->
-
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron "Š" ><!-- latin capital letter S with caron, U+0160 ISOlat2 -->
-<!ENTITY scaron "š" ><!-- latin small letter s with caron, U+0161 ISOlat2 -->
-<!ENTITY Yuml "Ÿ" ><!-- latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ "ˆ" ><!-- modifier letter circumflex accent, U+02C6 ISOpub -->
-<!ENTITY tilde "˜" ><!-- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp " " ><!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp " " ><!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp " " ><!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj "‌" ><!-- zero width non-joiner, U+200C NEW RFC 2070 -->
-<!ENTITY zwj "‍" ><!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm "‎" ><!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm "‏" ><!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash "–" ><!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash "—" ><!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo "‘" ><!-- left single quotation mark, U+2018 ISOnum -->
-<!ENTITY rsquo "’" ><!-- right single quotation mark, U+2019 ISOnum -->
-<!ENTITY sbquo "‚" ><!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo "“" ><!-- left double quotation mark, U+201C ISOnum -->
-<!ENTITY rdquo "”" ><!-- right double quotation mark, U+201D ISOnum -->
-<!ENTITY bdquo "„" ><!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger "†" ><!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger "‡" ><!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil "‰" ><!-- per mille sign, U+2030 ISOtech -->
-
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY lsaquo "‹" ><!-- single left-pointing angle quotation mark, U+2039 ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo "›" ><!-- single right-pointing angle quotation mark, U+203A ISO proposed -->
-<!ENTITY euro "€" ><!-- euro sign, U+20AC NEW -->
-
-<!-- end of xhtml-special.ent -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-
-<!--
- WML document model
--->
-<!ENTITY % wml-model.mod PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
- "http://www.wapforum.org/DTD/wml20-model-1.mod">
-<!-- WML 2.0 Document Model Module .................................... -->
-<!-- file: wml20-model-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
- SYSTEM "http://www.wapforum.org/dtd/wml20-model-1.mod"
-
- This module describes the groupings of elements that make up
- common content models for WML and XHTML elements.
-
- Three basic content models are declared:
-
- %Inline.mix; character-level elements
- %Block.mix; block-like elements, eg., paragraphs and lists
- %Flow.mix; any block or inline elements
-
- Any parameter entities declared in this module may be used
- to create element content models, but the above three are
- considered 'global' (insofar as that term applies here).
-
-
--->
-<!--
- Optional Elements in head
--->
-<!ENTITY % HeadOpts.mix "( %meta.qname;
- | %link.qname;
- | %style.qname;
- | %object.qname;
- | %access.qname;)*">
-<!--
- Task elements
-
- Used for the WML do and onevent elements
--->
-<!ENTITY % Tasks.class "(%go.qname;
- | %prev.qname;
- | %noop.qname;
- | %refresh.qname;)">
-<!--
- Tasks without noop element
-
- Used for the WML anchor
--->
-<!ENTITY % Tasks-nonoop.class "%go.qname;
- | %prev.qname;
- | %refresh.qname;">
-<!--
- Do element
--->
-<!ENTITY % Do.class "%do.qname;">
-<!--
- Miscellaneous Elements
-
- This is not used for anything right now.
--->
-<!ENTITY % Misc.class "">
-<!--
- Inline Elements
--->
-<!ENTITY % InlStruct.class "%br.qname;
- | %span.qname;">
-<!ENTITY % InlPhras.class "| %em.qname;
- | %strong.qname;
- | %dfn.qname;
- | %code.qname;
- | %samp.qname;
- | %kbd.qname;
- | %var.qname;
- | %cite.qname;
- | %abbr.qname;
- | %acronym.qname;
- | %q.qname;">
-<!ENTITY % InlPres.class "| %i.qname;
- | %b.qname;
- | %big.qname;
- | %small.qname;
- | %u.qname;">
-<!ENTITY % I18n.class "">
-<!ENTITY % Anchor.class "| %a.qname;
- | %anchor.qname; | %do.qname;">
-<!ENTITY % InlSpecial.class "| %img.qname;
- | %object.qname;
- | %getvar.qname;">
-<!ENTITY % InlForm.class "| %input.qname;
- | %select.qname;
- | %textarea.qname;
- | %label.qname;">
-<!ENTITY % Inline.extra "">
-<!ENTITY % Inline.class "%InlStruct.class;
- %InlPhras.class;
- %InlPres.class;
- %Anchor.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;">
-<!ENTITY % InlNoAnchor.class "%InlStruct.class;
- %InlPhras.class;
- %InlPres.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;">
-<!ENTITY % InlNoAnchor.mix "%InlNoAnchor.class;
- %Misc.class;">
-<!ENTITY % Inline.mix "%Inline.class;
- %Misc.class;">
-<!--
- Block Elements
--->
-<!ENTITY % Heading.class "%h1.qname;
- | %h2.qname;
- | %h3.qname;
- | %h4.qname;
- | %h5.qname;
- | %h6.qname;">
-<!ENTITY % List.class "%ul.qname;
- | %ol.qname;
- | %dl.qname;">
-<!ENTITY % Table.class "| %table.qname;">
-<!ENTITY % Form.class "| %form.qname;">
-<!ENTITY % Fieldset.class "| %fieldset.qname;">
-<!ENTITY % BlkStruct.class "%p.qname;
- | %div.qname;">
-<!ENTITY % BlkPhras.class "| %pre.qname;
- | %blockquote.qname;
- | %address.qname;">
-<!ENTITY % BlkPres.class "| %hr.qname;">
-<!ENTITY % BlkSpecial.class "%Table.class;
- %Form.class;
- %Fieldset.class;">
-<!ENTITY % Block.extra "">
-<!ENTITY % Block.class "%BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %BlkSpecial.class;
- %Block.extra;">
-<!ENTITY % Block.mix "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Do.class;
- %Misc.class;">
-<!ENTITY % BlkNoForm.mix "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- | %table.qname;
- %Block.extra;
- %Misc.class;">
-<!--
- All Content Elements
--->
-<!--
- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %Form.class;
- %Block.extra;
- | %Inline.class;
- %Misc.class;">
-<!ENTITY % Flow.mix "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Inline.class;
- %Misc.class;">
-<!--
- Template level elements
--->
-<!ENTITY % Template.mix "( %onevent.qname;)*">
-<!--
- Content model of the WML card and XHTML body elements
--->
-<!ENTITY % CardBody.mix "(%onevent.qname;*, %timer.qname;?, ( %Block.mix; )+)">
-<!-- end of wml20-model-1.mod -->
-
-
-<!-- ============================================ -->
-<!--
- XHTML modules
--->
-<!-- ============================================ -->
-<!-- Text Module ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
- | %InlStruct.class; | %i.qname; | %b.qname;
- %InlPhras.class;
- %Anchor.class;
- %Inline.extra;
- | %getvar.qname;
- | %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!ENTITY % xhtml-text.mod PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Text Module ................................................... -->
-<!-- file: xhtml-text-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Textual Content
-
- The Text module includes declarations for all core
- text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
- "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Structural
-
- br, span
-
- This module declares the elements and their attributes
- used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content "EMPTY" >
-<!ENTITY % br.qname "br" >
-<!ELEMENT %br.qname; %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
- %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname "span" >
-<!ELEMENT %span.qname; %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
- %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
- "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Phrasal
-
- abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
- This module declares the elements and their attributes used to
- support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname "abbr" >
-<!ELEMENT %abbr.qname; %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
- %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname "acronym" >
-<!ELEMENT %acronym.qname; %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
- %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname "cite" >
-<!ELEMENT %cite.qname; %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
- %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname "code" >
-<!ELEMENT %code.qname; %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
- %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname "dfn" >
-<!ELEMENT %dfn.qname; %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
- %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname "em" >
-<!ELEMENT %em.qname; %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
- %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname "kbd" >
-<!ELEMENT %kbd.qname; %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
- %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname "q" >
-<!ELEMENT %q.qname; %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
- %Common.attrib;
- cite %URI.datatype; #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname "samp" >
-<!ELEMENT %samp.qname; %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
- %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname "strong" >
-<!ELEMENT %strong.qname; %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
- %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname "var" >
-<!ELEMENT %var.qname; %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
- %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
- "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Structural
-
- div, p
-
- This module declares the elements and their attributes used to
- support block-level structural markup.
--->
-
-<!ENTITY % div.element "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname "div" >
-<!ELEMENT %div.qname; %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
- %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
- "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname "p" >
-<!ELEMENT %p.qname; %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
- %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
- "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Phrasal
-
- address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
- This module declares the elements and their attributes used to
- support block-level phrasal markup.
--->
-
-<!ENTITY % address.element "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
- "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname "address" >
-<!ELEMENT %address.qname; %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
- %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
- "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname "blockquote" >
-<!ELEMENT %blockquote.qname; %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
- %Common.attrib;
- cite %URI.datatype; #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
- "( #PCDATA
- | %InlStruct.class;
- %InlPhras.class;
- | %tt.qname; | %i.qname; | %b.qname;
- %I18n.class;
- %Anchor.class;
- | %script.qname; | %map.qname;
- %Inline.extra; )*"
->
-<!ENTITY % pre.qname "pre" >
-<!ELEMENT %pre.qname; %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
- %Common.attrib;
- xml:space ( preserve ) #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ................... Heading Elements ................... -->
-
-<!ENTITY % Heading.content "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname "h1" >
-<!ELEMENT %h1.qname; %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
- %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname "h2" >
-<!ELEMENT %h2.qname; %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
- %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname "h3" >
-<!ELEMENT %h3.qname; %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
- %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname "h4" >
-<!ELEMENT %h4.qname; %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
- %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname "h5" >
-<!ELEMENT %h5.qname; %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
- %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname "h6" >
-<!ELEMENT %h6.qname; %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
- %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-<!ENTITY % xhtml-hypertext.mod PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Hypertext
-
- a
-
- This module declares the anchor ('a') element type, which
- defines the source of a hypertext link. The destination
- (or link 'target') is identified via its 'id' attribute
- rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............ Anchor Element ............ -->
-
-<!ENTITY % a.element "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
- "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname "a" >
-<!ELEMENT %a.qname; %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
- %Common.attrib;
- href %URI.datatype; #IMPLIED
- charset %Charset.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- hreflang %LanguageCode.datatype; #IMPLIED
- rel %LinkTypes.datatype; #IMPLIED
- rev %LinkTypes.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-<!-- List Module ............................................... -->
-<!ENTITY % xhtml-list.mod PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module .................................................. -->
-<!-- file: xhtml-list-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Lists
-
- dl, dt, dd, ol, ul, li
-
- This module declares the list-oriented element types
- and their attributes.
--->
-
-<!ENTITY % dl.qname "dl" >
-<!ENTITY % dt.qname "dt" >
-<!ENTITY % dd.qname "dd" >
-<!ENTITY % ol.qname "ol" >
-<!ENTITY % ul.qname "ul" >
-<!ENTITY % li.qname "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname; %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
- %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname; %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
- %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname; %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
- %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content "( %li.qname; )+" >
-<!ELEMENT %ol.qname; %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
- %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content "( %li.qname; )+" >
-<!ELEMENT %ul.qname; %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
- %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname; %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
- %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-<!-- Extend lists with value and start attributes -->
-<!ATTLIST %li.qname;
- value %Number.datatype; #IMPLIED
->
-<!ATTLIST %ol.qname;
- start %Number.datatype; #IMPLIED
->
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.mod PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Images Module ................................................. -->
-<!-- file: xhtml-image-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Rovision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Images
-
- img
-
- This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
- image content understandable and navigable to users of
- non-visual UAs, you need to provide a description with
- the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content "EMPTY" >
-<!ENTITY % img.qname "img" >
-<!ELEMENT %img.qname; %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
- %Common.attrib;
- src %URI.datatype; #REQUIRED
- alt %Text.datatype; #REQUIRED
- longdesc %URI.datatype; #IMPLIED
- height %Length.datatype; #IMPLIED
- width %Length.datatype; #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.mod PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module ..................................... -->
-<!-- file: xhtml-param-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
- param
-
- This module provides declarations for the param element,
- used to provide named property values for the applet
- and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content "EMPTY" >
-<!ENTITY % param.qname "param" >
-<!ELEMENT %param.qname; %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
- %XHTML.xmlns.attrib;
- %id.attrib;
- name CDATA #REQUIRED
- value CDATA #IMPLIED
- valuetype ( data | ref | object ) 'data'
- type %ContentType.datatype; #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.mod PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module ........................................ -->
-<!-- file: xhtml-object-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Embedded Objects
-
- object
-
- This module declares the object element type and its attributes, used
- to embed external objects as part of XHTML pages. In the document,
- place param elements prior to other content within the object element.
-
- Note that use of this module requires instantiation of the Param
- Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
- "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname "object" >
-<!ELEMENT %object.qname; %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
- %Common.attrib;
- declare ( declare ) #IMPLIED
- classid %URI.datatype; #IMPLIED
- codebase %URI.datatype; #IMPLIED
- data %URI.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- codetype %ContentType.datatype; #IMPLIED
- archive %URIs.datatype; #IMPLIED
- standby %Text.datatype; #IMPLIED
- height %Length.datatype; #IMPLIED
- width %Length.datatype; #IMPLIED
- name CDATA #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod">
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
- This is XHTML Basic, a proper subset of XHTML.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Basic Tables
-
- table, caption, tr, th, td
-
- This table module declares elements and attributes defining
- a table model based fundamentally on features found in the
- widely-deployed HTML 3.2 table model. While this module
- mimics the content model and table attributes of HTML 3.2
- tables, the element types declared herein also includes all
- HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname "table" >
-<!ENTITY % caption.qname "caption" >
-<!ENTITY % tr.qname "tr" >
-<!ENTITY % th.qname "th" >
-<!ENTITY % td.qname "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
- "align ( left
- | center
- | right ) #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
- "valign ( top
- | middle
- | bottom ) #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
- "scope ( row | col ) #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
- "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname; %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
- %Common.attrib;
- summary %Text.datatype; #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname; %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
- %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname; %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
- %Common.attrib;
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
- but for cells acting as both use td
--->
-
-<!ENTITY % th.element "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
- "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname; %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
- %Common.attrib;
- abbr %Text.datatype; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- %scope.attrib;
- rowspan %Number.datatype; '1'
- colspan %Number.datatype; '1'
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
- "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname; %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
- %Common.attrib;
- abbr %Text.datatype; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- %scope.attrib;
- rowspan %Number.datatype; '1'
- colspan %Number.datatype; '1'
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-
-<!-- Forms Module ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
- %Common.attrib;
- label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
- %Common.attrib;
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
- | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-form.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
- This is XHTML Basic, a proper subset of XHTML.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Basic Forms
-
- This forms module is based on the HTML 3.2 forms model, with
- the WAI-requested addition of the label element. While this
- module essentially mimics the content model and attributes of
- HTML 3.2 forms, the element types declared herein also include
- all HTML 4 common attributes.
-
- form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname "form" >
-<!ENTITY % label.qname "label" >
-<!ENTITY % input.qname "input" >
-<!ENTITY % select.qname "select" >
-<!ENTITY % option.qname "option" >
-<!ENTITY % textarea.qname "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
- plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- | %table.qname;
- %Block.extra;
- %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
- "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname; %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
- %Common.attrib;
- action %URI.datatype; #REQUIRED
- method ( get | post ) 'get'
- enctype %ContentType.datatype; 'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
- "( #PCDATA
- | %input.qname; | %select.qname; | %textarea.qname;
- | %InlStruct.class;
- %InlPhras.class;
- %I18n.class;
- %InlPres.class;
- %InlSpecial.class;
- %Misc.class; )*"
->
-<!ELEMENT %label.qname; %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
- %Common.attrib;
- for IDREF #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content "EMPTY" >
-<!ELEMENT %input.qname; %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
- "( text | password | checkbox | radio
- | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
- %Common.attrib;
- type %InputType.class; 'text'
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- checked ( checked ) #IMPLIED
- size CDATA #IMPLIED
- maxlength %Number.datatype; #IMPLIED
- src %URI.datatype; #IMPLIED
- tabindex %Number.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content "( %option.qname; )+" >
-<!ELEMENT %select.qname; %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
- %Common.attrib;
- name CDATA #IMPLIED
- size %Number.datatype; #IMPLIED
- multiple ( multiple ) #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content "( #PCDATA )" >
-<!ELEMENT %option.qname; %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
- %Common.attrib;
- selected ( selected ) #IMPLIED
- value CDATA #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content "( #PCDATA )" >
-<!ELEMENT %textarea.qname; %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
- %Common.attrib;
- name CDATA #IMPLIED
- rows %Number.datatype; #REQUIRED
- cols %Number.datatype; #REQUIRED
- tabindex %Number.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.mod PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module ........................................... -->
-<!-- file: xhtml-link-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Link element
-
- link
-
- This module declares the link element type and its attributes,
- which could (in principle) be used to define document-level links
- to external resources such as:
-
- a) for document specific toolbars/menus, e.g. start, contents,
- previous, next, index, end, help
- b) to link to a separate style sheet (rel="stylesheet")
- c) to make a link to a script (rel="script")
- d) by style sheets to control how collections of html nodes are
- rendered into printed documents
- e) to make a link to a printable version of this document
- e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content "EMPTY" >
-<!ENTITY % link.qname "link" >
-<!ELEMENT %link.qname; %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
- %Common.attrib;
- charset %Charset.datatype; #IMPLIED
- href %URI.datatype; #IMPLIED
- hreflang %LanguageCode.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- rel %LinkTypes.datatype; #IMPLIED
- rev %LinkTypes.datatype; #IMPLIED
- media %MediaDesc.datatype; #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.mod PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module ............................... -->
-<!-- file: xhtml-meta-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Meta Information
-
- meta
-
- This module declares the meta element type and its attributes,
- used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content "EMPTY" >
-<!ENTITY % meta.qname "meta" >
-<!ELEMENT %meta.qname; %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
- http-equiv NMTOKEN #IMPLIED
- name NMTOKEN #IMPLIED
- content CDATA #REQUIRED
- scheme CDATA #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.mod PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module ........................................... -->
-<!-- file: xhtml-base-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Base element
-
- base
-
- This module declares the base element type and its attributes,
- used to define a base URI against which relative URIs in the
- document will be resolved.
-
- Note that this module also redeclares the content model for
- the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content "EMPTY" >
-<!ENTITY % base.qname "base" >
-<!ELEMENT %base.qname; %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
- %XHTML.xmlns.attrib;
- href %URI.datatype; #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
- "( %HeadOpts.mix;,
- ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
- | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-
-<!-- Stylesheets Module ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module ................................... -->
-<!-- file: xhtml-style-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Style Sheets
-
- style
-
- This module declares the style element type and its attributes,
- used to embed style sheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information .................... -->
-
-<!ENTITY % style.element "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content "( #PCDATA )" >
-<!ENTITY % style.qname "style" >
-<!ELEMENT %style.qname; %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
- %XHTML.xmlns.attrib;
- %title.attrib;
- %I18n.attrib;
- type %ContentType.datatype; #REQUIRED
- media %MediaDesc.datatype; #IMPLIED
- xml:space ( preserve ) #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!ENTITY % xhtml-struct.mod PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Document Structure
-
- title, head, body, html
-
- The Structure Module defines the major structural elements and
- their attributes.
-
- Note that the content model of the head element type is redeclared
- when the Base Module is included in the DTD.
-
- The parameter entity containing the XML namespace URI value used
- for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content "( #PCDATA )" >
-<!ENTITY % title.qname "title" >
-<!ELEMENT %title.qname; %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
- "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname "head" >
-<!ELEMENT %head.qname; %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
- "profile %URI.datatype; '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
- %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
- "( %Block.mix; )+"
->
-<!ENTITY % body.qname "body" >
-<!ELEMENT %body.qname; %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
- %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname "html" >
-<!ELEMENT %html.qname; %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
- "version %FPI.datatype; #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
- on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
- %XHTML.xmlns.attrib;
- %XHTML.version.attrib;
- %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Presentational Elements
-
- hr
-
- This module declares the elements and their attributes used to
- support block-level presentational markup.
--->
-
-<!ENTITY % hr.element "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content "EMPTY" >
-<!ENTITY % hr.qname "hr" >
-<!ELEMENT %hr.qname; %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
- %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-
-<!-- ============================================ -->
-<!--
- WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
- "http://www.wapforum.org/DTD/wml-special-1.mod">
-<!-- WML 2.0 Special Module .................................... -->
-<!-- file: wml-special-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
- SYSTEM "wml-special-1.mod"
-
- This module contains declarations of the following WML elements.
-
- card, do, onevent, access, go, prev,
- refresh, noop, postfield, setvar, getvar
- timer, anchor
-
- It also contains WML extensions of XHTML elements.
--->
-<!-- ============================================ -->
-<!--
- WML Global attributes
--->
-<!-- ============================================ -->
-<!--
- WML Event attributes
-
- These are used on the XHTML body and html elements.
- The same attributes are also available on the WML card element, but
- without namespace prefix.
--->
-<!ENTITY % WML.event.attrib "%att.onenterforward.qname; CDATA #IMPLIED
- %att.onenterbackward.qname; CDATA #IMPLIED
- %att.ontimer.qname; CDATA #IMPLIED">
-<!-- ============================================ -->
-<!--
- WML Elements
--->
-<!-- ============================================ -->
-<!--
- Cards
-
- Use same content model as the HTML body element
--->
-<!ELEMENT %card.qname; %CardBody.mix;>
-<!ATTLIST %card.qname;
- %Common.attrib;
- newcontext %Boolean.datatype; "false"
- onenterforward CDATA #IMPLIED
- onenterbackward CDATA #IMPLIED
- ontimer CDATA #IMPLIED
->
-<!--
- Do
--->
-<!ELEMENT %do.qname; (%Tasks.class;)>
-<!ATTLIST %do.qname;
- %Common.attrib;
- type CDATA #REQUIRED
- label CDATA #IMPLIED
->
-<!--
- Onevent
--->
-<!ELEMENT %onevent.qname; %Tasks.class;>
-<!ATTLIST %onevent.qname;
- %Core.attrib;
- type CDATA #REQUIRED
->
-<!--
- Access
--->
-<!ELEMENT %access.qname; EMPTY>
-<!ATTLIST %access.qname;
- %Core.attrib;
- domain CDATA #IMPLIED
- path CDATA #IMPLIED
->
-<!--
- Go
--->
-<!ENTITY % cache-control '(no-cache)'>
-<!ELEMENT %go.qname; (%postfield.qname; | %setvar.qname;)*>
-<!ATTLIST %go.qname;
- %Core.attrib;
- href %URI.datatype; #REQUIRED
- sendreferer %Boolean.datatype; "false"
- type %ContentType.datatype; #IMPLIED
- method (post | get) "get"
- enctype %ContentType.datatype; "application/x-www-form-urlencoded"
- accept-charset CDATA #IMPLIED
- cache-control %cache-control; #IMPLIED
->
-<!--
- Prev
--->
-<!ELEMENT %prev.qname; (%setvar.qname;)*>
-<!ATTLIST %prev.qname;
- %Core.attrib;
->
-<!--
- Refresh
--->
-<!ELEMENT %refresh.qname; (%setvar.qname;)*>
-<!ATTLIST %refresh.qname;
- %Core.attrib;
->
-<!--
- Noop
--->
-<!ELEMENT %noop.qname; EMPTY>
-<!ATTLIST %noop.qname;
- %Core.attrib;
->
-<!--
- Postfield
--->
-<!ELEMENT %postfield.qname; EMPTY>
-<!ATTLIST %postfield.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-<!--
- Setvar
--->
-<!ELEMENT %setvar.qname; EMPTY>
-<!ATTLIST %setvar.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-<!--
- Getvar
--->
-<!ELEMENT %getvar.qname; EMPTY>
-<!ATTLIST %getvar.qname;
- %Core.attrib;
- name CDATA #REQUIRED
- conversion (escape | noesc | unesc) "noesc"
->
-<!--
- Timer
--->
-<!ELEMENT %timer.qname; EMPTY>
-<!ATTLIST %timer.qname;
- %Core.attrib;
- name NMTOKEN #IMPLIED
- value CDATA #REQUIRED
->
-<!--
- Anchor
-
- Same content model as HTML a element, but extended with WML tasks.
--->
-<!ELEMENT %anchor.qname; (#PCDATA | %InlNoAnchor.mix; | %Tasks-nonoop.class;)*>
-<!ATTLIST %anchor.qname;
- %Common.attrib;
- accesskey CDATA #IMPLIED
->
-<!-- ============================================ -->
-<!--
- WML extensions of XHTML elements
--->
-<!-- ============================================ -->
-<!--
- select
-
- *WML iname, ivalue, value, and name attributes
- *XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %select.qname;
- %att.iname.qname; NMTOKEN #IMPLIED
- %att.value.qname; CDATA #IMPLIED
- %att.ivalue.qname; CDATA #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- input
-
- *WML format, emptyok, and name attributes
- *XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %input.qname;
- %att.format.qname; CDATA #IMPLIED
- %att.emptyok.qname; %Boolean.datatype; #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- textarea
-
- *WML format, emptyok, and name attributes
- *XHTML tabindex attribute (not in Basic Forms module)
--->
-<!ATTLIST %textarea.qname;
- %att.format.qname; CDATA #IMPLIED
- %att.emptyok.qname; %Boolean.datatype; #IMPLIED
- %att.name.qname; CDATA #IMPLIED
->
-<!--
- option
-
- *WML onpick attribute
--->
-<!ATTLIST %option.qname;
- %att.onpick.qname; CDATA #IMPLIED
->
-<!--
- img
-
- *WML localsrc attribute
--->
-<!ATTLIST img
- %att.localsrc.qname; CDATA #IMPLIED
- %att.type.qname; %ContentType.datatype; #IMPLIED
->
-<!--
- table
-
- *WML columns attribute
-
--->
-<!ATTLIST %table.qname;
- %att.columns.qname; %Number.datatype; #IMPLIED
->
-<!--
- body
-
- *WML newcontext
- *WML event attributes
--->
-<!ATTLIST %body.qname;
- %att.newcontext.qname; %Boolean.datatype; "false"
- %WML.event.attrib;
->
-<!--
- html
-
- *Declaration of WML namespace with prefix
- *WML event attributes
--->
-<!ATTLIST %html.qname;
- %WML.xmlns.extra.attrib;
- %WML.event.attrib;
->
-
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
- "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-<!-- WML Deprecated Module .................................... -->
-<!-- file: wml-deprecated-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
- SYSTEM "wml-deprecated-1.mod"
-
- This module contains deprecated elements and attributes.
-
- Attributes: WML mode, XHTML align, XHTML vspace, XHTML hspace
-
- Elements: u, b, big, i, small
-
--->
-<!--
- p
-
- *WML mode
- *XHTML align
-
- Replacement: Use CSS style sheets
--->
-<!ATTLIST %p.qname;
- %att.mode.qname; (wrap | nowrap) #IMPLIED
- align (left | right | center) "left"
->
-<!--
- table
-
- *WML align
-
- Note: The WML align attribute is not the same as the XHTML attribute with the same name.
--->
-<!ATTLIST %table.qname;
- %att.align.qname; CDATA #IMPLIED
->
-<!--
- img
-
- *XHTML vspace, hspace, align
-
- Replacement: Use CSS style sheets
--->
-<!ATTLIST img
- vspace CDATA "0"
- hspace CDATA "0"
- align (top | middle | bottom) "bottom"
->
-<!--
- Inline Presentation
-
- *XHTML b, big, i, small
-
- Replacement: Use CSS style sheets
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- "xhtml-inlpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
- b, big, i, small, sub, sup, tt
-
- This module declares the elements and their attributes used to
- support inline-level presentational markup.
--->
-
-<!ENTITY % b.element "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname "b" >
-<!ELEMENT %b.qname; %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
- %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname "big" >
-<!ELEMENT %big.qname; %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
- %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname "i" >
-<!ELEMENT %i.qname; %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
- %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname "small" >
-<!ELEMENT %small.qname; %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
- %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname "sub" >
-<!ELEMENT %sub.qname; %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
- %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname "sup" >
-<!ELEMENT %sup.qname; %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
- %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname "tt" >
-<!ELEMENT %tt.qname; %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
- %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-
-<!--
- u
-
- This element is not available in the XHTML inline presentation module.
- It was deprecated already in HTML 4.0.
-
- Replacement: Use CSS style sheets
--->
-<!ENTITY % u.content "( #PCDATA | %Inline.mix; )*">
-<!ENTITY % u.qname "u">
-<!ELEMENT %u.qname; %u.content;>
-<!ATTLIST %u.qname;
- %Common.attrib;
->
-<!--
- meta
-
- *WML forua attribute
--->
-<!ATTLIST %meta.qname;
- %att.forua.qname; %Boolean.datatype; "true"
->
-<!--
- html
-
- *WML use-xml-fragment attribute
--->
-<!ATTLIST %html.qname;
- %att.usexmlfragment.qname; %Boolean.datatype; "true"
->
-
-
-
-<!-- end of WML 2.0 DTD ........................................... -->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod
deleted file mode 100644
index d2d7621..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod
+++ /dev/null
@@ -1,184 +0,0 @@
-<!-- WML 2.0 Document Model Module .................................... -->
-<!-- file: wml20-model-1.mod -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
- SYSTEM "http://www.wapforum.org/dtd/wml20-model-1.mod"
-
- This module describes the groupings of elements that make up
- common content models for WML and XHTML elements.
-
- Three basic content models are declared:
-
- %Inline.mix; character-level elements
- %Block.mix; block-like elements, eg., paragraphs and lists
- %Flow.mix; any block or inline elements
-
- Any parameter entities declared in this module may be used
- to create element content models, but the above three are
- considered 'global' (insofar as that term applies here).
-
-
--->
-<!--
- Optional Elements in head
--->
-<!ENTITY % HeadOpts.mix "( %meta.qname;
- | %link.qname;
- | %style.qname;
- | %object.qname;
- | %access.qname;)*">
-<!--
- Task elements
-
- Used for the WML do and onevent elements
--->
-<!ENTITY % Tasks.class "(%go.qname;
- | %prev.qname;
- | %noop.qname;
- | %refresh.qname;)">
-<!--
- Tasks without noop element
-
- Used for the WML anchor
--->
-<!ENTITY % Tasks-nonoop.class "%go.qname;
- | %prev.qname;
- | %refresh.qname;">
-<!--
- Do element
--->
-<!ENTITY % Do.class "%do.qname;">
-<!--
- Miscellaneous Elements
-
- This is not used for anything right now.
--->
-<!ENTITY % Misc.class "">
-<!--
- Inline Elements
--->
-<!ENTITY % InlStruct.class "%br.qname;
- | %span.qname;">
-<!ENTITY % InlPhras.class "| %em.qname;
- | %strong.qname;
- | %dfn.qname;
- | %code.qname;
- | %samp.qname;
- | %kbd.qname;
- | %var.qname;
- | %cite.qname;
- | %abbr.qname;
- | %acronym.qname;
- | %q.qname;">
-<!ENTITY % InlPres.class "| %i.qname;
- | %b.qname;
- | %big.qname;
- | %small.qname;
- | %u.qname;">
-<!ENTITY % I18n.class "">
-<!ENTITY % Anchor.class "| %a.qname;
- | %anchor.qname; | %do.qname;">
-<!ENTITY % InlSpecial.class "| %img.qname;
- | %object.qname;
- | %getvar.qname;">
-<!ENTITY % InlForm.class "| %input.qname;
- | %select.qname;
- | %textarea.qname;
- | %label.qname;">
-<!ENTITY % Inline.extra "">
-<!ENTITY % Inline.class "%InlStruct.class;
- %InlPhras.class;
- %InlPres.class;
- %Anchor.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;">
-<!ENTITY % InlNoAnchor.class "%InlStruct.class;
- %InlPhras.class;
- %InlPres.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;">
-<!ENTITY % InlNoAnchor.mix "%InlNoAnchor.class;
- %Misc.class;">
-<!ENTITY % Inline.mix "%Inline.class;
- %Misc.class;">
-<!--
- Block Elements
--->
-<!ENTITY % Heading.class "%h1.qname;
- | %h2.qname;
- | %h3.qname;
- | %h4.qname;
- | %h5.qname;
- | %h6.qname;">
-<!ENTITY % List.class "%ul.qname;
- | %ol.qname;
- | %dl.qname;">
-<!ENTITY % Table.class "| %table.qname;">
-<!ENTITY % Form.class "| %form.qname;">
-<!ENTITY % Fieldset.class "| %fieldset.qname;">
-<!ENTITY % BlkStruct.class "%p.qname;
- | %div.qname;">
-<!ENTITY % BlkPhras.class "| %pre.qname;
- | %blockquote.qname;
- | %address.qname;">
-<!ENTITY % BlkPres.class "| %hr.qname;">
-<!ENTITY % BlkSpecial.class "%Table.class;
- %Form.class;
- %Fieldset.class;">
-<!ENTITY % Block.extra "">
-<!ENTITY % Block.class "%BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %BlkSpecial.class;
- %Block.extra;">
-<!ENTITY % Block.mix "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Do.class;
- %Misc.class;">
-<!ENTITY % BlkNoForm.mix "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- | %table.qname;
- %Block.extra;
- %Misc.class;">
-<!--
- All Content Elements
--->
-<!--
- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %Form.class;
- %Block.extra;
- | %Inline.class;
- %Misc.class;">
-<!ENTITY % Flow.mix "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Inline.class;
- %Misc.class;">
-<!--
- Template level elements
--->
-<!ENTITY % Template.mix "( %onevent.qname;)*">
-<!--
- Content model of the WML card and XHTML body elements
--->
-<!ENTITY % CardBody.mix "(%onevent.qname;*, %timer.qname;?, ( %Block.mix; )+)">
-<!-- end of wml20-model-1.mod -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd
deleted file mode 100644
index 7d6f8d3..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd
+++ /dev/null
@@ -1,154 +0,0 @@
-<!-- WML 2.0 DTD ...................................................... -->
-<!-- file: wml20.dtd -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This is the WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
- "-//WAPFORUM//DTD WML 2.0//EN"
-
- For example, if you are using WML 2.0 directly, use
- the FPI in the DOCTYPE declaration, with the xmlns attribute
- on the document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD WML 2.0//EN"
- "http://www.wapforum.org/dtd/wml20.dtd" >
- <html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wml="http://www.wapforum.org/2001/wml">
- ...
- </html>
-
--->
-<!-- ============================================ -->
-<!--
- Version, XML Namespaces, and profile information
--->
-<!-- ============================================ -->
-<!--
- Value of XHTML version attribute
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!--
- Value of XHTML profile attribute
-
- Reserved for future use with document profiles
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
- Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
- "http://www.wapforum.org/DTD/wml-framework-1.mod">
-%wml-framework.mod;
-<!-- ============================================ -->
-<!--
- XHTML modules
--->
-<!-- ============================================ -->
-<!-- Text Module ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
- | %InlStruct.class; | %i.qname; | %b.qname;
- %InlPhras.class;
- %Anchor.class;
- %Inline.extra;
- | %getvar.qname;
- | %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!ENTITY % xhtml-text.mod PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod">
-%xhtml-text.mod;
-<!ENTITY % xhtml-hypertext.mod PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod">
-%xhtml-hypertext.mod;
-<!-- List Module ............................................... -->
-<!ENTITY % xhtml-list.mod PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod">
-%xhtml-list.mod;
-<!-- Extend lists with value and start attributes -->
-<!ATTLIST %li.qname;
- value %Number.datatype; #IMPLIED
->
-<!ATTLIST %ol.qname;
- start %Number.datatype; #IMPLIED
->
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.mod PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod">
-%xhtml-image.mod;
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.mod PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod">
-%xhtml-param.mod;
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.mod PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod">
-%xhtml-object.mod;
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod">
-%xhtml-table.mod;
-<!-- Forms Module ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
- %Common.attrib;
- label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
- %Common.attrib;
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
- | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-form.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod">
-%xhtml-basic-form.mod;
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.mod PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod">
-%xhtml-link.mod;
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.mod PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod">
-%xhtml-meta.mod;
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.mod PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod">
-%xhtml-base.mod;
-<!-- Stylesheets Module ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-%xhtml-style.mod;
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!ENTITY % xhtml-struct.mod PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod">
-%xhtml-struct.mod;
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-%xhtml-blkpres.mod;
-<!-- ============================================ -->
-<!--
- WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
- "http://www.wapforum.org/DTD/wml-special-1.mod">
-%wml-special.mod;
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
- "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-%wml-deprecated.mod;
-<!-- end of WML 2.0 DTD ........................................... -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd
deleted file mode 100644
index 060f7df..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
- "http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
- "http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
- xml:lang NMTOKEN #IMPLIED
- %coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd
deleted file mode 100644
index 7a3e73b..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd
+++ /dev/null
@@ -1,3216 +0,0 @@
-<!-- XHTML Mobile 1.0 DTD ...................................................... -->
-<!-- file: xhtml-mobile10.dtd -->
-<!--
- This is XHTML Mobile profile, a proper subset of XHTML.
-
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
-
--->
-<!-- This is the driver file for version 1.0 of the XHTML Mobile DTD.
-
- This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC: "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- SYSTEM: "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
- "http://www.w3.org/1999/xhtml"
-
- See the Qualified Names module for information
- on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- For example, if you are using XHTML Mobile 1.0 directly, use
- the FPI in the DOCTYPE declaration, with the xmlns attribute
- on the document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- "http://www.wapforum.org/DTD/xhtml-mobile10.dtd" >
- <html xmlns="http://www.w3.org/1999/xhtml"
- xml:lang="en" >
- ...
- </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile "" >
-
-<!-- Inline Style Module ........................................ -->
-<!ENTITY % xhtml-inlstyle.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Style
-
- This module declares the 'style' attribute, used to support inline
- style markup. This module must be instantiated prior to the XHTML
- Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
- "style CDATA #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
- "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-
-
-<!-- Document Model ........................................ -->
-<!ENTITY % xhtml-model.mod
- PUBLIC "-//WAPFORUM//ENTITIES XHTML Mobile 1.0 Document Model 1.0//EN"
- "http://www.wapforum.org/DTD/xhtml-mobile10-model-1.mod" >
-
-<!-- XHTML Framework ........................................ -->
-<!ENTITY % XHTML.bidi "IGNORE" >
-<!ENTITY % xhtml-framework.mod
- PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Modular Framework
-
- This required module instantiates the modules needed
- to support the XHTML modularization model, including:
-
- + notations
- + datatypes
- + namespace-qualified names
- + common attributes
- + document model
- + character entities
-
- The Intrinsic Events module is ignored by default but
- occurs in this module because it must be instantiated
- prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "IGNORE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
- "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
- PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
- "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Notations
-
- defines the following notations, many of these imported from
- other specifications and standards. When an existing FPI is
- known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
- PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
- PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
- PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
- PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
- PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
- PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
- PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
- PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
- PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
- PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
- PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
- PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
- PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
- "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Datatypes
-
- defines containers for the following datatypes, many of
- these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
- PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
- "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
- Revisions:
-#2000-10-22: added qname declarations for ruby elements
- ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
- This module is contained in two parts, labeled Section 'A' and 'B':
-
- Section A declares parameter entities to support namespace-
- qualified names, namespace declarations, and name prefixing
- for XHTML and extensions.
-
- Section B declares parameter entities used to provide
- namespace-qualified names for all XHTML element types:
-
- %applet.qname; the xmlns-qualified name for <applet>
- %base.qname; the xmlns-qualified name for <base>
- ...
-
- XHTML extensions would create a module similar to this one.
- Included in the XHTML distribution is a template module
- ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
- to activate namespace prefixing. The default value should
- inherit '%NS.prefixed;' from the DTD driver, so that unless
- overridden, the default behaviour follows the overall DTD
- prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
- the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
- the default namespace prefix string(s) to use when prefixing
- is enabled. This may be overridden in the DTD driver or the
- internal subset of an document instance. If no default prefix
- is desired, this may be declared as an empty string.
-
- NOTE: As specified in [XMLNAMES], the namespace prefix serves
- as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
- colonized prefix(es) (eg., '%XHTML.prefix;:') used when
- prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
- redeclared to contain any non-XHTML namespace declaration
- attributes for namespaces embedded in XHTML. The default
- is an empty string. XLink should be included here if used
- in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
- all XML Namespace declarations used in the DTD, plus the
- xmlns declaration for XHTML, its form dependent on whether
- prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
- "xmlns:%XHTML.prefix; %URI.datatype; #FIXED '%XHTML.xmlns;'
- %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
- "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
- XML namespace declaration attributes used by XHTML, including
- a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
- "%NS.decl.attrib;
- %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
- "xmlns %URI.datatype; #FIXED '%XHTML.xmlns;'
- %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
- namespace-qualified names for all XHTML element types.
--->
-
-<!-- module: xhtml-applet-1.mod -->
-<!ENTITY % applet.qname "%XHTML.pfx;applet" >
-
-<!-- module: xhtml-base-1.mod -->
-<!ENTITY % base.qname "%XHTML.pfx;base" >
-
-<!-- module: xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname "%XHTML.pfx;bdo" >
-
-<!-- module: xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname "%XHTML.pfx;h6" >
-
-<!-- module: xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname "%XHTML.pfx;hr" >
-
-<!-- module: xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname "%XHTML.pfx;div" >
-<!ENTITY % p.qname "%XHTML.pfx;p" >
-
-<!-- module: xhtml-edit-1.mod -->
-<!ENTITY % ins.qname "%XHTML.pfx;ins" >
-<!ENTITY % del.qname "%XHTML.pfx;del" >
-
-<!-- module: xhtml-form-1.mod -->
-<!ENTITY % form.qname "%XHTML.pfx;form" >
-<!ENTITY % label.qname "%XHTML.pfx;label" >
-<!ENTITY % input.qname "%XHTML.pfx;input" >
-<!ENTITY % select.qname "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname "%XHTML.pfx;legend" >
-<!ENTITY % button.qname "%XHTML.pfx;button" >
-
-<!-- module: xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname "%XHTML.pfx;a" >
-
-<!-- module: xhtml-image-1.mod -->
-<!ENTITY % img.qname "%XHTML.pfx;img" >
-
-<!-- module: xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname "%XHTML.pfx;cite" >
-<!ENTITY % code.qname "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname "%XHTML.pfx;q" >
-<!ENTITY % samp.qname "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname "%XHTML.pfx;strong" >
-<!ENTITY % var.qname "%XHTML.pfx;var" >
-
-<!-- module: xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname "%XHTML.pfx;b" >
-<!ENTITY % big.qname "%XHTML.pfx;big" >
-<!ENTITY % i.qname "%XHTML.pfx;i" >
-<!ENTITY % small.qname "%XHTML.pfx;small" >
-<!ENTITY % sub.qname "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname "%XHTML.pfx;tt" >
-
-<!-- module: xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname "%XHTML.pfx;br" >
-<!ENTITY % span.qname "%XHTML.pfx;span" >
-
-<!-- module: xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname "%XHTML.pfx;map" >
-<!ENTITY % area.qname "%XHTML.pfx;area" >
-
-<!-- module: xhtml-link-1.mod -->
-<!ENTITY % link.qname "%XHTML.pfx;link" >
-
-<!-- module: xhtml-list-1.mod -->
-<!ENTITY % dl.qname "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname "%XHTML.pfx;ul" >
-<!ENTITY % li.qname "%XHTML.pfx;li" >
-
-<!-- module: xhtml-meta-1.mod -->
-<!ENTITY % meta.qname "%XHTML.pfx;meta" >
-
-<!-- module: xhtml-param-1.mod -->
-<!ENTITY % param.qname "%XHTML.pfx;param" >
-
-<!-- module: xhtml-object-1.mod -->
-<!ENTITY % object.qname "%XHTML.pfx;object" >
-
-<!-- module: xhtml-script-1.mod -->
-<!ENTITY % script.qname "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname "%XHTML.pfx;noscript" >
-
-<!-- module: xhtml-struct-1.mod -->
-<!ENTITY % html.qname "%XHTML.pfx;html" >
-<!ENTITY % head.qname "%XHTML.pfx;head" >
-<!ENTITY % title.qname "%XHTML.pfx;title" >
-<!ENTITY % body.qname "%XHTML.pfx;body" >
-
-<!-- module: xhtml-style-1.mod -->
-<!ENTITY % style.qname "%XHTML.pfx;style" >
-
-<!-- module: xhtml-table-1.mod -->
-<!ENTITY % table.qname "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname "%XHTML.pfx;col" >
-<!ENTITY % tr.qname "%XHTML.pfx;tr" >
-<!ENTITY % th.qname "%XHTML.pfx;th" >
-<!ENTITY % td.qname "%XHTML.pfx;td" >
-
-<!-- module: xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names ...................... -->
-
-<!-- module: xhtml-image-2.mod -->
-<!ENTITY % alt.qname "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
- PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
- "xhtml-events-1.mod" >
-%xhtml-events.mod;]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
- PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
- "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Common Attributes
-
- This module declares many of the common attributes for the XHTML DTD.
- %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
- "id ID #IMPLIED"
->
-
-<!ENTITY % class.attrib
- "class NMTOKENS #IMPLIED"
->
-
-<!ENTITY % title.attrib
- "title %Text.datatype; #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
- "%XHTML.xmlns.attrib;
- %id.attrib;
- %class.attrib;
- %title.attrib;
- %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
- "xml:lang %LanguageCode.datatype; #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
- "dir ( ltr | rtl ) #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
- "%dir.attrib;
- %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
- "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
- "%Core.attrib;
- %I18n.attrib;
- %Events.attrib;
- %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML Mobile 1.0 Document Model Module .................................... -->
-<!-- file: xhtml-mobile10-model-1.mod
-
- This is XHTML Mobile, a proper subset of XHTML.
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
-
--->
-<!-- XHTML Mobile Document Model
-
- This module describes the groupings of elements that make up
- common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head .............. -->
-
-<!ENTITY % HeadOpts.mix
- "( %meta.qname; | %link.qname; | %object.qname; | %style.qname; )*" >
-
-<!-- Miscellaneous Elements ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
- "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
- | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
- | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
- "| %i.qname; | %b.qname; | %big.qname; | %small.qname; " >
-
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
- "| %input.qname; | %select.qname; | %textarea.qname;
- | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
- "%InlStruct.class;
- %InlPhras.class;
- %Anchor.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
- "%InlStruct.class;
- %InlPhras.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
- "%InlNoAnchor.class;
- %Misc.class;"
->
-
-<!ENTITY % Inline.mix
- "%Inline.class;
- %Misc.class;"
->
-
-<!-- Block Elements ......................... -->
-
-<!ENTITY % Heading.class
- "%h1.qname; | %h2.qname; | %h3.qname;
- | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class "| %form.qname;" >
-
-<!ENTITY % Fieldset.class "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
- "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
- "%Table.class;
- %Form.class;
- %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
- "%BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %BlkSpecial.class;
- %Block.extra;"
->
-
-<!ENTITY % BlkNoForm.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %Table.class;
- %Block.extra;
- %Misc.class;"
->
-
-<!ENTITY % Block.mix
- "%Heading.class;
- | %List.class;
- | %Block.class;
- %Misc.class;"
->
-
-<!-- All Content Elements ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %Form.class;
- %Block.extra;
- | %Inline.class;
- %Misc.class;"
->
-
-
-<!ENTITY % Flow.mix
- "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Inline.class;
- %Misc.class;"
->
-
-<!-- end of xhtml-mobile10-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
- PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
- "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
- This module declares the set of character entities for XHTML,
- including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Latin 1 Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-lat1.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-lat1
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent" >
- %xhtml-lat1;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent"
-
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
--->
-
-<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-<!ENTITY iexcl "¡" ><!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent "¢" ><!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound "£" ><!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "¤" ><!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen "¥" ><!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "¦" ><!-- broken bar = broken vertical bar, U+00A6 ISOnum -->
-<!ENTITY sect "§" ><!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml "¨" ><!-- diaeresis = spacing diaeresis, U+00A8 ISOdia -->
-<!ENTITY copy "©" ><!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf "ª" ><!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo "«" ><!-- left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not "¬" ><!-- not sign, U+00AC ISOnum -->
-<!ENTITY shy "­" ><!-- soft hyphen = discretionary hyphen, U+00AD ISOnum -->
-<!ENTITY reg "®" ><!-- registered sign = registered trade mark sign, U+00AE ISOnum -->
-<!ENTITY macr "¯" ><!-- macron = spacing macron = overline = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg "°" ><!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "±" ><!-- plus-minus sign = plus-or-minus sign, U+00B1 ISOnum -->
-<!ENTITY sup2 "²" ><!-- superscript two = superscript digit two = squared, U+00B2 ISOnum -->
-<!ENTITY sup3 "³" ><!-- superscript three = superscript digit three = cubed, U+00B3 ISOnum -->
-<!ENTITY acute "´" ><!-- acute accent = spacing acute, U+00B4 ISOdia -->
-<!ENTITY micro "µ" ><!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para "¶" ><!-- pilcrow sign = paragraph sign, U+00B6 ISOnum -->
-<!ENTITY middot "·" ><!-- middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil "¸" ><!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1 "¹" ><!-- superscript one = superscript digit one, U+00B9 ISOnum -->
-<!ENTITY ordm "º" ><!-- masculine ordinal indicator, U+00BA ISOnum -->
-<!ENTITY raquo "»" ><!-- right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "¼" ><!-- vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "½" ><!-- vulgar fraction one half = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "¾" ><!-- vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "¿" ><!-- inverted question mark = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "À" ><!-- latin capital A with grave = latin capital A grave, U+00C0 ISOlat1 -->
-<!ENTITY Aacute "Á" ><!-- latin capital A with acute, U+00C1 ISOlat1 -->
-<!ENTITY Acirc "Â" ><!-- latin capital A with circumflex, U+00C2 ISOlat1 -->
-<!ENTITY Atilde "Ã" ><!-- latin capital A with tilde, U+00C3 ISOlat1 -->
-<!ENTITY Auml "Ä" ><!-- latin capital A with diaeresis, U+00C4 ISOlat1 -->
-<!ENTITY Aring "Å" ><!-- latin capital A with ring above = latin capital A ring, U+00C5 ISOlat1 -->
-<!ENTITY AElig "Æ" ><!-- latin capital AE = latin capital ligature AE, U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "Ç" ><!-- latin capital C with cedilla, U+00C7 ISOlat1 -->
-<!ENTITY Egrave "È" ><!-- latin capital E with grave, U+00C8 ISOlat1 -->
-<!ENTITY Eacute "É" ><!-- latin capital E with acute, U+00C9 ISOlat1 -->
-<!ENTITY Ecirc "Ê" ><!-- latin capital E with circumflex, U+00CA ISOlat1 -->
-<!ENTITY Euml "Ë" ><!-- latin capital E with diaeresis, U+00CB ISOlat1 -->
-<!ENTITY Igrave "Ì" ><!-- latin capital I with grave, U+00CC ISOlat1 -->
-<!ENTITY Iacute "Í" ><!-- latin capital I with acute, U+00CD ISOlat1 -->
-<!ENTITY Icirc "Î" ><!-- latin capital I with circumflex, U+00CE ISOlat1 -->
-<!ENTITY Iuml "Ï" ><!-- latin capital I with diaeresis, U+00CF ISOlat1 -->
-<!ENTITY ETH "Ð" ><!-- latin capital ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "Ñ" ><!-- latin capital N with tilde, U+00D1 ISOlat1 -->
-<!ENTITY Ograve "Ò" ><!-- latin capital O with grave, U+00D2 ISOlat1 -->
-<!ENTITY Oacute "Ó" ><!-- latin capital O with acute, U+00D3 ISOlat1 -->
-<!ENTITY Ocirc "Ô" ><!-- latin capital O with circumflex, U+00D4 ISOlat1 -->
-<!ENTITY Otilde "Õ" ><!-- latin capital O with tilde, U+00D5 ISOlat1 -->
-<!ENTITY Ouml "Ö" ><!-- latin capital O with diaeresis, U+00D6 ISOlat1 -->
-<!ENTITY times "×" ><!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "Ø" ><!-- latin capital O with stroke = latin capital O slash, U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "Ù" ><!-- latin capital U with grave, U+00D9 ISOlat1 -->
-<!ENTITY Uacute "Ú" ><!-- latin capital U with acute, U+00DA ISOlat1 -->
-<!ENTITY Ucirc "Û" ><!-- latin capital U with circumflex, U+00DB ISOlat1 -->
-<!ENTITY Uuml "Ü" ><!-- latin capital U with diaeresis, U+00DC ISOlat1 -->
-<!ENTITY Yacute "Ý" ><!-- latin capital Y with acute, U+00DD ISOlat1 -->
-<!ENTITY THORN "Þ" ><!-- latin capital THORN, U+00DE ISOlat1 -->
-<!ENTITY szlig "ß" ><!-- latin small sharp s = ess-zed, U+00DF ISOlat1 -->
-<!ENTITY agrave "à" ><!-- latin small a with grave = latin small a grave, U+00E0 ISOlat1 -->
-<!ENTITY aacute "á" ><!-- latin small a with acute, U+00E1 ISOlat1 -->
-<!ENTITY acirc "â" ><!-- latin small a with circumflex, U+00E2 ISOlat1 -->
-<!ENTITY atilde "ã" ><!-- latin small a with tilde, U+00E3 ISOlat1 -->
-<!ENTITY auml "ä" ><!-- latin small a with diaeresis, U+00E4 ISOlat1 -->
-<!ENTITY aring "å" ><!-- latin small a with ring above = latin small a ring, U+00E5 ISOlat1 -->
-<!ENTITY aelig "æ" ><!-- latin small ae = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "ç" ><!-- latin small c with cedilla, U+00E7 ISOlat1 -->
-<!ENTITY egrave "è" ><!-- latin small e with grave, U+00E8 ISOlat1 -->
-<!ENTITY eacute "é" ><!-- latin small e with acute, U+00E9 ISOlat1 -->
-<!ENTITY ecirc "ê" ><!-- latin small e with circumflex, U+00EA ISOlat1 -->
-<!ENTITY euml "ë" ><!-- latin small e with diaeresis, U+00EB ISOlat1 -->
-<!ENTITY igrave "ì" ><!-- latin small i with grave, U+00EC ISOlat1 -->
-<!ENTITY iacute "í" ><!-- latin small i with acute, U+00ED ISOlat1 -->
-<!ENTITY icirc "î" ><!-- latin small i with circumflex, U+00EE ISOlat1 -->
-<!ENTITY iuml "ï" ><!-- latin small i with diaeresis, U+00EF ISOlat1 -->
-<!ENTITY eth "ð" ><!-- latin small eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "ñ" ><!-- latin small n with tilde, U+00F1 ISOlat1 -->
-<!ENTITY ograve "ò" ><!-- latin small o with grave, U+00F2 ISOlat1 -->
-<!ENTITY oacute "ó" ><!-- latin small o with acute, U+00F3 ISOlat1 -->
-<!ENTITY ocirc "ô" ><!-- latin small o with circumflex, U+00F4 ISOlat1 -->
-<!ENTITY otilde "õ" ><!-- latin small o with tilde, U+00F5 ISOlat1 -->
-<!ENTITY ouml "ö" ><!-- latin small o with diaeresis, U+00F6 ISOlat1 -->
-<!ENTITY divide "÷" ><!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "ø" ><!-- latin small o with stroke, = latin small o slash, U+00F8 ISOlat1 -->
-<!ENTITY ugrave "ù" ><!-- latin small u with grave, U+00F9 ISOlat1 -->
-<!ENTITY uacute "ú" ><!-- latin small u with acute, U+00FA ISOlat1 -->
-<!ENTITY ucirc "û" ><!-- latin small u with circumflex, U+00FB ISOlat1 -->
-<!ENTITY uuml "ü" ><!-- latin small u with diaeresis, U+00FC ISOlat1 -->
-<!ENTITY yacute "ý" ><!-- latin small y with acute, U+00FD ISOlat1 -->
-<!ENTITY thorn "þ" ><!-- latin small thorn with, U+00FE ISOlat1 -->
-<!ENTITY yuml "ÿ" ><!-- latin small y with diaeresis, U+00FF ISOlat1 -->
-<!-- end of xhtml-lat1.ent -->
-
-
-<!ENTITY % xhtml-symbol
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent" >
-<!-- ...................................................................... -->
-<!-- ISO Math, Greek and Symbolic Character Entity Set for XHTML .......... -->
-<!-- file: xhtml-symbol.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-symbol
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent" >
- %xhtml-symbol;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent"
-
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 [SGML] list) do not clash with
- any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
- numbers are given for each character, in hex. Entity values are
- decimal conversions of the ISO 10646 values and refer to the
- document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof "ƒ" ><!-- latin small f with hook = function
- = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha "Α" ><!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta "Β" ><!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma "Γ" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
-<!ENTITY Delta "Δ" ><!-- greek capital letter delta, U+0394 ISOgrk3 -->
-<!ENTITY Epsilon "Ε" ><!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta "Ζ" ><!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta "Η" ><!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta "Θ" ><!-- greek capital letter theta, U+0398 ISOgrk3 -->
-<!ENTITY Iota "Ι" ><!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa "Κ" ><!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda "Λ" ><!-- greek capital letter lambda, U+039B ISOgrk3 -->
-<!ENTITY Mu "Μ" ><!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu "Ν" ><!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi "Ξ" ><!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron "Ο" ><!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi "Π" ><!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho "Ρ" ><!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma "Σ" ><!-- greek capital letter sigma, U+03A3 ISOgrk3 -->
-<!ENTITY Tau "Τ" ><!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon "Υ" ><!-- greek capital letter upsilon,
- U+03A5 ISOgrk3 -->
-<!ENTITY Phi "Φ" ><!-- greek capital letter phi, U+03A6 ISOgrk3 -->
-<!ENTITY Chi "Χ" ><!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi "Ψ" ><!-- greek capital letter psi, U+03A8 ISOgrk3 -->
-<!ENTITY Omega "Ω" ><!-- greek capital letter omega, U+03A9 ISOgrk3 -->
-<!ENTITY alpha "α" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
-<!ENTITY beta "β" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma "γ" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
-<!ENTITY delta "δ" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
-<!ENTITY epsilon "ε" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
-<!ENTITY zeta "ζ" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta "η" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta "θ" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
-<!ENTITY iota "ι" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa "κ" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
-<!ENTITY lambda "λ" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
-<!ENTITY mu "μ" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu "ν" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi "ξ" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron "ο" ><!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi "π" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho "ρ" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf "ς" ><!-- greek small letter final sigma, U+03C2 ISOgrk3 -->
-<!ENTITY sigma "σ" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
-<!ENTITY tau "τ" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon "υ" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
-<!ENTITY phi "φ" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi "χ" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi "ψ" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega "ω" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "ϑ" ><!-- greek small letter theta symbol, U+03D1 NEW -->
-<!ENTITY upsih "ϒ" ><!-- greek upsilon with hook symbol, U+03D2 NEW -->
-<!ENTITY piv "ϖ" ><!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull "•" ><!-- bullet = black small circle, U+2022 ISOpub -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip "…" ><!-- horizontal ellipsis = three dot leader, U+2026 ISOpub -->
-<!ENTITY prime "′" ><!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime "″" ><!-- double prime = seconds = inches, U+2033 ISOtech -->
-<!ENTITY oline "‾" ><!-- overline = spacing overscore, U+203E NEW -->
-<!ENTITY frasl "⁄" ><!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp "℘" ><!-- script capital P = power set = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image "ℑ" ><!-- blackletter capital I = imaginary part, U+2111 ISOamso -->
-<!ENTITY real "ℜ" ><!-- blackletter capital R = real part symbol, U+211C ISOamso -->
-<!ENTITY trade "™" ><!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym "ℵ" ><!-- alef symbol = first transfinite cardinal, U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef, U+05D0 although
- the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr "←" ><!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr "↑" ><!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr "→" ><!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr "↓" ><!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr "↔" ><!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr "↵" ><!-- downwards arrow with corner leftwards
- = carriage return, U+21B5 NEW -->
-<!ENTITY lArr "⇐" ><!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
- but also does not have any other character for that function. So ? lArr can
- be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr "⇑" ><!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr "⇒" ><!-- rightwards double arrow, U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have
- another character with this function so ?
- rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr "⇓" ><!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr "⇔" ><!-- left right double arrow, U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall "∀" ><!-- for all, U+2200 ISOtech -->
-<!ENTITY part "∂" ><!-- partial differential, U+2202 ISOtech -->
-<!ENTITY exist "∃" ><!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty "∅" ><!-- empty set = null set = diameter, U+2205 ISOamso -->
-<!ENTITY nabla "∇" ><!-- nabla = backward difference, U+2207 ISOtech -->
-<!ENTITY isin "∈" ><!-- element of, U+2208 ISOtech -->
-<!ENTITY notin "∉" ><!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni "∋" ><!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod "∏" ><!-- n-ary product = product sign, U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
- the same glyph might be used for both -->
-<!ENTITY sum "∑" ><!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
- though the same glyph might be used for both -->
-<!ENTITY minus "−" ><!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast "∗" ><!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic "√" ><!-- square root = radical sign, U+221A ISOtech -->
-<!ENTITY prop "∝" ><!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin "∞" ><!-- infinity, U+221E ISOtech -->
-<!ENTITY ang "∠" ><!-- angle, U+2220 ISOamso -->
-<!ENTITY and "∧" ><!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or "∨" ><!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap "∩" ><!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup "∪" ><!-- union = cup, U+222A ISOtech -->
-<!ENTITY int "∫" ><!-- integral, U+222B ISOtech -->
-<!ENTITY there4 "∴" ><!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim "∼" ><!-- tilde operator = varies with = similar to, U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
- although the same glyph might be used to represent both -->
-<!ENTITY cong "≅" ><!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp "≈" ><!-- almost equal to = asymptotic to, U+2248 ISOamsr -->
-<!ENTITY ne "≠" ><!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv "≡" ><!-- identical to, U+2261 ISOtech -->
-<!ENTITY le "≤" ><!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge "≥" ><!-- greater-than or equal to, U+2265 ISOtech -->
-<!ENTITY sub "⊂" ><!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup "⊃" ><!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
- font encoding and is not included. Should it be, for symmetry?
- It is in ISOamsn -->
-<!ENTITY nsub "⊄" ><!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube "⊆" ><!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe "⊇" ><!-- superset of or equal to, U+2287 ISOtech -->
-<!ENTITY oplus "⊕" ><!-- circled plus = direct sum, U+2295 ISOamsb -->
-<!ENTITY otimes "⊗" ><!-- circled times = vector product, U+2297 ISOamsb -->
-<!ENTITY perp "⊥" ><!-- up tack = orthogonal to = perpendicular, U+22A5 ISOtech -->
-<!ENTITY sdot "⋅" ><!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil "⌈" ><!-- left ceiling = apl upstile, U+2308 ISOamsc -->
-<!ENTITY rceil "⌉" ><!-- right ceiling, U+2309 ISOamsc -->
-<!ENTITY lfloor "⌊" ><!-- left floor = apl downstile, U+230A ISOamsc -->
-<!ENTITY rfloor "⌋" ><!-- right floor, U+230B ISOamsc -->
-<!ENTITY lang "〈" ><!-- left-pointing angle bracket = bra, U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than'
- or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang "〉" ><!-- right-pointing angle bracket = ket, U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than'
- or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz "◊" ><!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades "♠" ><!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs "♣" ><!-- black club suit = shamrock, U+2663 ISOpub -->
-<!ENTITY hearts "♥" ><!-- black heart suit = valentine, U+2665 ISOpub -->
-<!ENTITY diams "♦" ><!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- end of xhtml-symbol.ent -->
-
-
-<!ENTITY % xhtml-special
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Special Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-special.ent
-
- Typical invocation:
-
- <!ENTITY % xhtml-special
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent" >
- %xhtml-special;
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent"
-
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with conforming
- SGML systems and applications as defined in ISO 8879, provided
- this notice is included in all copies.
-
- Revisions:
-2000-10-28: added ' and altered XML Predefined Entities for compatibility
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 [SGML] list) do not clash with
- any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
- numbers are given for each character, in hex. Entity values are
- decimal conversions of the ISO 10646 values and refer to the
- document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY lt "&<" ><!-- less-than sign, U+003C ISOnum -->
-<!ENTITY gt ">" ><!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY amp "&&" ><!-- ampersand, U+0026 ISOnum -->
-<!ENTITY apos "'" ><!-- apostrophe, U+0027 ISOnum -->
-<!ENTITY quot """ ><!-- quotation mark = APL quote, U+0022 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig "Œ" ><!-- latin capital ligature OE, U+0152 ISOlat2 -->
-<!ENTITY oelig "œ" ><!-- latin small ligature oe, U+0153 ISOlat2 -->
-
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron "Š" ><!-- latin capital letter S with caron, U+0160 ISOlat2 -->
-<!ENTITY scaron "š" ><!-- latin small letter s with caron, U+0161 ISOlat2 -->
-<!ENTITY Yuml "Ÿ" ><!-- latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ "ˆ" ><!-- modifier letter circumflex accent, U+02C6 ISOpub -->
-<!ENTITY tilde "˜" ><!-- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp " " ><!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp " " ><!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp " " ><!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj "‌" ><!-- zero width non-joiner, U+200C NEW RFC 2070 -->
-<!ENTITY zwj "‍" ><!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm "‎" ><!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm "‏" ><!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash "–" ><!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash "—" ><!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo "‘" ><!-- left single quotation mark, U+2018 ISOnum -->
-<!ENTITY rsquo "’" ><!-- right single quotation mark, U+2019 ISOnum -->
-<!ENTITY sbquo "‚" ><!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo "“" ><!-- left double quotation mark, U+201C ISOnum -->
-<!ENTITY rdquo "”" ><!-- right double quotation mark, U+201D ISOnum -->
-<!ENTITY bdquo "„" ><!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger "†" ><!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger "‡" ><!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil "‰" ><!-- per mille sign, U+2030 ISOtech -->
-
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY lsaquo "‹" ><!-- single left-pointing angle quotation mark, U+2039 ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo "›" ><!-- single right-pointing angle quotation mark, U+203A ISO proposed -->
-<!ENTITY euro "€" ><!-- euro sign, U+20AC NEW -->
-
-<!-- end of xhtml-special.ent -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-
-
-<!-- XHTML Core Modules ........................................ -->
-<!ENTITY % pre.content
- "( #PCDATA
- | %InlStruct.class;
- %InlPhras.class;
- %Anchor.class;
- %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module ................................................... -->
-<!-- file: xhtml-text-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Textual Content
-
- The Text module includes declarations for all core
- text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
- "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Structural
-
- br, span
-
- This module declares the elements and their attributes
- used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content "EMPTY" >
-<!ENTITY % br.qname "br" >
-<!ELEMENT %br.qname; %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
- %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname "span" >
-<!ELEMENT %span.qname; %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
- %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
- "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Phrasal
-
- abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
- This module declares the elements and their attributes used to
- support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname "abbr" >
-<!ELEMENT %abbr.qname; %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
- %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname "acronym" >
-<!ELEMENT %acronym.qname; %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
- %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname "cite" >
-<!ELEMENT %cite.qname; %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
- %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname "code" >
-<!ELEMENT %code.qname; %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
- %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname "dfn" >
-<!ELEMENT %dfn.qname; %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
- %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname "em" >
-<!ELEMENT %em.qname; %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
- %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname "kbd" >
-<!ELEMENT %kbd.qname; %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
- %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname "q" >
-<!ELEMENT %q.qname; %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
- %Common.attrib;
- cite %URI.datatype; #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname "samp" >
-<!ELEMENT %samp.qname; %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
- %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname "strong" >
-<!ELEMENT %strong.qname; %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
- %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname "var" >
-<!ELEMENT %var.qname; %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
- %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
- "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Structural
-
- div, p
-
- This module declares the elements and their attributes used to
- support block-level structural markup.
--->
-
-<!ENTITY % div.element "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname "div" >
-<!ELEMENT %div.qname; %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
- %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
- "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname "p" >
-<!ELEMENT %p.qname; %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
- %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
- "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Phrasal
-
- address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
- This module declares the elements and their attributes used to
- support block-level phrasal markup.
--->
-
-<!ENTITY % address.element "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
- "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname "address" >
-<!ELEMENT %address.qname; %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
- %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
- "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname "blockquote" >
-<!ELEMENT %blockquote.qname; %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
- %Common.attrib;
- cite %URI.datatype; #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
- "( #PCDATA
- | %InlStruct.class;
- %InlPhras.class;
- | %tt.qname; | %i.qname; | %b.qname;
- %I18n.class;
- %Anchor.class;
- | %script.qname; | %map.qname;
- %Inline.extra; )*"
->
-<!ENTITY % pre.qname "pre" >
-<!ELEMENT %pre.qname; %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
- %Common.attrib;
- xml:space ( preserve ) #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ................... Heading Elements ................... -->
-
-<!ENTITY % Heading.content "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname "h1" >
-<!ELEMENT %h1.qname; %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
- %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname "h2" >
-<!ELEMENT %h2.qname; %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
- %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname "h3" >
-<!ELEMENT %h3.qname; %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
- %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname "h4" >
-<!ELEMENT %h4.qname; %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
- %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname "h5" >
-<!ELEMENT %h5.qname; %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
- %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname "h6" >
-<!ELEMENT %h6.qname; %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
- %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-
-<!ENTITY % xhtml-hypertext.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Hypertext
-
- a
-
- This module declares the anchor ('a') element type, which
- defines the source of a hypertext link. The destination
- (or link 'target') is identified via its 'id' attribute
- rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............ Anchor Element ............ -->
-
-<!ENTITY % a.element "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
- "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname "a" >
-<!ELEMENT %a.qname; %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
- %Common.attrib;
- href %URI.datatype; #IMPLIED
- charset %Charset.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- hreflang %LanguageCode.datatype; #IMPLIED
- rel %LinkTypes.datatype; #IMPLIED
- rev %LinkTypes.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-
-<!ENTITY % xhtml-list.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module .................................................. -->
-<!-- file: xhtml-list-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Lists
-
- dl, dt, dd, ol, ul, li
-
- This module declares the list-oriented element types
- and their attributes.
--->
-
-<!ENTITY % dl.qname "dl" >
-<!ENTITY % dt.qname "dt" >
-<!ENTITY % dd.qname "dd" >
-<!ENTITY % ol.qname "ol" >
-<!ENTITY % ul.qname "ul" >
-<!ENTITY % li.qname "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname; %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
- %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname; %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
- %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname; %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
- %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content "( %li.qname; )+" >
-<!ELEMENT %ol.qname; %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
- %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content "( %li.qname; )+" >
-<!ELEMENT %ul.qname; %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
- %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
- "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname; %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
- %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-<!-- Extend lists with value and start attributes -->
-<!ATTLIST %li.qname;
- value %Number.datatype; #IMPLIED
->
-<!ATTLIST %ol.qname;
- start %Number.datatype; #IMPLIED
->
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module ................................................. -->
-<!-- file: xhtml-image-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Rovision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Images
-
- img
-
- This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
- image content understandable and navigable to users of
- non-visual UAs, you need to provide a description with
- the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content "EMPTY" >
-<!ENTITY % img.qname "img" >
-<!ELEMENT %img.qname; %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
- %Common.attrib;
- src %URI.datatype; #REQUIRED
- alt %Text.datatype; #REQUIRED
- longdesc %URI.datatype; #IMPLIED
- height %Length.datatype; #IMPLIED
- width %Length.datatype; #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
- This is XHTML Basic, a proper subset of XHTML.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Basic Tables
-
- table, caption, tr, th, td
-
- This table module declares elements and attributes defining
- a table model based fundamentally on features found in the
- widely-deployed HTML 3.2 table model. While this module
- mimics the content model and table attributes of HTML 3.2
- tables, the element types declared herein also includes all
- HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname "table" >
-<!ENTITY % caption.qname "caption" >
-<!ENTITY % tr.qname "tr" >
-<!ENTITY % th.qname "th" >
-<!ENTITY % td.qname "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
- "align ( left
- | center
- | right ) #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
- "valign ( top
- | middle
- | bottom ) #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
- "scope ( row | col ) #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
- "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname; %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
- %Common.attrib;
- summary %Text.datatype; #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname; %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
- %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname; %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
- %Common.attrib;
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
- but for cells acting as both use td
--->
-
-<!ENTITY % th.element "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
- "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname; %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
- %Common.attrib;
- abbr %Text.datatype; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- %scope.attrib;
- rowspan %Number.datatype; '1'
- colspan %Number.datatype; '1'
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
- "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname; %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
- %Common.attrib;
- abbr %Text.datatype; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- %scope.attrib;
- rowspan %Number.datatype; '1'
- colspan %Number.datatype; '1'
- %CellHAlign.attrib;
- %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-
-
-<!-- Forms Module ...............................................
- XHTML basic forms module extended with optgroup and fieldset
--->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
- %Common.attrib;
- label %Text.datatype; #REQUIRED
->
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
- %Common.attrib;
->
-<!ENTITY % form.content "( %BlkNoForm.mix; | %fieldset.qname; )+">
-<!ENTITY % xhtml-form.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
- This is XHTML Basic, a proper subset of XHTML.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Basic Forms
-
- This forms module is based on the HTML 3.2 forms model, with
- the WAI-requested addition of the label element. While this
- module essentially mimics the content model and attributes of
- HTML 3.2 forms, the element types declared herein also include
- all HTML 4 common attributes.
-
- form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname "form" >
-<!ENTITY % label.qname "label" >
-<!ENTITY % input.qname "input" >
-<!ENTITY % select.qname "select" >
-<!ENTITY % option.qname "option" >
-<!ENTITY % textarea.qname "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
- plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- | %table.qname;
- %Block.extra;
- %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
- "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname; %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
- %Common.attrib;
- action %URI.datatype; #REQUIRED
- method ( get | post ) 'get'
- enctype %ContentType.datatype; 'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
- "( #PCDATA
- | %input.qname; | %select.qname; | %textarea.qname;
- | %InlStruct.class;
- %InlPhras.class;
- %I18n.class;
- %InlPres.class;
- %InlSpecial.class;
- %Misc.class; )*"
->
-<!ELEMENT %label.qname; %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
- %Common.attrib;
- for IDREF #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content "EMPTY" >
-<!ELEMENT %input.qname; %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
- "( text | password | checkbox | radio
- | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
- %Common.attrib;
- type %InputType.class; 'text'
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- checked ( checked ) #IMPLIED
- size CDATA #IMPLIED
- maxlength %Number.datatype; #IMPLIED
- src %URI.datatype; #IMPLIED
- tabindex %Number.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content "( %option.qname; )+" >
-<!ELEMENT %select.qname; %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
- %Common.attrib;
- name CDATA #IMPLIED
- size %Number.datatype; #IMPLIED
- multiple ( multiple ) #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content "( #PCDATA )" >
-<!ELEMENT %option.qname; %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
- %Common.attrib;
- selected ( selected ) #IMPLIED
- value CDATA #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content "( #PCDATA )" >
-<!ELEMENT %textarea.qname; %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
- %Common.attrib;
- name CDATA #IMPLIED
- rows %Number.datatype; #REQUIRED
- cols %Number.datatype; #REQUIRED
- tabindex %Number.datatype; #IMPLIED
- accesskey %Character.datatype; #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-
-
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module ........................................... -->
-<!-- file: xhtml-link-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Link element
-
- link
-
- This module declares the link element type and its attributes,
- which could (in principle) be used to define document-level links
- to external resources such as:
-
- a) for document specific toolbars/menus, e.g. start, contents,
- previous, next, index, end, help
- b) to link to a separate style sheet (rel="stylesheet")
- c) to make a link to a script (rel="script")
- d) by style sheets to control how collections of html nodes are
- rendered into printed documents
- e) to make a link to a printable version of this document
- e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content "EMPTY" >
-<!ENTITY % link.qname "link" >
-<!ELEMENT %link.qname; %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
- %Common.attrib;
- charset %Charset.datatype; #IMPLIED
- href %URI.datatype; #IMPLIED
- hreflang %LanguageCode.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- rel %LinkTypes.datatype; #IMPLIED
- rev %LinkTypes.datatype; #IMPLIED
- media %MediaDesc.datatype; #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-
-
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module ............................... -->
-<!-- file: xhtml-meta-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Meta Information
-
- meta
-
- This module declares the meta element type and its attributes,
- used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content "EMPTY" >
-<!ENTITY % meta.qname "meta" >
-<!ELEMENT %meta.qname; %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
- http-equiv NMTOKEN #IMPLIED
- name NMTOKEN #IMPLIED
- content CDATA #REQUIRED
- scheme CDATA #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-
-
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module ........................................... -->
-<!-- file: xhtml-base-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Base element
-
- base
-
- This module declares the base element type and its attributes,
- used to define a base URI against which relative URIs in the
- document will be resolved.
-
- Note that this module also redeclares the content model for
- the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content "EMPTY" >
-<!ENTITY % base.qname "base" >
-<!ELEMENT %base.qname; %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
- %XHTML.xmlns.attrib;
- href %URI.datatype; #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
- "( %HeadOpts.mix;,
- ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
- | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-
-
-<!-- Stylesheets Module ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module ................................... -->
-<!-- file: xhtml-style-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Style Sheets
-
- style
-
- This module declares the style element type and its attributes,
- used to embed style sheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information .................... -->
-
-<!ENTITY % style.element "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content "( #PCDATA )" >
-<!ENTITY % style.qname "style" >
-<!ELEMENT %style.qname; %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
- %XHTML.xmlns.attrib;
- %title.attrib;
- %I18n.attrib;
- type %ContentType.datatype; #REQUIRED
- media %MediaDesc.datatype; #IMPLIED
- xml:space ( preserve ) #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-
-
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module ..................................... -->
-<!-- file: xhtml-param-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
- param
-
- This module provides declarations for the param element,
- used to provide named property values for the applet
- and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content "EMPTY" >
-<!ENTITY % param.qname "param" >
-<!ELEMENT %param.qname; %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
- %XHTML.xmlns.attrib;
- %id.attrib;
- name CDATA #REQUIRED
- value CDATA #IMPLIED
- valuetype ( data | ref | object ) 'data'
- type %ContentType.datatype; #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-
-
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module ........................................ -->
-<!-- file: xhtml-object-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Embedded Objects
-
- object
-
- This module declares the object element type and its attributes, used
- to embed external objects as part of XHTML pages. In the document,
- place param elements prior to other content within the object element.
-
- Note that use of this module requires instantiation of the Param
- Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
- "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname "object" >
-<!ELEMENT %object.qname; %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
- %Common.attrib;
- declare ( declare ) #IMPLIED
- classid %URI.datatype; #IMPLIED
- codebase %URI.datatype; #IMPLIED
- data %URI.datatype; #IMPLIED
- type %ContentType.datatype; #IMPLIED
- codetype %ContentType.datatype; #IMPLIED
- archive %URIs.datatype; #IMPLIED
- standby %Text.datatype; #IMPLIED
- height %Length.datatype; #IMPLIED
- width %Length.datatype; #IMPLIED
- name CDATA #IMPLIED
- tabindex %Number.datatype; #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-
-
-<!-- Document Structure Module ..................................... -->
-<!ENTITY % xhtml-struct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Document Structure
-
- title, head, body, html
-
- The Structure Module defines the major structural elements and
- their attributes.
-
- Note that the content model of the head element type is redeclared
- when the Base Module is included in the DTD.
-
- The parameter entity containing the XML namespace URI value used
- for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content "( #PCDATA )" >
-<!ENTITY % title.qname "title" >
-<!ELEMENT %title.qname; %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
- "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname "head" >
-<!ELEMENT %head.qname; %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
- "profile %URI.datatype; '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
- %XHTML.xmlns.attrib;
- %I18n.attrib;
- %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
- "( %Block.mix; )+"
->
-<!ENTITY % body.qname "body" >
-<!ELEMENT %body.qname; %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
- %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname "html" >
-<!ELEMENT %html.qname; %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
- "version %FPI.datatype; #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
- on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
- %XHTML.xmlns.attrib;
- %XHTML.version.attrib;
- %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Block Presentational Elements
-
- hr
-
- This module declares the elements and their attributes used to
- support block-level presentational markup.
--->
-
-<!ENTITY % hr.element "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content "EMPTY" >
-<!ENTITY % hr.qname "hr" >
-<!ELEMENT %hr.qname; %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
- %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-
-
-<!-- ========================================== -->
-<!--
- Inline Presentation: b, big, i, small
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
- This is XHTML, a reformulation of HTML as a modular XML application.
- Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
- Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2004/03/17 04:23:57 pavery Exp $ SMI
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
- Revisions:
- (none)
- ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
- b, big, i, small, sub, sup, tt
-
- This module declares the elements and their attributes used to
- support inline-level presentational markup.
--->
-
-<!ENTITY % b.element "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname "b" >
-<!ELEMENT %b.qname; %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
- %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname "big" >
-<!ELEMENT %big.qname; %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
- %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname "i" >
-<!ELEMENT %i.qname; %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
- %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname "small" >
-<!ELEMENT %small.qname; %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
- %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname "sub" >
-<!ELEMENT %sub.qname; %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
- %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname "sup" >
-<!ELEMENT %sup.qname; %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
- %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
- "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname "tt" >
-<!ELEMENT %tt.qname; %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
- %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-
-
-<!-- end of XHTML Mobile 1.0 DTD ........................................... -->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod
deleted file mode 100644
index 380e25e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- ....................................................................... -->
-<!-- XHTML Mobile 1.0 Document Model Module .................................... -->
-<!-- file: xhtml-mobile10-model-1.mod
-
- This is XHTML Mobile, a proper subset of XHTML.
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
-
--->
-<!-- XHTML Mobile Document Model
-
- This module describes the groupings of elements that make up
- common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head .............. -->
-
-<!ENTITY % HeadOpts.mix
- "( %meta.qname; | %link.qname; | %object.qname; | %style.qname; )*" >
-
-<!-- Miscellaneous Elements ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
- "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
- | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
- | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
- "| %i.qname; | %b.qname; | %big.qname; | %small.qname; " >
-
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
- "| %input.qname; | %select.qname; | %textarea.qname;
- | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
- "%InlStruct.class;
- %InlPhras.class;
- %Anchor.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
- "%InlStruct.class;
- %InlPhras.class;
- %InlSpecial.class;
- %InlForm.class;
- %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
- "%InlNoAnchor.class;
- %Misc.class;"
->
-
-<!ENTITY % Inline.mix
- "%Inline.class;
- %Misc.class;"
->
-
-<!-- Block Elements ......................... -->
-
-<!ENTITY % Heading.class
- "%h1.qname; | %h2.qname; | %h3.qname;
- | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class "| %form.qname;" >
-
-<!ENTITY % Fieldset.class "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
- "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
- "%Table.class;
- %Form.class;
- %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
- "%BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %BlkSpecial.class;
- %Block.extra;"
->
-
-<!ENTITY % BlkNoForm.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %BlkPres.class;
- %Table.class;
- %Block.extra;
- %Misc.class;"
->
-
-<!ENTITY % Block.mix
- "%Heading.class;
- | %List.class;
- | %Block.class;
- %Misc.class;"
->
-
-<!-- All Content Elements ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
- "%Heading.class;
- | %List.class;
- | %BlkStruct.class;
- %BlkPhras.class;
- %Form.class;
- %Block.extra;
- | %Inline.class;
- %Misc.class;"
->
-
-
-<!ENTITY % Flow.mix
- "%Heading.class;
- | %List.class;
- | %Block.class;
- | %Inline.class;
- %Misc.class;"
->
-
-<!-- end of xhtml-mobile10-model-1.mod -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd
deleted file mode 100644
index 5eb6b2b..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- XHTML Mobile 1.0 DTD ...................................................... -->
-<!-- file: xhtml-mobile10.dtd -->
-<!--
- This is XHTML Mobile profile, a proper subset of XHTML.
-
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
-
--->
-<!-- This is the driver file for version 1.0 of the XHTML Mobile DTD.
-
- This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC: "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- SYSTEM: "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
- "http://www.w3.org/1999/xhtml"
-
- See the Qualified Names module for information
- on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- For example, if you are using XHTML Mobile 1.0 directly, use
- the FPI in the DOCTYPE declaration, with the xmlns attribute
- on the document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- "http://www.wapforum.org/DTD/xhtml-mobile10.dtd" >
- <html xmlns="http://www.w3.org/1999/xhtml"
- xml:lang="en" >
- ...
- </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile "" >
-
-<!-- Inline Style Module ........................................ -->
-<!ENTITY % xhtml-inlstyle.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-%xhtml-inlstyle.mod;
-
-<!-- Document Model ........................................ -->
-<!ENTITY % xhtml-model.mod
- PUBLIC "-//WAPFORUM//ENTITIES XHTML Mobile 1.0 Document Model 1.0//EN"
- "http://www.wapforum.org/DTD/xhtml-mobile10-model-1.mod" >
-
-<!-- XHTML Framework ........................................ -->
-<!ENTITY % XHTML.bidi "IGNORE" >
-<!ENTITY % xhtml-framework.mod
- PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-%xhtml-framework.mod;
-
-<!-- XHTML Core Modules ........................................ -->
-<!ENTITY % pre.content
- "( #PCDATA
- | %InlStruct.class;
- %InlPhras.class;
- %Anchor.class;
- %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-%xhtml-text.mod;
-
-<!ENTITY % xhtml-hypertext.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-%xhtml-hypertext.mod;
-
-<!ENTITY % xhtml-list.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-%xhtml-list.mod;
-<!-- Extend lists with value and start attributes -->
-<!ATTLIST %li.qname;
- value %Number.datatype; #IMPLIED
->
-<!ATTLIST %ol.qname;
- start %Number.datatype; #IMPLIED
->
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-%xhtml-image.mod;
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
-%xhtml-table.mod;
-
-<!-- Forms Module ...............................................
- XHTML basic forms module extended with optgroup and fieldset
--->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
- %Common.attrib;
- label %Text.datatype; #REQUIRED
->
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
- %Common.attrib;
->
-<!ENTITY % form.content "( %BlkNoForm.mix; | %fieldset.qname; )+">
-<!ENTITY % xhtml-form.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
-%xhtml-form.mod;
-
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-%xhtml-link.mod;
-
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-%xhtml-meta.mod;
-
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-%xhtml-base.mod;
-
-<!-- Stylesheets Module ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-%xhtml-style.mod;
-
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-%xhtml-param.mod;
-
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-%xhtml-object.mod;
-
-<!-- Document Structure Module ..................................... -->
-<!ENTITY % xhtml-struct.mod
- PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-%xhtml-struct.mod;
-
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-%xhtml-blkpres.mod;
-
-<!-- ========================================== -->
-<!--
- Inline Presentation: b, big, i, small
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod">
-%xhtml-inlpres.mod;
-
-<!-- end of XHTML Mobile 1.0 DTD ........................................... -->
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd
deleted file mode 100644
index 957e955..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0037)http://www.wapforum.org/DTD/wml20.dtd -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 5.50.4912.300" name=GENERATOR></HEAD>
-<BODY><XMP><!-- WML 2.0 DTD ...................................................... -->
-<!-- file: wml20.dtd -->
-<!--
- @Wireless Application Protocol Forum, Ltd. 2001.
-
- Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd.
- Web site (http://www.wapforum.org/what/copyright.htm).
--->
-<!--
- This is the WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
- "-//WAPFORUM//DTD WML 2.0//EN"
-
- For example, if you are using WML 2.0 directly, use
- the FPI in the DOCTYPE declaration, with the xmlns attribute
- on the document element to identify the default namespace:
-
- <?xml version="1.0"?>
- <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD WML 2.0//EN"
- "http://www.wapforum.org/dtd/wml20.dtd" >
- <html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wml="http://www.wapforum.org/2001/wml">
- ...
- </html>
-
--->
-<!-- ============================================ -->
-<!--
- Version, XML Namespaces, and profile information
--->
-<!-- ============================================ -->
-<!--
- Value of XHTML version attribute
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!--
- Value of XHTML profile attribute
-
- Reserved for future use with document profiles
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
- Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
- "http://www.wapforum.org/DTD/wml-framework-1.mod">
-%wml-framework.mod;
-<!-- ============================================ -->
-<!--
- XHTML modules
--->
-<!-- ============================================ -->
-<!-- Text Module ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
- | %InlStruct.class; | %i.qname; | %b.qname;
- %InlPhras.class;
- %Anchor.class;
- %Inline.extra;
- | %getvar.qname;
- | %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!ENTITY % xhtml-text.mod PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod">
-%xhtml-text.mod;
-<!ENTITY % xhtml-hypertext.mod PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod">
-%xhtml-hypertext.mod;
-<!-- List Module ............................................... -->
-<!ENTITY % xhtml-list.mod PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod">
-%xhtml-list.mod;
-<!-- Extend lists with value and start attributes -->
-<!ATTLIST %li.qname;
- value %Number.datatype; #IMPLIED
->
-<!ATTLIST %ol.qname;
- start %Number.datatype; #IMPLIED
->
-<!-- Image Module ............................................... -->
-<!ENTITY % xhtml-image.mod PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod">
-%xhtml-image.mod;
-<!-- Param Element Module ....................................... -->
-<!ENTITY % xhtml-param.mod PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod">
-%xhtml-param.mod;
-<!-- Embedded Object Module ..................................... -->
-<!ENTITY % xhtml-object.mod PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod">
-%xhtml-object.mod;
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod">
-%xhtml-table.mod;
-<!-- Forms Module ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
- %Common.attrib;
- label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
- %Common.attrib;
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
- | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-form.mod PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod">
-%xhtml-basic-form.mod;
-<!-- Link Element Module ........................................ -->
-<!ENTITY % xhtml-link.mod PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod">
-%xhtml-link.mod;
-<!-- Document Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.mod PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod">
-%xhtml-meta.mod;
-<!-- Base Element Module ........................................ -->
-<!ENTITY % xhtml-base.mod PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod">
-%xhtml-base.mod;
-<!-- Stylesheets Module ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-%xhtml-style.mod;
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!ENTITY % xhtml-struct.mod PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod">
-%xhtml-struct.mod;
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-%xhtml-blkpres.mod;
-<!-- ============================================ -->
-<!--
- WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
- "http://www.wapforum.org/DTD/wml-special-1.mod">
-%wml-special.mod;
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
- "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-%wml-deprecated.mod;
-<!-- end of WML 2.0 DTD ........................................... -->
-</XMP></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd
deleted file mode 100644
index 93321c6..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd
+++ /dev/null
@@ -1,1196 +0,0 @@
-<!--
- Extensible HTML version 1.0 Transitional DTD
-
- This is the same as HTML 4.0 Transitional except for
- changes due to the differences between XML and SGML.
-
- Namespace = http://www.w3.org/1999/xhtml
-
- For further information, see: http://www.w3.org/TR/xhtml1
-
- Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
- $Revision: 1.1 $
- $Date: 2000/01/26 14:08:56 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
- "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
- "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
- "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
- <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
- <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
- <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
- <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
- <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
- <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
- <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
- <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
- <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
- <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
- <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
- <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
- <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
- <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
- <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
- <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
- <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
- <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
- <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
- <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
- <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
- Black = #000000 Green = #008000
- Silver = #C0C0C0 Lime = #00FF00
- Gray = #808080 Olive = #808000
- White = #FFFFFF Yellow = #FFFF00
- Maroon = #800000 Navy = #000080
- Red = #FF0000 Blue = #0000FF
- Purple = #800080 Teal = #008080
- Fuchsia= #FF00FF Aqua = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
- id document-wide unique id
- class space separated list of classes
- style associated style info
- title advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id ID #IMPLIED
- class CDATA #IMPLIED
- style %StyleSheet; #IMPLIED
- title %Text; #IMPLIED"
- >
-
-<!-- internationalization attributes
- lang language code (backwards compatible)
- xml:lang language code (as per XML 1.0 spec)
- dir direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang %LanguageCode; #IMPLIED
- xml:lang %LanguageCode; #IMPLIED
- dir (ltr|rtl) #IMPLIED"
- >
-
-<!-- attributes for common UI events
- onclick a pointer button was clicked
- ondblclick a pointer button was double clicked
- onmousedown a pointer button was pressed down
- onmouseup a pointer button was released
- onmousemove a pointer was moved onto the element
- onmouseout a pointer was moved away from the element
- onkeypress a key was pressed and released
- onkeydown a key was pressed down
- onkeyup a key was released
--->
-<!ENTITY % events
- "onclick %Script; #IMPLIED
- ondblclick %Script; #IMPLIED
- onmousedown %Script; #IMPLIED
- onmouseup %Script; #IMPLIED
- onmouseover %Script; #IMPLIED
- onmousemove %Script; #IMPLIED
- onmouseout %Script; #IMPLIED
- onkeypress %Script; #IMPLIED
- onkeydown %Script; #IMPLIED
- onkeyup %Script; #IMPLIED"
- >
-
-<!-- attributes for elements that can get the focus
- accesskey accessibility key character
- tabindex position in tabbing order
- onfocus the element got the focus
- onblur the element lost the focus
--->
-<!ENTITY % focus
- "accesskey %Character; #IMPLIED
- tabindex %Number; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED"
- >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
- align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
- "br | span | bdo | object | applet | img | map | iframe">
-
-<!ENTITY % fontstyle "tt | i | b | big | small | u
- | s | strike |font | basefont">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
- samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
-
-<!ENTITY % block
- "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
- "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
- sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
- "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
- %phrase; | %inline.forms;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
- "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
- table | br | span | bdo | object | applet | img | map |
- %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
- %i18n;
- xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
- >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
- title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
- ((title, %head.misc;, (base, %head.misc;)?) |
- (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
- %i18n;
- profile %URI; #IMPLIED
- >
-
-<!-- The title element is not considered part of the flow of text.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
- -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
- href %URI; #IMPLIED
- target %FrameTarget; #IMPLIED
- >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
- %i18n;
- http-equiv CDATA #IMPLIED
- name CDATA #IMPLIED
- content CDATA #REQUIRED
- scheme CDATA #IMPLIED
- >
-
-<!--
- Relationship values can be used in principle:
-
- a) for document specific toolbars/menus when used
- with the link element in document head e.g.
- start, contents, previous, next, index, end, help
- b) to link to a separate style sheet (rel="stylesheet")
- c) to make a link to a script (rel="script")
- d) by stylesheets to control how collections of
- html nodes are rendered into printed documents
- e) to make a link to a printable version of this document
- e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
- %attrs;
- charset %Charset; #IMPLIED
- href %URI; #IMPLIED
- hreflang %LanguageCode; #IMPLIED
- type %ContentType; #IMPLIED
- rel %LinkTypes; #IMPLIED
- rev %LinkTypes; #IMPLIED
- media %MediaDesc; #IMPLIED
- target %FrameTarget; #IMPLIED
- >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
- %i18n;
- type %ContentType; #REQUIRED
- media %MediaDesc; #IMPLIED
- title %Text; #IMPLIED
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
- charset %Charset; #IMPLIED
- type %ContentType; #REQUIRED
- language CDATA #IMPLIED
- src %URI; #IMPLIED
- defer (defer) #IMPLIED
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
- %attrs;
- >
-
-<!--======================= Frames =======================================-->
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
- %coreattrs;
- longdesc %URI; #IMPLIED
- name NMTOKEN #IMPLIED
- src %URI; #IMPLIED
- frameborder (1|0) "1"
- marginwidth %Pixels; #IMPLIED
- marginheight %Pixels; #IMPLIED
- scrolling (yes|no|auto) "auto"
- align %ImgAlign; #IMPLIED
- height %Length; #IMPLIED
- width %Length; #IMPLIED
- >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes %Flow;>
-<!ATTLIST noframes
- %attrs;
- >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
- %attrs;
- onload %Script; #IMPLIED
- onunload %Script; #IMPLIED
- background %URI; #IMPLIED
- bgcolor %Color; #IMPLIED
- text %Color; #IMPLIED
- link %Color; #IMPLIED
- vlink %Color; #IMPLIED
- alink %Color; #IMPLIED
- >
-
-<!ELEMENT div %Flow;> <!-- generic language/style container -->
-<!ATTLIST div
- %attrs;
- %TextAlign;
- >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
- %attrs;
- %TextAlign;
- >
-
-<!--=================== Headings =========================================-->
-
-<!--
- There are six levels of headings from h1 (the most important)
- to h6 (the least important).
--->
-
-<!ELEMENT h1 %Inline;>
-<!ATTLIST h1
- %attrs;
- %TextAlign;
- >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
- %attrs;
- %TextAlign;
- >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
- %attrs;
- %TextAlign;
- >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
- %attrs;
- %TextAlign;
- >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
- %attrs;
- %TextAlign;
- >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
- %attrs;
- %TextAlign;
- >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
- %attrs;
- type %ULStyle; #IMPLIED
- compact (compact) #IMPLIED
- >
-
-<!-- Ordered list numbering style
-
- 1 arabic numbers 1, 2, 3, ...
- a lower alpha a, b, c, ...
- A upper alpha A, B, C, ...
- i lower roman i, ii, iii, ...
- I upper roman I, II, III, ...
-
- The style is applied to the sequence number which by default
- is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
- %attrs;
- type %OLStyle; #IMPLIED
- compact (compact) #IMPLIED
- start %Number; #IMPLIED
- >
-
-<!-- single column list (DEPRECATED) -->
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
- %attrs;
- compact (compact) #IMPLIED
- >
-
-<!-- multiple column list (DEPRECATED) -->
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
- %attrs;
- compact (compact) #IMPLIED
- >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
- %attrs;
- type %LIStyle; #IMPLIED
- value %Number; #IMPLIED
- >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
- %attrs;
- compact (compact) #IMPLIED
- >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
- %attrs;
- >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
- %attrs;
- >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
- %attrs;
- >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
- %attrs;
- align (left|center|right) #IMPLIED
- noshade (noshade) #IMPLIED
- size %Pixels; #IMPLIED
- width %Length; #IMPLIED
- >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding
- "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
- %attrs;
- width %Number; #IMPLIED
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
- %attrs;
- cite %URI; #IMPLIED
- >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
- %attrs;
- >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
- ins/del are allowed in block and inline content, but its
- inappropriate to include block content within an ins element
- occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
- %attrs;
- cite %URI; #IMPLIED
- datetime %Datetime; #IMPLIED
- >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
- %attrs;
- cite %URI; #IMPLIED
- datetime %Datetime; #IMPLIED
- >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
- %attrs;
- charset %Charset; #IMPLIED
- type %ContentType; #IMPLIED
- name NMTOKEN #IMPLIED
- href %URI; #IMPLIED
- hreflang %LanguageCode; #IMPLIED
- rel %LinkTypes; #IMPLIED
- rev %LinkTypes; #IMPLIED
- accesskey %Character; #IMPLIED
- shape %Shape; "rect"
- coords %Coords; #IMPLIED
- tabindex %Number; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- target %FrameTarget; #IMPLIED
- >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
- %attrs;
- >
-
-<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
- %coreattrs;
- %events;
- lang %LanguageCode; #IMPLIED
- xml:lang %LanguageCode; #IMPLIED
- dir (ltr|rtl) #REQUIRED
- >
-
-<!ELEMENT br EMPTY> <!-- forced line break -->
-<!ATTLIST br
- %coreattrs;
- clear (left|all|right|none) "none"
- >
-
-<!ELEMENT em %Inline;> <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;> <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;> <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;> <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;> <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;> <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;> <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;> <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;> <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;> <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;> <!-- inlined quote -->
-<!ATTLIST q
- %attrs;
- cite %URI; #IMPLIED
- >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;> <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;> <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;> <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;> <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;> <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;> <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;> <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY> <!-- base font size -->
-<!ATTLIST basefont
- id ID #IMPLIED
- size CDATA #REQUIRED
- color %Color; #IMPLIED
- face CDATA #IMPLIED
- >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
- %coreattrs;
- %i18n;
- size CDATA #IMPLIED
- color %Color; #IMPLIED
- face CDATA #IMPLIED
- >
-
-<!--==================== Object ======================================-->
-<!--
- object is used to embed objects as part of HTML pages.
- param elements should precede other content. Parameters
- can also be expressed as attribute/value pairs on the
- object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
- %attrs;
- declare (declare) #IMPLIED
- classid %URI; #IMPLIED
- codebase %URI; #IMPLIED
- data %URI; #IMPLIED
- type %ContentType; #IMPLIED
- codetype %ContentType; #IMPLIED
- archive %UriList; #IMPLIED
- standby %Text; #IMPLIED
- height %Length; #IMPLIED
- width %Length; #IMPLIED
- usemap %URI; #IMPLIED
- name NMTOKEN #IMPLIED
- tabindex %Number; #IMPLIED
- align %ImgAlign; #IMPLIED
- border %Pixels; #IMPLIED
- hspace %Pixels; #IMPLIED
- vspace %Pixels; #IMPLIED
- >
-
-<!--
- param is used to supply a named property value.
- In XML it would seem natural to follow RDF and support an
- abbreviated syntax where the param elements are replaced
- by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
- id ID #IMPLIED
- name CDATA #REQUIRED
- value CDATA #IMPLIED
- valuetype (data|ref|object) "data"
- type %ContentType; #IMPLIED
- >
-
-<!--=================== Java applet ==================================-->
-<!--
- One of code or object attributes must be present.
- Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
- %coreattrs;
- codebase %URI; #IMPLIED
- archive CDATA #IMPLIED
- code CDATA #IMPLIED
- object CDATA #IMPLIED
- alt %Text; #IMPLIED
- name NMTOKEN #IMPLIED
- width %Length; #REQUIRED
- height %Length; #REQUIRED
- align %ImgAlign; #IMPLIED
- hspace %Pixels; #IMPLIED
- vspace %Pixels; #IMPLIED
- >
-
-<!--=================== Images ===========================================-->
-
-<!--
- To avoid accessibility problems for people who aren't
- able to see the image, you should provide a text
- description using the alt and longdesc attributes.
- In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
- %attrs;
- src %URI; #REQUIRED
- alt %Text; #REQUIRED
- name NMTOKEN #IMPLIED
- longdesc %URI; #IMPLIED
- height %Length; #IMPLIED
- width %Length; #IMPLIED
- usemap %URI; #IMPLIED
- ismap (ismap) #IMPLIED
- align %ImgAlign; #IMPLIED
- border %Length; #IMPLIED
- hspace %Pixels; #IMPLIED
- vspace %Pixels; #IMPLIED
- >
-
-<!-- usemap points to a map element which may be in this document
- or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
- separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
- %i18n;
- %events;
- id ID #REQUIRED
- class CDATA #IMPLIED
- style %StyleSheet; #IMPLIED
- title %Text; #IMPLIED
- name CDATA #IMPLIED
- >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
- %attrs;
- shape %Shape; "rect"
- coords %Coords; #IMPLIED
- href %URI; #IMPLIED
- nohref (nohref) #IMPLIED
- alt %Text; #REQUIRED
- tabindex %Number; #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- target %FrameTarget; #IMPLIED
- >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
- %attrs;
- action %URI; #REQUIRED
- method (get|post) "get"
- name NMTOKEN #IMPLIED
- enctype %ContentType; "application/x-www-form-urlencoded"
- onsubmit %Script; #IMPLIED
- onreset %Script; #IMPLIED
- accept %ContentTypes; #IMPLIED
- accept-charset %Charsets; #IMPLIED
- target %FrameTarget; #IMPLIED
- >
-
-<!--
- Each label must not contain more than ONE field
- Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
- %attrs;
- for IDREF #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- >
-
-<!ENTITY % InputType
- "(text | password | checkbox |
- radio | submit | reset |
- file | hidden | image | button)"
- >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY> <!-- form control -->
-<!ATTLIST input
- %attrs;
- type %InputType; "text"
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- checked (checked) #IMPLIED
- disabled (disabled) #IMPLIED
- readonly (readonly) #IMPLIED
- size CDATA #IMPLIED
- maxlength %Number; #IMPLIED
- src %URI; #IMPLIED
- alt CDATA #IMPLIED
- usemap %URI; #IMPLIED
- tabindex %Number; #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- onselect %Script; #IMPLIED
- onchange %Script; #IMPLIED
- accept %ContentTypes; #IMPLIED
- align %ImgAlign; #IMPLIED
- >
-
-<!ELEMENT select (optgroup|option)+> <!-- option selector -->
-<!ATTLIST select
- %attrs;
- name CDATA #IMPLIED
- size %Number; #IMPLIED
- multiple (multiple) #IMPLIED
- disabled (disabled) #IMPLIED
- tabindex %Number; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- onchange %Script; #IMPLIED
- >
-
-<!ELEMENT optgroup (option)+> <!-- option group -->
-<!ATTLIST optgroup
- %attrs;
- disabled (disabled) #IMPLIED
- label %Text; #REQUIRED
- >
-
-<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
-<!ATTLIST option
- %attrs;
- selected (selected) #IMPLIED
- disabled (disabled) #IMPLIED
- label %Text; #IMPLIED
- value CDATA #IMPLIED
- >
-
-<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
-<!ATTLIST textarea
- %attrs;
- name CDATA #IMPLIED
- rows %Number; #REQUIRED
- cols %Number; #REQUIRED
- disabled (disabled) #IMPLIED
- readonly (readonly) #IMPLIED
- tabindex %Number; #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- onselect %Script; #IMPLIED
- onchange %Script; #IMPLIED
- >
-
-<!--
- The fieldset element is used to group form fields.
- Only one legend element should occur in the content
- and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
- %attrs;
- >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;> <!-- fieldset label -->
-<!ATTLIST legend
- %attrs;
- accesskey %Character; #IMPLIED
- align %LAlign; #IMPLIED
- >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
--->
-<!ELEMENT button %button.content;> <!-- push button -->
-<!ATTLIST button
- %attrs;
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- type (button|submit|reset) "submit"
- disabled (disabled) #IMPLIED
- tabindex %Number; #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
- %coreattrs;
- %i18n;
- prompt %Text; #IMPLIED
- >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
- "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
- char alignment char, e.g. char=':'
- charoff offset for alignment char
--->
-<!ENTITY % cellhalign
- "align (left|center|right|justify|char) #IMPLIED
- char %Character; #IMPLIED
- charoff %Length; #IMPLIED"
- >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
- "valign (top|middle|bottom|baseline) #IMPLIED"
- >
-
-<!ELEMENT table
- (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption %Inline;>
-<!ELEMENT thead (tr)+>
-<!ELEMENT tfoot (tr)+>
-<!ELEMENT tbody (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col EMPTY>
-<!ELEMENT tr (th|td)+>
-<!ELEMENT th %Flow;>
-<!ELEMENT td %Flow;>
-
-<!ATTLIST table
- %attrs;
- summary %Text; #IMPLIED
- width %Length; #IMPLIED
- border %Pixels; #IMPLIED
- frame %TFrame; #IMPLIED
- rules %TRules; #IMPLIED
- cellspacing %Length; #IMPLIED
- cellpadding %Length; #IMPLIED
- align %TAlign; #IMPLIED
- bgcolor %Color; #IMPLIED
- >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
- %attrs;
- align %CAlign; #IMPLIED
- >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
- %attrs;
- span %Number; "1"
- width %MultiLength; #IMPLIED
- %cellhalign;
- %cellvalign;
- >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
- width=64 width in screen pixels
- width=0.5* relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
- %attrs;
- span %Number; "1"
- width %MultiLength; #IMPLIED
- %cellhalign;
- %cellvalign;
- >
-
-<!--
- Use thead to duplicate headers when breaking table
- across page boundaries, or for static headers when
- tbody sections are rendered in scrolling panel.
-
- Use tfoot to duplicate footers when breaking table
- across page boundaries, or for static footers when
- tbody sections are rendered in scrolling panel.
-
- Use multiple tbody sections when rules are needed
- between groups of table rows.
--->
-<!ATTLIST thead
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tfoot
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tbody
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tr
- %attrs;
- %cellhalign;
- %cellvalign;
- bgcolor %Color; #IMPLIED
- >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
- %attrs;
- abbr %Text; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- scope %Scope; #IMPLIED
- rowspan %Number; "1"
- colspan %Number; "1"
- %cellhalign;
- %cellvalign;
- nowrap (nowrap) #IMPLIED
- bgcolor %Color; #IMPLIED
- width %Pixels; #IMPLIED
- height %Pixels; #IMPLIED
- >
-
-<!ATTLIST td
- %attrs;
- abbr %Text; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- scope %Scope; #IMPLIED
- rowspan %Number; "1"
- colspan %Number; "1"
- %cellhalign;
- %cellvalign;
- nowrap (nowrap) #IMPLIED
- bgcolor %Color; #IMPLIED
- width %Pixels; #IMPLIED
- height %Pixels; #IMPLIED
- >
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/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.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 2e1d7c0..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/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_143209</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.ui.tests/testfiles/bug_143209/WebContent/badattributenames.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/badattributenames.jsp
deleted file mode 100644
index c515970..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/badattributenames.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<!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 fakename="">
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.html b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.html
deleted file mode 100644
index 95bd566..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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>
-<!-- jsp expression in attribute value -->
-<body bgcolor="<%="red" %>">
-<!-- jsp expression in attribute name -->
-<p <%="align" %>="left" />
-<!-- jsp expression as attribute name & value -->
-<a <%="href='http://www.eclipse.org'" %>>Eclipse link</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.jsp
deleted file mode 100644
index 95bd566..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/WebContent/usejspinattribute.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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>
-<!-- jsp expression in attribute value -->
-<body bgcolor="<%="red" %>">
-<!-- jsp expression in attribute name -->
-<p <%="align" %>="left" />
-<!-- jsp expression as attribute name & value -->
-<a <%="href='http://www.eclipse.org'" %>>Eclipse link</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/build/classes/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/src/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/bug_143209/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/.project b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/.project
deleted file mode 100644
index daf0087..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jspformatting</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.ui.tests/testfiles/jspformatting/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/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.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/WEB-INF/web.xml
deleted file mode 100644
index b2b683a..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/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>jspformatting</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.ui.tests/testfiles/jspformatting/WebContent/formatbug102495-fmt.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495-fmt.jsp
deleted file mode 100644
index b626c91..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495-fmt.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%-- jsp declaration for String pal should stay on same line. All others should move to new line --%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%><%!String pal = "friend";%>
-<%!String message = "friend";%>
-<%!String buddy = "friend";%>
-<!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 expression must be followed directly by ! because no whitespace exists between --%>
-Welcome to WTP,
-<%=message%>!
-<p>Welcome to WTP, <%=pal%>!</p>
-<%-- jsp expression should be treated like any other attribute --%>
-<table <%="align='left'"%>>
- <tr>
- <%-- no whitespace exists before/after jsp tag so keep it that way --%>
- <th>Column<jsp:setProperty name="myname" property="myproperty" />Heading</th>
- <%-- whitespace exists before/after jsp tag so newlines are okay --%>
- <th>Column <jsp:setProperty name="myname" property="myproperty" />
- Heading</th>
- </tr>
- <tr>
- <td>Row 1: Col 1</td>
- <td>Row 1: Col 2</td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495.jsp
deleted file mode 100644
index 255f353..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%-- jsp declaration for String pal should stay on same line. All others should move to new line --%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%><%! String pal="friend"; %>
-<%! String message="friend"; %> <%! String buddy="friend"; %>
-<!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 expression must be followed directly by ! because no whitespace exists between --%>
-Welcome to WTP, <%=message%>!
-<p>Welcome to WTP, <%=pal%>!</p>
-<%-- jsp expression should be treated like any other attribute --%>
-<table <%="align='left'"%>>
- <tr>
- <%-- no whitespace exists before/after jsp tag so keep it that way --%>
- <th>Column<jsp:setProperty name="myname" property="myproperty"/>Heading</th>
- <%-- whitespace exists before/after jsp tag so newlines are okay --%>
- <th>Column <jsp:setProperty name="myname" property="myproperty"/> Heading</th>
- </tr>
- <tr>
- <td>Row 1: Col 1</td>
- <td>Row 1: Col 2</td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1-fmt.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1-fmt.jsp
deleted file mode 100644
index 08479d3..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1-fmt.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%-- jsp declaration for String pal should stay on same line. All others should move to new line --%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%><%!String pal = "friend";%>
-<%!String message = "friend";%>
-<%!String buddy = "friend";%>
-<!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.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1.jsp
deleted file mode 100644
index 03eac43..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_1.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%-- jsp declaration for String pal should stay on same line. All others should move to new line --%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%><%! String pal="friend"; %>
-<%! String message="friend"; %> <%! String buddy="friend"; %>
-<!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.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2-fmt.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2-fmt.jsp
deleted file mode 100644
index ce2159c..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2-fmt.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%!String pal = "friend";%>
-<%!String message = "friend";%>
-<!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 expression must be followed directly by ! because no whitespace exists between --%>
-Welcome to WTP,
-<%=message%>!
-<p>Welcome to WTP, <%=pal%>!</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2.jsp
deleted file mode 100644
index 81b204f..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_2.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%! String pal="friend"; %>
-<%! String message="friend"; %>
-<!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 expression must be followed directly by ! because no whitespace exists between --%>
-Welcome to WTP, <%=message%>!
-<p>Welcome to WTP, <%=pal%>!</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3-fmt.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3-fmt.jsp
deleted file mode 100644
index 287f804..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3-fmt.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 expression should be treated like any other attribute --%>
-<table <%="align='left'"%>>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3.jsp
deleted file mode 100644
index f263194..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_3.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 expression should be treated like any other attribute --%>
-<table <%="align='left'"%>>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4-fmt.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4-fmt.jsp
deleted file mode 100644
index 454b366..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4-fmt.jsp
+++ /dev/null
@@ -1,24 +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>
-<table>
- <tr>
- <%-- no whitespace exists before/after jsp tag so keep it that way --%>
- <th>Column<jsp:setProperty name="myname" property="myproperty" />Heading</th>
- <%-- whitespace exists before/after jsp tag so newlines are okay --%>
- <th>Column <jsp:setProperty name="myname" property="myproperty" />
- Heading</th>
- </tr>
- <tr>
- <td>Row 1: Col 1</td>
- <td>Row 1: Col 2</td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4.jsp
deleted file mode 100644
index 037477e..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/WebContent/formatbug102495_4.jsp
+++ /dev/null
@@ -1,23 +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>
-<table>
- <tr>
- <%-- no whitespace exists before/after jsp tag so keep it that way --%>
- <th>Column<jsp:setProperty name="myname" property="myproperty"/>Heading</th>
- <%-- whitespace exists before/after jsp tag so newlines are okay --%>
- <th>Column <jsp:setProperty name="myname" property="myproperty"/> Heading</th>
- </tr>
- <tr>
- <td>Row 1: Col 1</td>
- <td>Row 1: Col 2</td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/src/.keepme b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/jspformatting/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 35860be..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
- <accessrules>
- <accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
- <accessrule kind="accessible" pattern="org/w3c/dom/stylesheets/**/*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.core.tests/.cvsignore b/tests/org.eclipse.wst.css.core.tests/.cvsignore
deleted file mode 100644
index 9e9eed9..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
-javaCompiler.csscoretests.jar.args
diff --git a/tests/org.eclipse.wst.css.core.tests/.project b/tests/org.eclipse.wst.css.core.tests/.project
deleted file mode 100644
index 34797db..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 73bcbe5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true
-Bundle-Version: 1.0.201.qualifier
-Bundle-ClassPath: csscoretests.jar
-Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.core.tests.format,
- org.eclipse.wst.css.core.tests.format.testfiles,
- org.eclipse.wst.css.core.tests.model,
- org.eclipse.wst.css.core.tests.source,
- org.eclipse.wst.css.core.tests.testfiles,
- org.eclipse.wst.css.core.tests.testfiles.results,
- org.eclipse.wst.css.core.tests.util
-Require-Bundle: org.eclipse.wst.css.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.core.tests/about.html b/tests/org.eclipse.wst.css.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.css.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
deleted file mode 100644
index 1eac79c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- csscoretests.jar,\
- src/,\
- META-INF/,\
- about.html,\
- plugin.properties
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.properties b/tests/org.eclipse.wst.css.core.tests/plugin.properties
deleted file mode 100644
index b6f9a81..0000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = CSS Core Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
deleted file mode 100644
index 0a762ff..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.core.tests.format.TestCleanupProcessorCSS;
-import org.eclipse.wst.css.core.tests.format.TestFormatProcessorCSS;
-import org.eclipse.wst.css.core.tests.model.CSSCharsetRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFaceRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSPageRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleSheetTest;
-import org.eclipse.wst.css.core.tests.model.TestCSSDecl;
-import org.eclipse.wst.css.core.tests.source.CSSSelectorTest;
-import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-
-
-public class CSSAllTests extends TestSuite {
- public static Test suite() {
- TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
- addSourceTests(suite);
- addModelTests(suite);
-
- suite.addTestSuite(CSSCorePreferencesTest.class);
- return suite;
- }
-
- private static void addSourceTests(TestSuite suite) {
- suite.addTestSuite(CSSSourceParserTest.class);
- suite.addTestSuite(CSSTextParserTest.class);
- suite.addTestSuite(CSSSelectorTest.class);
- suite.addTestSuite(CSSUrlTest.class);
- }
-
- private static void addModelTests(TestSuite suite) {
- suite.addTestSuite(CSSStyleSheetTest.class);
- suite.addTestSuite(CSSCharsetRuleTest.class);
- suite.addTestSuite(CSSImportRuleTest.class);
- suite.addTestSuite(CSSStyleRuleTest.class);
- suite.addTestSuite(CSSMediaRuleTest.class);
- suite.addTestSuite(CSSPageRuleTest.class);
- suite.addTestSuite(CSSFontFaceRuleTest.class);
- suite.addTestSuite(TestFormatProcessorCSS.class);
- suite.addTestSuite(TestCleanupProcessorCSS.class);
- suite.addTestSuite(TestCSSDecl.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
deleted file mode 100644
index 86ad6b8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CSSCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, CSSCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, CSSCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.CASE_IDENTIFIER, "2");
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
- pluginSetPreferenceInt(node, CSSCorePreferenceNames.CASE_PROPERTY_NAME);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceInt(IEclipsePreferences node, String prefKey) {
- int originalValue = node.getInt(prefKey, -999);
- int expectedValue = -888;
- node.putInt(prefKey, expectedValue);
- int foundValue = node.getInt(prefKey, -999);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if (originalValue == -999)
- node.remove(prefKey);
- else
- node.putInt(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForCSS.ContentTypeID_CSS);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForCSS.ContentTypeID_CSS);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- CSSDocumentLoader loader = new CSSDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
deleted file mode 100644
index edb47a2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author pavery
- */
-public class CSSCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new CSSCoreTestSuite();
- }
-
- public CSSCoreTestSuite() {
- super("CSS Core Tests");
-
- addTest(CSSAllTests.suite());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
deleted file mode 100644
index 19dc516..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCoreTestsPlugin extends Plugin {
- // The shared instance.
- private static CSSCoreTestsPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public CSSCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.css.core.tests.CSSModelTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CSSCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
deleted file mode 100644
index 1e53c7f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestCleanupProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private CleanupProcessorCSS fCleanupProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- fCleanupProcessor = new CleanupProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestCleanupProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void cleanupAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- fCleanupProcessor.cleanupModel(beforeModel);
-
- ByteArrayOutputStream cleanedupBytes = new ByteArrayOutputStream();
- beforeModel.save(cleanedupBytes); // "beforeModel" should now be
- // after the cleanup processor
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String cleanedupContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(cleanedupBytes.toByteArray(), UTF_8);
- assertTrue("Cleanup document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(cleanedupContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG166909urlCaseCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(true);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug166909-urlcase.css", "testfiles/bug166909-urlcase-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-
- public void testBug218993NoFormatCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(false);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug218993-noformat.css", "testfiles/bug218993-noformat-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
deleted file mode 100644
index 112fdf6..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestFormatProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private FormatProcessorCSS formatProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- public TestFormatProcessorCSS(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- formatProcessor = new FormatProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestFormatProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- formatProcessor.formatModel(beforeModel);
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String formattedContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(formattedContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG73990SelectorFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/BUG73990_selector_unformatted.css", "testfiles/BUG73990_selector_formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add extra semicolons.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG111569extraSemicolonFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug111569-extrasemicolon.css", "testfiles/bug111569-extrasemicolon-formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add space between selector and
- * attribute selectors <code>input[type="hidden"]</code> would be
- * wrongly formatted as<code>input [type="hidden"]</code> instead of
- * being left alone.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG146198attributeSpecifierFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug146198-attributespecifier.css", "testfiles/bug146198-attributespecifier-formatted.css");
- }
-
- public void testBUG110539multipleClassFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug110539-multipleclass.css", "testfiles/bug110539-multipleclass-formatted.css");
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
deleted file mode 100644
index 6da6ff7..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Class as selector */
-H1.pastoral {
- color: #00FF00
-}
-
-/* ID as selector */
-#z98y {
- letter-spacing: 0.3em
-}
-
-H1#z98y {
- letter-spacing: 0.5em
-}
-
-/* Contextual selectors */
-DIV P {
- font: small sans-serif
-}
-
-.reddish H1 {
- color: red
-}
-
-#x78y CODE {
- background: blue
-}
-
-DIV.sidenote H1 {
- font-size: large
-}
-
-/* Anchor pseudo-classes */
-A:link {
- color: red
-} /* unvisited link */
-A:visited {
- color: blue
-} /* visited links */
-A:active {
- color: lime
-} /* active links */ /* Pseudo-class combined with normal class */
-A.external:visited {
- color: blue
-}
-
-/* 'first-line' pseudo-element */
-P:first-line {
- font-variant: small-caps
-}
-
-/* 'first-letter' pseudo-element */
-P:first-letter {
- font-size: 200%;
- float: left
-}
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter {
- color: purple
-}
-
-P.initial:first-letter {
- color: red
-}
-
-/* Multiple pseudo-elements */
-P {
- color: red;
- font-size: 12pt
-}
-
-P:first-letter {
- color: green;
- font-size: 200%
-}
-
-P:first-line {
- color: blue
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
deleted file mode 100644
index ed52c93..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Class as selector */
-H1.pastoral { color: #00FF00 }
-
-/* ID as selector */
-#z98y { letter-spacing: 0.3em }
-H1#z98y { letter-spacing: 0.5em }
-
-/* Contextual selectors */
-DIV P { font: small sans-serif }
-.reddish H1 { color: red }
-#x78y CODE { background: blue }
-DIV.sidenote H1 { font-size: large }
-
-/* Anchor pseudo-classes */
-A:link { color: red } /* unvisited link */
-A:visited { color: blue } /* visited links */
-A:active { color: lime } /* active links */
-
-/* Pseudo-class combined with normal class */
-A.external:visited { color: blue }
-
-/* 'first-line' pseudo-element */
-P:first-line { font-variant: small-caps }
-
-/* 'first-letter' pseudo-element */
-P:first-letter { font-size: 200%; float: left }
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter { color: purple }
-P.initial:first-letter { color: red }
-
-/* Multiple pseudo-elements */
-P { color: red; font-size: 12pt }
-P:first-letter { color: green; font-size: 200% }
-P:first-line { color: blue }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
deleted file mode 100644
index 537e7b5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
- color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
- color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
- border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
- border-top: 0px;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
deleted file mode 100644
index fe5073f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
-color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
-color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
-border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
-border-top: 0px;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
deleted file mode 100644
index c66e6e9..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.sitemaplev1 {
- font-family: Verdana;
- font-size: 12px;
- line-height: 17px;
- color: #666666;
- font-weight: bold;
- text-decoration: none;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
deleted file mode 100644
index c8e307d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.sitemaplev1{font-family:Verdana;font-size:12px;line-height:17px;
-color:#666666;font-weight:bold;
-text-decoration:none;}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
deleted file mode 100644
index 55ad1ca..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
- width: 98%;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
deleted file mode 100644
index 72c1dbd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
-width: 98%;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
deleted file mode 100644
index 60dea46..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: url(mixedCase/projectLogo.gif);
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
deleted file mode 100644
index dfd0aaa..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: URL(mixedCase/projectLogo.gif);
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
deleted file mode 100644
index cd8d95c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@charset "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- text-align: left;
- z-index: 2;
-}
-
-
-#context {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
deleted file mode 100644
index 2676801..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- TEXT-ALIGN: LEFT;
- z-index: 2;
-}
-
-
-#CONTEXT {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
deleted file mode 100644
index 433334a..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-public class AbstractModelTest extends TestCase {
- protected ICSSModel fModel = null;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
- fModel = FileUtil.createModel();
- }
-
- protected void tearDown() throws Exception {
- if (fModel != null) {
- fModel.releaseFromEdit();
- fModel = null;
- }
- super.tearDown();
- }
-
- protected ICSSModel getModel() {
- return fModel;
- }
-
- protected ICSSStyleSheet getStyleSheet() {
- return (ICSSStyleSheet) fModel.getDocument();
- }
-
- class PrimitiveNumber {
- short type;
- float value;
-
- PrimitiveNumber(short newType, float newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- class PrimitiveString {
- short type;
- String value;
-
- PrimitiveString(short newType, String newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- /* for int, float */
- protected void checkPrimitiveNumber(CSSValue actual, PrimitiveNumber expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getFloatValue(expected.type), 0);
- }
-
- /* for string */
- protected void checkPrimitiveString(CSSValue actual, PrimitiveString expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getStringValue());
- }
-
- /* for counter */
- protected void checkPrimitiveCounter(CSSValue actual, String identifier, String listStyle, String separator) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_COUNTER, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Counter counter = ((CSSPrimitiveValue) actual).getCounterValue();
- assertEquals(identifier, counter.getIdentifier());
- assertEquals(listStyle, counter.getListStyle());
- assertEquals(separator, counter.getSeparator());
- }
-
- /* for rect */
- protected void checkPrimitiveRect(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RECT, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Rect rect = ((CSSPrimitiveValue) actual).getRectValue();
- CSSPrimitiveValue value;
- Object expected;
- value = rect.getTop();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getRight();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getBottom();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getLeft();
- expected = expectedArray[3];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
- /* for rgb */
- protected void checkPrimitiveRgb(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RGBCOLOR, ((CSSPrimitiveValue) actual).getPrimitiveType());
- RGBColor color = ((CSSPrimitiveValue) actual).getRGBColorValue();
- CSSPrimitiveValue value;
- Object expected;
- value = color.getRed();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getGreen();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getBlue();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
deleted file mode 100644
index dfb4abe..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-public class CSSCharsetRuleTest extends AbstractModelTest {
- private final String RULE = "@charset \"iso-8859-1\";";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- CSSCharsetRule newRule = doc.createCSSCharsetRule();
- newRule.setEncoding("iso-8859-1");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
deleted file mode 100644
index babf772..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSFontFaceRuleTest extends AbstractModelTest {
- public void testInsertRule() {
- final String RULE = "@font-face { font-family: \"Swiss 721\"; src: url(swiss721.pfr); /* The expanded Swiss 721 */ font-stretch: expanded; }";
- CSSStyleSheet sheet = getStyleSheet();
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSFontFaceRule);
-
- CSSStyleDeclaration declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- CSSValue value;
- CSSPrimitiveValue primitiveValue;
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_STRING, primitiveValue.getPrimitiveType());
- assertEquals("Swiss 721", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_URI, primitiveValue.getPrimitiveType());
- assertEquals("swiss721.pfr", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("font-stretch");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_IDENT, primitiveValue.getPrimitiveType());
- assertEquals("expanded", primitiveValue.getStringValue());
- }
-
- public void _testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(4, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Swiss 721"));
-
- value = declaration.getPropertyCSSValue("src");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "swiss721blk.pfr"));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 800));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 900));
- }
-
- public void _testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(6, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Palatino"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Times New Roman"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(4), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "New York"));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(6), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Utopia"));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(8), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://somewhere/free/font"));
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 100));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 200));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-variant");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "all"));
- }
-
- public void _testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(5, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(4, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Alabama Italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.fonts.org/A/alabama-italic"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truetype"));
-
- value = declaration.getPropertyCSSValue("panose-1");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(10, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(3), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(5), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(7), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 9));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
- checkPrimitiveNumber(valueList.item(9), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Alabama"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(5, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "oblique"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
deleted file mode 100644
index a22eb8d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSImportRuleTest extends AbstractModelTest {
-
- public void testInsertRuleDoubleQuote() {
- checkInsert("@import \"dummy.css\";", "dummy.css", null);
- }
-
- public void testInsertRuleSingleQuote() {
- checkInsert("@import \'dummy.css\';", "dummy.css", null);
- }
-
- public void testInsertRuleUrlNoQuote() {
- checkInsert("@import url(dummy.css);", "dummy.css", null);
- }
-
- public void testInsertRuleUrlDoubleQuote() {
- checkInsert("@import url(\"dummy.css\");", "dummy.css", null);
- }
-
- public void testInsertRuleUrlSingleQuote() {
- checkInsert("@import url(\'dummy.css\');", "dummy.css", null);
- }
-
- public void testInsertRuleMedia1() {
- checkInsert("@import url(\"dummy.css\") media1;", "dummy.css", new String[]{"media1"});
- }
-
- public void testInsertRuleMedia2() {
- checkInsert("@import url(\'dummy.css\') media1, media2;", "dummy.css", new String[]{"media1", "media2"});
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSImportRule newRule = doc.createCSSImportRule();
- newRule.setHref("dummy.css");
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals("dummy.css", importRule.getHref());
- MediaList mediaList = importRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@import url(\"dummy.css\") media1, media2;", importRule.getCssText());
- }
-
- private void checkInsert(String ruleString, String href, String[] media) {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(ruleString, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
-
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals(href, importRule.getHref());
-
- if (media != null) {
- assertEquals(media.length, importRule.getMedia().getLength());
- for (int i = 0; i < media.length; i++) {
- assertEquals(media[i], importRule.getMedia().item(i));
- }
- }
-
- assertEquals(ruleString, importRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
deleted file mode 100644
index 08f2840..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSMediaRuleTest extends AbstractModelTest {
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSMediaRule newRule = doc.createCSSMediaRule();
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSMediaRule);
- CSSMediaRule mediaRule = (CSSMediaRule) rule;
-
- MediaList mediaList = mediaRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@media media1, media2 {" + FileUtil.commonEOL + "}", mediaRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
deleted file mode 100644
index 429bc02..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSPageRuleTest extends AbstractModelTest {
- public void testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, (float) 8.5));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 11));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 2));
- }
-
- public void testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "auto"));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 10));
- }
-
- public void testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":left", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
- }
-
- public void testInsertText4() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 4
-
- rule = ruleList.item(3);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":right", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
- }
-
- public void testInsertText5() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 5
-
- rule = ruleList.item(4);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("narrow", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 9));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 18));
- }
-
- public void testInsertText6() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 6
-
- rule = ruleList.item(5);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("rotated", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "landscape"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
deleted file mode 100644
index 589662e..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSStyleRuleTest extends AbstractModelTest {
- public void testInsertTextNumbers() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(20, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("NUMBER");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_NUMBER, 123.456f));
-
- // 02
- value = declaration.getPropertyCSSValue("PERCENTAGE");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 123.456f));
-
- // 03
- value = declaration.getPropertyCSSValue("EMS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EMS, 123.456f));
-
- // 04
- value = declaration.getPropertyCSSValue("EXS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EXS, 123.456f));
-
- // 05
- value = declaration.getPropertyCSSValue("PX");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, +123.456f));
- value = declaration.getPropertyCSSValue("PX2");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, -123f));
-
-
-
- // 06
- value = declaration.getPropertyCSSValue("CM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 123.456f));
-
- // 07
- value = declaration.getPropertyCSSValue("MM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MM, 123.456f));
-
- // 08
- value = declaration.getPropertyCSSValue("IN");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 123.456f));
-
- // 09
- value = declaration.getPropertyCSSValue("PT");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PT, 123.456f));
-
- // 10
- value = declaration.getPropertyCSSValue("PC");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PC, 123.456f));
-
- // 11
- value = declaration.getPropertyCSSValue("DEG");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DEG, -123.456f));
-
- // 12
- value = declaration.getPropertyCSSValue("RAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_RAD, 123.456f));
-
- // 13
- value = declaration.getPropertyCSSValue("GRAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_GRAD, 123.456f));
-
- // 14
- value = declaration.getPropertyCSSValue("MS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MS, 123.456f));
-
- // 15
- value = declaration.getPropertyCSSValue("S");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_S, 123.456f));
-
- // 16
- value = declaration.getPropertyCSSValue("HZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_HZ, 123.456f));
-
- // 17
- value = declaration.getPropertyCSSValue("KHZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_KHZ, 123.456f));
-
- // 18
- value = declaration.getPropertyCSSValue("DIMENSION");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DIMENSION, -123.456f));
-
- // 19
- value = declaration.getPropertyCSSValue("INTEGER");
- checkPrimitiveNumber(value, new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 123));
- }
-
- public void testInsertTextStrings() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(11, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("STRING");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "string"));
-
- // 02
- value = declaration.getPropertyCSSValue("URI");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.ibm.com/"));
-
- // 03
- value = declaration.getPropertyCSSValue("IDENT");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "left"));
-
- // 04
- value = declaration.getPropertyCSSValue("HASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_HASH, "#abcdef"));
-
- // 05
- value = declaration.getPropertyCSSValue("URANGE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_URANGE, "U+20A7"));
-
- // 06
- value = declaration.getPropertyCSSValue("SLASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_SLASH, "/"));
-
- // 07
- value = declaration.getPropertyCSSValue("COMMA");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-
- // 08
- value = declaration.getPropertyCSSValue("INHERIT_PRIMITIVE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE, "inherit"));
-
- // 09
- value = declaration.getPropertyCSSValue("ATTR");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_ATTR, "KEY"));
-
- // 10
- value = declaration.getPropertyCSSValue("FORMAT");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truedoc"));
-
- // 11
- value = declaration.getPropertyCSSValue("LOCAL");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Excelsior Roman"));
- }
-
- public void testInsertTextFunctions() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("COUNTER");
- checkPrimitiveCounter(value, "par-num", "upper-roman", null);
-
- value = declaration.getPropertyCSSValue("RECT");
- checkPrimitiveRect(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 12), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 34), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 56), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 78)});
-
- value = declaration.getPropertyCSSValue("RGBCOLOR");
- checkPrimitiveRgb(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 255), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 128), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 0)});
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
deleted file mode 100644
index c23ceb4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-public class CSSStyleSheetTest extends AbstractModelTest {
- private final static String RULE_H1 = "H1 { color : red; }";
- private final static String RULE_H2 = "H2 { color : red; }";
- private final static String RULE_H3 = "H3 { color : red; }";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule;
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H2, rule.getCssText());
- rule = ruleList.item(2);
- assertEquals(RULE_H3, rule.getCssText());
-
- }
-
- public void testDeleteRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList;
- CSSRule rule;
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H3, rule.getCssText());
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
-
- sheet.deleteRule(0);
-
- try {
- sheet.deleteRule(0);
- }
- catch (DOMException e) {
- assertEquals(DOMException.INDEX_SIZE_ERR, e.code);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
deleted file mode 100644
index 767dd57..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory;
-import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class TestCSSDecl extends TestCase {
- // commenting out this test because decl.setCssText() is not an implemented method
-// public void testDecl() {
-// CSSPropertyContext context = new CSSPropertyContext();
-// ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
-// context.initialize(decl);
-// decl.setCssText(getString() != null ? getString() : "");//$NON-NLS-1$
-// }
-// private String getString() {
-// return "body {}";
-// }
-
- public void testStandaloneCSSDecl() {
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=202615
- CSSPropertyContext context = new CSSPropertyContext();
- ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
- context.initialize(decl);
- String cssText = decl.getCssText();
- assertEquals("standalone css node was not initialized", "", cssText); //$NON-NLS-1$ //$NON-NLS-2$
-
- context.setMargin("auto"); //$NON-NLS-1$
- context.setColor("red"); //$NON-NLS-1$
- context.setBorder("thick"); //$NON-NLS-1$
- context.applyFull(decl);
- cssText = decl.getCssText();
- String expected = "color: red; border: thick; margin: auto"; //$NON-NLS-1$
- assertEquals("standalone css node's properties were not set as expected", expected, cssText); //$NON-NLS-1$
- }
-
- public void testCSSStyleDeclItem() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemMODE_DECLARATION() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemSTYLE_SHEET() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_STYLESHEET);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSModel() {
-
- ICSSModel model = FileUtil.createModel();
-
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(getHTMLDocumentText());
-
- IStructuredDocumentRegion region = structuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- private String getHTMLDocumentText() {
- String text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n" +
- "<HTML><HEAD>\r\n" +
- "<META http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\r\n" +
- "<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\r\n" +
- "<TITLE></TITLE>\r\n" +
- "<STYLE type=\"text/css\">\r\n" +
- "<!--\r\n" +
- "BODY{\r\n" +
- " color : teal;\r\n" +
- " background-color: #FFFF99;\r\n" +
- "}\r\n" +
- "H1{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 10px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 10px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H2{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 7px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 7px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H3{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 4px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 4px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "HR{\r\n" +
- " color : teal;\r\n" +
- " height: 3px;\r\n" +
- "}\r\n" +
- "P{\r\n" +
- " color : teal;\r\n" +
- "}\r\n" +
- "TH{\r\n" +
- " color: #FFFFCC;\r\n" +
- " background-color : teal;\r\n" +
- "}\r\n" +
- "TD{\r\n" +
- " color : black;\r\n" +
- " background-color : white;\r\n" +
- "}\r\n" +
- "-->\r\n" +
- "</STYLE>\r\n" +
- "</HEAD><BODY>\r\n" +
- "<H1>Heading 1 Heading 1</H1>\r\n" +
- "<H2>Heading 2 Heading 2</H2>\r\n" +
- "<H3>Heading 3 Heading 3</H3>\r\n" +
- "<HR>\r\n" +
- "<P>Normal Text</P>\r\n" +
- "<P style=\"color : white; background-color : teal;\">Normal Text with inline style</P>\r\n" +
- "<HR>\r\n" +
- "<TABLE border=\"1\">\r\n" +
- " <TBODY>\r\n" +
- " <TR>\r\n" +
- " <TH colspan=\"3\">Header Cell of Table</TH>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " </TBODY>\r\n" +
- "</TABLE>\r\n" +
- "</BODY></HTML>";
- return text;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
deleted file mode 100644
index 3d643d2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,858 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class CSSSelectorTest extends TestCase {
- public void testSelector01() {
- ICSSSelectorList list = createSelectorList("H1, H2, H3");
- checkSelectorList(list, "H1, H2, H3", 3, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H2", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- // see 214416 Dot char is not escaped in XML10Names.jFlex
- // for complications leading to this test being changed.
- public void testSelector02() {
- ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
- checkSelectorList(list, "H\\\\, H\\1, H3", 3, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H\\\\", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H\\1", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- public void testSelector03() {
- ICSSSelectorList list = createSelectorList("H1.pastoral");
- checkSelectorList(list, "H1.pastoral", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.pastoral", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral"});
- }
-
- public void testSelector04() {
- ICSSSelectorList list = createSelectorList("P.pastoral.marine");
- checkSelectorList(list, "P.pastoral.marine", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.pastoral.marine", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral", "marine"});
- }
-
- public void testSelector05() {
- ICSSSelectorList list = createSelectorList("*.warning");
- checkSelectorList(list, "*.warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector06() {
- ICSSSelectorList list = createSelectorList(".warning");
- checkSelectorList(list, ".warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector07() {
- ICSSSelectorList list = createSelectorList("*[lang=fr]");
- checkSelectorList(list, "*[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector08() {
- ICSSSelectorList list = createSelectorList("[lang=fr]");
- checkSelectorList(list, "[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector09() {
- ICSSSelectorList list = createSelectorList("*#myid");
- checkSelectorList(list, "*#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector10() {
- ICSSSelectorList list = createSelectorList("#myid");
- checkSelectorList(list, "#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector11() {
- ICSSSelectorList list = createSelectorList("H1#z98y");
- checkSelectorList(list, "H1#z98y", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1#z98y", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"z98y"});
- }
-
- public void testSelector12() {
- ICSSSelectorList list = createSelectorList("H1 EM");
- checkSelectorList(list, "H1 EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1 EM", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector13() {
- ICSSSelectorList list = createSelectorList("DIV * P");
- checkSelectorList(list, "DIV * P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV * P", 5, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector14() {
- ICSSSelectorList list = createSelectorList("DIV P *[href]");
- checkSelectorList(list, "DIV P *[href]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV P *[href]", 5, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"href"});
- }
-
- public void testSelector15() {
- ICSSSelectorList list = createSelectorList("BODY > P");
- checkSelectorList(list, "BODY > P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "BODY > P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "BODY", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector16() {
- ICSSSelectorList list = createSelectorList("DIV OL>LI P");
- checkSelectorList(list, "DIV OL > LI P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV OL > LI P", 7, 4, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "OL", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "LI", false, 0, 0, 0, 0);
-
- item = selector.getItem(5);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(6);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector17() {
- ICSSSelectorList list = createSelectorList("MATH + P");
- checkSelectorList(list, "MATH + P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "MATH + P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "MATH", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector18() {
- ICSSSelectorList list = createSelectorList("H1.opener + H2");
- checkSelectorList(list, "H1.opener + H2", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.opener + H2", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"opener"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
- }
-
- public void testSelector19() {
- ICSSSelectorList list = createSelectorList("EXAMPLE[notation=decimal]");
- checkSelectorList(list, "EXAMPLE[notation=decimal]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "EXAMPLE[notation=decimal]", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "EXAMPLE", false, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"notation=decimal"});
- }
-
- public void testSelector20() {
- ICSSSelectorList list = createSelectorList("SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]");
- checkSelectorList(list, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "SPAN", false, 2, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"hello=\"Cleveland\"", "goodbye=\"Columbus\""});
- }
-
- public void testSelector21() {
- ICSSSelectorList list = createSelectorList("DIV > P:first-child");
- checkSelectorList(list, "DIV > P:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV > P:first-child", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector22() {
- ICSSSelectorList list = createSelectorList("P:first-child EM");
- checkSelectorList(list, "P:first-child EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P:first-child EM", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector23() {
- ICSSSelectorList list = createSelectorList("* > A:first-child");
- checkSelectorList(list, "* > A:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "* > A:first-child", 3, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector24() {
- ICSSSelectorList list = createSelectorList("A:link");
- checkSelectorList(list, "A:link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:link", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector25() {
- ICSSSelectorList list = createSelectorList(":link");
- checkSelectorList(list, ":link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ":link", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector26() {
- ICSSSelectorList list = createSelectorList("A:focus:hover");
- checkSelectorList(list, "A:focus:hover", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:focus:hover", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 2);
- checkSimpleSelectorPseudoNames(item, new String[]{"focus", "hover"});
- }
-
- public void testSelector27() {
- ICSSSelectorList list = createSelectorList("HTML:lang(de) > Q");
- checkSelectorList(list, "HTML:lang(de) > Q", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "HTML:lang(de) > Q", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "HTML", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"lang(de)"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "Q", false, 0, 0, 0, 0);
- }
-
- public void testSelector28() {
- ICSSSelectorList list = createSelectorList("P > A:link, A.external:visited");
- checkSelectorList(list, "P > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P > A:link", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector29() {
- ICSSSelectorList list = createSelectorList("P#hoge98 + *:hover > A:link, A.external:visited");
- checkSelectorList(list, "P#hoge98 + *:hover > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P#hoge98 + *:hover > A:link", 5, 10202, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"hoge98"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"hover"});
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector30() {
- ICSSSelectorList list = createSelectorList("H1.123");
- checkSelectorList(list, "H1.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.123", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector31() {
- ICSSSelectorList list = createSelectorList("P.123.456");
- checkSelectorList(list, "P.123.456", 1, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.123.456", 1, 201, 2);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123", "456"});
- }
-
- public void testSelector32() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector33() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector34() {
- ICSSSelectorList list = createSelectorList("H1.1x3");
- checkSelectorList(list, "H1.1x3", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.1x3", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- }
-
- public void testSelector35() {
- ICSSSelectorList list = createSelectorList("H2.123#46");
- checkSelectorList(list, "H2.123#46", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H2.123#46", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- checkSimpleSelectorIDs(item, new String[]{"46"});
- }
-
- public void testSelector36() {
- ICSSSelectorList list = createSelectorList("H3.1x3#4t2");
- checkSelectorList(list, "H3.1x3#4t2", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H3.1x3#4t2", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- checkSimpleSelectorIDs(item, new String[]{"4t2"});
- }
-
- public void testSelector37() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector38() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector39() {
- ICSSSelectorList list = createSelectorList(".123f567");
- checkSelectorList(list, ".123f567", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123f567", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123f567"});
- }
-
- // Bug 221504: whitespace preceding a selector separator was causing selectors
- // to be merged
- public void testSelector40() {
- ICSSSelectorList list = createSelectorList("h1.fix , h2.fix, h3.fix , div#container");
- checkSelectorList(list, "h1.fix, h2.fix, h3.fix, div#container", 4, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "h1.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "h2.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h2", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(2);
- checkSelector(selector, "h3.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h3", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(3);
- checkSelector(selector, "div#container", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "div", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[] {"container"});
- }
-
- private void checkSelectorList(ICSSSelectorList list, String formattedSource, int nSelectors, int nErrors) {
- assertEquals(formattedSource, list.getString());
- assertEquals(nSelectors, list.getLength());
- assertEquals(nErrors, list.getErrorCount());
- }
-
- private void checkSelector(ICSSSelector selector, String formattedSource, int items, int specificity, int nErrors) {
- assertEquals(formattedSource, selector.getString());
- assertEquals(items, selector.getLength());
- assertEquals(specificity, selector.getSpecificity());
- assertEquals(nErrors, selector.getErrorCount());
- }
-
- private void checkSimpleSelector(ICSSSelectorItem selector, String formattedSource, boolean isUniversal, int nAttributes, int nClasses, int nIds, int nPseudoNames) {
- assertTrue(selector instanceof ICSSSimpleSelector);
- assertEquals(formattedSource, ((ICSSSimpleSelector) selector).getName());
- assertEquals(isUniversal, ((ICSSSimpleSelector) selector).isUniversal());
- assertEquals(nAttributes, ((ICSSSimpleSelector) selector).getNumOfAttributes());
- assertEquals(nClasses, ((ICSSSimpleSelector) selector).getNumOfClasses());
- assertEquals(nIds, ((ICSSSimpleSelector) selector).getNumOfIDs());
- assertEquals(nPseudoNames, ((ICSSSimpleSelector) selector).getNumOfPseudoNames());
- }
-
- private void checkSimpleSelectorAttributes(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfAttributes();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getAttribute(i));
- }
- }
-
- private void checkSimpleSelectorClasses(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfClasses();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getClass(i));
- }
- }
-
- private void checkSimpleSelectorIDs(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfIDs();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getID(i));
- }
- }
-
- private void checkSimpleSelectorPseudoNames(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfPseudoNames();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getPseudoName(i));
- }
- }
-
- private void checkSelectorCombinator(ICSSSelectorItem combinator, String formattedSource, int combinatorType) {
- assertTrue(combinator instanceof ICSSSelectorCombinator);
- assertEquals(formattedSource, ((ICSSSelectorCombinator) combinator).getString());
- assertEquals(combinatorType, ((ICSSSelectorCombinator) combinator).getCombinatorType());
- }
-
- private ICSSSelectorList createSelectorList(String str) {
- return new CSSSelectorListImpl(str);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
deleted file mode 100644
index 5c1e58b..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/**
- *
- */
-public class CSSSourceParserTest extends TestCase {
- public void testSourceOpen1() throws IOException {
- sourceParserTest("sample01.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen2() throws IOException {
- sourceParserTest("sample02.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen3() throws IOException {
- sourceParserTest("sample03.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen4() throws IOException {
- sourceParserTest("sample04.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen5() throws IOException {
- sourceParserTest("sample05.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen6() throws IOException {
- sourceParserTest("sample06.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen7() throws IOException {
- sourceParserTest("sample07.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen8() throws IOException {
- sourceParserTest("sample08.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend1() throws IOException {
- sourceParserTest("sample01.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend2() throws IOException {
- sourceParserTest("sample02.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend3() throws IOException {
- sourceParserTest("sample03.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend4() throws IOException {
- sourceParserTest("sample04.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend5() throws IOException {
- sourceParserTest("sample05.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend6() throws IOException {
- sourceParserTest("sample06.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend7() throws IOException {
- sourceParserTest("sample07.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend8() throws IOException {
- sourceParserTest("sample08.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert1() throws IOException {
- sourceParserTest("sample01.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert2() throws IOException {
- sourceParserTest("sample02.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert3() throws IOException {
- sourceParserTest("sample03.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert4() throws IOException {
- sourceParserTest("sample04.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert5() throws IOException {
- sourceParserTest("sample05.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert6() throws IOException {
- sourceParserTest("sample06.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert7() throws IOException {
- sourceParserTest("sample07.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert8() throws IOException {
- sourceParserTest("sample08.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- private void sourceParserTest(String filename, String mode) throws IOException {
- ICSSModel model = null;
- if (mode.equals(MODE_OPEN)) {
- model = readModelOpen(filename);
- }
- else if (mode.equals(MODE_APPEND)) {
- model = readModelAppend(filename);
- }
- else if (mode.equals(MODE_INSERT)) {
- model = readModelInsert(filename);
- }
- String result = dumpRegions(model.getStructuredDocument());
- compareResult(result, "CSSSourceParserTest-" + filename); //$NON-NLS-1$
- closeModel(model);
- }
-
- private ICSSModel readModelOpen(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.replaceText(null, 0, 0, source);
-
- return model;
- }
-
- private ICSSModel readModelAppend(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- document.replaceText(null, i, 0, source.substring(i, i + 1));
- }
-
- return model;
- }
-
- private ICSSModel readModelInsert(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- int textIndex = source.length() - i - 1;
- document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
- }
-
- return model;
- }
-
- private void closeModel(ICSSModel model) {
- model.releaseFromEdit();
- }
-
- private String dumpRegions(IStructuredDocument document) {
- StringBuffer buf = new StringBuffer();
- buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
- return buf.toString();
- }
-
- private String dumpRegions(IStructuredDocumentRegion region) {
- StringBuffer buf = new StringBuffer();
- do {
- buf.append(dumpOneRegion(region));
- region = region.getNext();
- }
- while (region != null);
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
- StringBuffer buf = new StringBuffer();
- buf.append(documentRegion.toString());
- buf.append(FileUtil.commonEOL + " "); //$NON-NLS-1$
-
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- buf.append(textRegion.toString());
- buf.append(", "); //$NON-NLS-1$
- }
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results"; //$NON-NLS-1$
- private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
- private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
- private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
deleted file mode 100644
index 019546f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-
-
-public class CSSTextParserTest extends TestCase {
- public void testText1() throws IOException {
- textParserTest("sample01.css"); //$NON-NLS-1$
- }
-
- public void testText2() throws IOException {
- textParserTest("sample02.css"); //$NON-NLS-1$
- }
-
- public void testText3() throws IOException {
- textParserTest("sample03.css"); //$NON-NLS-1$
- }
-
- public void testText4() throws IOException {
- textParserTest("sample04.css"); //$NON-NLS-1$
- }
-
- public void testText5() throws IOException {
- textParserTest("sample05.css"); //$NON-NLS-1$
- }
-
- public void testText6() throws IOException {
- textParserTest("sample06.css"); //$NON-NLS-1$
- }
-
- public void testText7() throws IOException {
- textParserTest("sample07.css"); //$NON-NLS-1$
- }
-
- public void testText8() throws IOException {
- textParserTest("sample08.css"); //$NON-NLS-1$
- }
-
- private void textParserTest(String filename) throws IOException {
- String source = createString(filename); //$NON-NLS-1$
- CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, source);
- String result = dumpRegions(parser.getTokenList());
- compareResult(result, "CSSTextParserTest-" + filename); //$NON-NLS-1$
- }
-
- private String createString(String filename) throws FileNotFoundException, IOException {
- return FileUtil.createString(FILES_DIR, filename);
- }
-
- private String dumpRegions(List tokens) {
- StringBuffer buf = new StringBuffer();
- Iterator i = tokens.iterator();
- while (i.hasNext()) {
- buf.append(dumpOneRegion((CSSTextToken) i.next()));
- }
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(CSSTextToken token) {
- StringBuffer buf = new StringBuffer();
-
- buf.append("["); //$NON-NLS-1$
- buf.append(token.image);
- buf.append("] "); //$NON-NLS-1$
- buf.append(token.kind);
- buf.append(" - "); //$NON-NLS-1$
- buf.append(token.start);
- buf.append(", "); //$NON-NLS-1$
- buf.append(token.length);
-
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results";
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
deleted file mode 100644
index 0e28259..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-public class CSSUrlTest extends TestCase {
-
- /**
- * Declaration: without quotes
- */
- public void testDeclaration1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: without quotes, with surrounded space
- */
- public void testDeclaration2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url( white space.gif );"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with single quote
- */
- public void testDeclaration3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\'white space.gif\');"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with double quote
- */
- public void testDeclaration4() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\"white space.gif\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: two urls
- */
- public void testDeclaration5() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif); list-style-image: url(style image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Style rule: two urls
- */
- public void testStyleRule1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("LI { background-image: url(white space.gif);\r\nlist-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: without quotes
- */
- public void testSomeRules1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("@import url(white space.css);LI { background-image: url(white space.gif);list-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(3, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[2].getType());
- assertEquals("style image.gif", urls[2].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: Two urls but parenthesis are missed, so concatenated url
- * is identified. By adding parenthesis, urls are corrected.
- */
- public void testFixError1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("background-image: url(white space.gif; list-style-image: urlstyle image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif; list-style-image: urlstyle image.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 37, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 61, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: Two urls but parenthesis are missed, so
- * concatenated url is identified. By adding parenthesis, urls are
- * corrected.
- */
- public void testFixError2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("@import url(white space.css;LI { background-image: urlwhite space.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css;LI { background-image: urlwhite space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 27, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 55, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule: Url has only one quote, so it is not identified as url. By
- * removing quote, url is corrected.
- */
- public void testFixError3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________0123456789012345678901234567890
- document.set("@import url(white space.css\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(0, urls.length);
-
- // correct url
- document.replaceText(null, 27, 1, ""); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- }
-
-
- private UrlInfo[] pickupUrl(IStructuredDocument document) {
- List urls = new ArrayList();
- IStructuredDocumentRegion documentRegion = document.getFirstStructuredDocumentRegion();
- while (documentRegion != null) {
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- String type = textRegion.getType();
- if (type.equals(CSSRegionContexts.CSS_URI) || type.equals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI)) {
- urls.add(new UrlInfo(type, documentRegion.getFullText(textRegion)));
- }
- }
- documentRegion = documentRegion.getNext();
- }
- return (UrlInfo[]) urls.toArray(new UrlInfo[urls.size()]);
- }
-
- private class UrlInfo {
- UrlInfo(String type, String url) {
- fType = type;
- fUrl = CSSUtil.extractUriContents(url);
- }
-
- String getType() {
- return fType;
- }
-
- String getUrl() {
- return fUrl;
- }
-
- private String fType;
- private String fUrl;
-
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
deleted file mode 100644
index 09bd076..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
- font-family: "Swiss 721";
- src: url("swiss721blk.pfr"); /* Swiss 721 black */
- font-style: normal, italic;
- font-weight: 800,900; /* note the interesting problem that
- the 900 weight italic doesnft exist */
-}
-
-@font-face {
- src: local("Palatino"),
- local("Times New Roman"),
- local("New York"),
- local("Utopia"),
- url("http://somewhere/free/font");
- font-family: serif;
- font-weight: 100, 200, 300, 400, 500;
- font-style: normal;
- font-variant: normal;
- font-size: all
-}
-
-@font-face {
- src: local("Alabama Italic"),
- url(http://www.fonts.org/A/alabama-italic) format("truetype");
- panose-1: 2 4 5 2 5 4 5 9 3 3;
- font-family: Alabama, serif;
- font-weight: 300, 400, 500;
- font-style: italic, oblique;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
deleted file mode 100644
index b977f2c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@page {size: 8.5in 11in;margin: 2cm}
-
-@page {
- size: auto; /* auto is the initial value */
- margin: 10%;
-}
-
-@page :left {
- margin-left: 4cm;
- margin-right: 3cm;
-}
-@page :right {
- margin-left: 3cm;
- margin-right: 4cm;
-}
-
-@page narrow {size: 9cm 18cm}@page rotated {size: landscape}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
deleted file mode 100644
index 0d205a2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* primitive values */
-NUMBERS {
- NUMBER: 123.456;
- PERCENTAGE: 123.456%;
- EMS: 123.456em;
- EXS: 123.456ex;
- PX: 123.456px;
- PX2: -123px;
- CM: 123.456cm;
- MM: 123.456mm;
- IN: 123.456in;
- PT: 123.456pt;
- PC: 123.456pc;
- DEG: -123.456deg;
- RAD: 123.456rad;
- GRAD: 123.456grad;
- MS: 123.456ms;
- S: 123.456s;
- HZ: 123.456Hz;
- KHZ: 123.456kHz;
- DIMENSION: -123.456zzz;
- INTEGER: 123;
-}
-
-STRINGS {
- STRING: "string";
- URI: URL("http://www.ibm.com/");
- IDENT: left;
- HASH: #abcdef;
- URANGE: U+20A7;
- SLASH: /;
- COMMA: ,;
- INHERIT_PRIMITIVE: inherit;
- ATTR: attr(KEY);
- FORMAT: format("truedoc");
- LOCAL: local("Excelsior Roman");
-}
-
-FUNCTIONS {
- COUNTER: counter(par-num, upper-roman);
- RECT: rect(12, 34, 56, 78);
- RGBCOLOR: rgb(255, 128, 0);
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
deleted file mode 100644
index e1ac2f7..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 3] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[3, 9] ({
-
- )
- ContextRegion--> LBRACE: 0-1/6,
-[9, 21] (color: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[21, 24] (
- )
- ContextRegion--> S: 0-3,
-[24, 25] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[25, 30] (
-
- )
- ContextRegion--> S: 0-5,
-[30, 54] (background-color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-24,
-[54, 59] (
-
-)
- ContextRegion--> S: 0-5,
-[59, 60] (})
- ContextRegion--> RBRACE: 0-1,
-[60, 62] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
deleted file mode 100644
index e867c98..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
+++ /dev/null
@@ -1,41 +0,0 @@
-[0, 23] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[23, 24] (;)
- ContextRegion--> DELIMITER: 0-1,
-[24, 26] (
-)
- ContextRegion--> S: 0-2,
-[26, 61] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[61, 62] (;)
- ContextRegion--> DELIMITER: 0-1,
-[62, 64] (
-)
- ContextRegion--> S: 0-2,
-[64, 96] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[96, 97] (;)
- ContextRegion--> DELIMITER: 0-1,
-[97, 99] (
-)
- ContextRegion--> S: 0-2,
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> UNKNOWN: 19-20, ContextRegion--> MEDIUM: 20-26, ContextRegion--> MEDIA_SEPARATOR: 26-27, ContextRegion--> MEDIUM: 27-33, ContextRegion--> MEDIA_SEPARATOR: 33-34, ContextRegion--> UNKNOWN: 34-35, ContextRegion--> MEDIUM: 35-41/42, ContextRegion--> UNKNOWN: 42-48, ContextRegion--> MEDIA_SEPARATOR: 48-49, ContextRegion--> MEDIUM: 49-55/56,
-[155, 169] (@import media6)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> UNKNOWN: 8-14,
-[169, 170] (;)
- ContextRegion--> DELIMITER: 0-1,
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
- ContextRegion--> S: 0-4, ContextRegion--> CDO: 4-8/9, ContextRegion--> COMMENT: 9-23/27, ContextRegion--> CDC: 27-30/34, ContextRegion--> COMMENT: 34-49/51,
-[221, 227] (kuso
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
deleted file mode 100644
index b057117..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
+++ /dev/null
@@ -1,102 +0,0 @@
-[0, 29] (@import url("../sample2.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29,
-[29, 30] (;)
- ContextRegion--> DELIMITER: 0-1,
-[30, 57] (
-
-/* Sample Styles */
-
-)
- ContextRegion--> S: 0-4, ContextRegion--> COMMENT: 4-23/27,
-[57, 62] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[62, 66] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[66, 79] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[79, 80] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[80, 83] (
- )
- ContextRegion--> S: 0-3,
-[83, 120] (background-color : rgb(181, 253, 211))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, ContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[120, 121] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[121, 124] (
- )
- ContextRegion--> S: 0-3,
-[124, 143] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[143, 144] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[144, 147] (
- )
- ContextRegion--> S: 0-3,
-[147, 186] (font-family : "Heisei Mincho W3", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-39,
-[186, 188] (
-)
- ContextRegion--> S: 0-2,
-[188, 189] (})
- ContextRegion--> RBRACE: 0-1,
-[189, 193] (
-
-)
- ContextRegion--> S: 0-4,
-[193, 205] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[205, 207] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[207, 224] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[224, 225] ( )
- ContextRegion--> S: 0-1,
-[225, 226] (})
- ContextRegion--> RBRACE: 0-1,
-[226, 230] (
-
-)
- ContextRegion--> S: 0-4,
-[230, 243] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[243, 247] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[247, 255] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[255, 260] ({
- )
- ContextRegion--> LBRACE: 0-1/5,
-[260, 281] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[281, 282] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[282, 286] (
- )
- ContextRegion--> S: 0-4,
-[286, 305] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[305, 306] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[306, 310] (
- )
- ContextRegion--> S: 0-4,
-[310, 327] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[327, 330] (
- )
- ContextRegion--> S: 0-3,
-[330, 331] (})
- ContextRegion--> RBRACE: 0-1,
-[331, 333] (
-)
- ContextRegion--> S: 0-2,
-[333, 334] (})
- ContextRegion--> RBRACE: 0-1,
-[334, 336] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
deleted file mode 100644
index fdc36bf..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
deleted file mode 100644
index fdc36bf..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
deleted file mode 100644
index 6477cb0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
+++ /dev/null
@@ -1,68 +0,0 @@
-[0, 12] (declaration )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12,
-[12, 16] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[16, 33] (dimension : 100ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17,
-[33, 34] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[34, 37] (
- )
- ContextRegion--> S: 0-3,
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, ContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, ContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, ContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, ContextRegion--> DECLARATION_VALUE_STRING: 44-57, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, ContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, ContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, ContextRegion--> DECLARATION_VALUE_STRING: 66-95, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96,
-[133, 134] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[134, 137] (
- )
- ContextRegion--> S: 0-3,
-[137, 151] (hash : #aabbcc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[151, 152] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[152, 155] (
- )
- ContextRegion--> S: 0-3,
-[155, 166] (ident : any)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[166, 167] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[167, 170] (
- )
- ContextRegion--> S: 0-3,
-[170, 184] (number : 99999)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-14,
-[184, 185] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[185, 188] (
- )
- ContextRegion--> S: 0-3,
-[188, 205] (percentage : 100%)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17,
-[205, 206] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[206, 209] (
- )
- ContextRegion--> S: 0-3,
-[209, 226] (string : "string")
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-17,
-[226, 227] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[227, 230] (
- )
- ContextRegion--> S: 0-3,
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[268, 269] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[269, 271] (
-)
- ContextRegion--> S: 0-2,
-[271, 272] (})
- ContextRegion--> RBRACE: 0-1,
-[272, 274] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
deleted file mode 100644
index a4879a8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
+++ /dev/null
@@ -1,454 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 70] (@import url("../sample2.css") projection, tv)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29/30, ContextRegion--> MEDIUM: 30-40, ContextRegion--> MEDIA_SEPARATOR: 40-41/42, ContextRegion--> MEDIUM: 42-44,
-[70, 71] (;)
- ContextRegion--> DELIMITER: 0-1,
-[71, 75] (
-
-)
- ContextRegion--> S: 0-4,
-[75, 80] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[80, 87] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[87, 100] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[100, 101] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[101, 107] (
- )
- ContextRegion--> S: 0-6,
-[107, 126] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 133] (
- )
- ContextRegion--> S: 0-6,
-[133, 172] (background-color : rgb( 181, 253, 211 ))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39,
-[172, 174] (
-)
- ContextRegion--> S: 0-2,
-[174, 175] (})
- ContextRegion--> RBRACE: 0-1,
-[175, 179] (
-
-)
- ContextRegion--> S: 0-4,
-[179, 182] (UL )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[182, 189] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[189, 202] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[202, 203] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[203, 209] (
- )
- ContextRegion--> S: 0-6,
-[209, 251] (list-style-image : url("images/l_a01.gif"))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_URI: 19-42,
-[251, 252] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[252, 258] (
- )
- ContextRegion--> S: 0-6,
-[258, 287] (list-style-position : outside)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_IDENT: 22-29,
-[287, 289] (
-)
- ContextRegion--> S: 0-2,
-[289, 290] (})
- ContextRegion--> RBRACE: 0-1,
-[290, 294] (
-
-)
- ContextRegion--> S: 0-4,
-[294, 297] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[297, 304] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[304, 317] (color : white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[317, 318] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[318, 324] (
- )
- ContextRegion--> S: 0-6,
-[324, 343] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[343, 344] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[344, 350] (
- )
- ContextRegion--> S: 0-6,
-[350, 377] (border-left-color : #996666)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_HASH: 20-27,
-[377, 378] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[378, 384] (
- )
- ContextRegion--> S: 0-6,
-[384, 401] (padding-top : 0px)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[401, 402] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[402, 408] (
- )
- ContextRegion--> S: 0-6,
-[408, 427] (padding-right : 1cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19,
-[427, 428] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[428, 434] (
- )
- ContextRegion--> S: 0-6,
-[434, 452] (padding-bottom : 2)
- ContextRegion--> DECLARATION_PROPERTY: 0-14/15, ContextRegion--> DECLARATION_SEPARATOR: 15-16/17, ContextRegion--> DECLARATION_VALUE_NUMBER: 17-18,
-[452, 453] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[453, 459] (
- )
- ContextRegion--> S: 0-6,
-[459, 477] (padding-left : 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18,
-[477, 478] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[478, 484] (
- )
- ContextRegion--> S: 0-6,
-[484, 504] (border-style : solid)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-20,
-[504, 505] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[505, 511] (
- )
- ContextRegion--> S: 0-6,
-[511, 535] (border-top-width : 4.5ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24,
-[535, 536] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[536, 542] (
- )
- ContextRegion--> S: 0-6,
-[542, 566] (border-right-width : 5in)
- ContextRegion--> DECLARATION_PROPERTY: 0-18/19, ContextRegion--> DECLARATION_SEPARATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24,
-[566, 567] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[567, 573] (
- )
- ContextRegion--> S: 0-6,
-[573, 601] (border-bottom-width : 6.02mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28,
-[601, 602] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[602, 608] (
- )
- ContextRegion--> S: 0-6,
-[608, 629] (border-left-width : 7)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_NUMBER: 20-21,
-[629, 631] (
-)
- ContextRegion--> S: 0-2,
-[631, 632] (})
- ContextRegion--> RBRACE: 0-1,
-[632, 636] (
-
-)
- ContextRegion--> S: 0-4,
-[636, 646] (H1:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_PSEUDO: 2-9/10,
-[646, 653] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, ContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, ContextRegion--> DECLARATION_VALUE_STRING: 40-44,
-[697, 698] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[698, 704] (
- )
- ContextRegion--> S: 0-6,
-[704, 731] (counter-increment : chapter)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_IDENT: 20-27,
-[731, 732] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[732, 738] (
- )
- ContextRegion--> S: 0-6,
-[738, 761] (counter-reset : section)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_IDENT: 16-23,
-[761, 763] (
-)
- ContextRegion--> S: 0-2,
-[763, 764] (})
- ContextRegion--> RBRACE: 0-1,
-[764, 768] (
-
-)
- ContextRegion--> S: 0-4,
-[768, 779] (IMG:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_PSEUDO: 3-10/11,
-[779, 780] ({)
- ContextRegion--> LBRACE: 0-1,
-[780, 799] (content : attr(alt))
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19,
-[799, 800] (})
- ContextRegion--> RBRACE: 0-1,
-[800, 804] (
-
-)
- ContextRegion--> S: 0-4,
-[804, 815] (DIV.sample )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_CLASS: 3-10/11,
-[815, 822] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[822, 863] (font-family : "Robson Celtic", sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_IDENT: 31-41,
-[863, 864] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[864, 870] (
- )
- ContextRegion--> S: 0-6,
-[870, 889] (position : absolute)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_IDENT: 11-19,
-[889, 890] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[890, 896] (
- )
- ContextRegion--> S: 0-6,
-[896, 910] (left : 833.5pc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14,
-[910, 911] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[911, 917] (
- )
- ContextRegion--> S: 0-6,
-[917, 926] (top : 90%)
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9,
-[926, 927] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[927, 933] (
- )
- ContextRegion--> S: 0-6,
-[933, 946] (width : 100pt)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[946, 947] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[947, 953] (
- )
- ContextRegion--> S: 0-6,
-[953, 971] (height : 110.777px)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18,
-[971, 972] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[972, 978] (
- )
- ContextRegion--> S: 0-6,
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, ContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, ContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, ContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, ContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[1015, 1017] (
-)
- ContextRegion--> S: 0-2,
-[1017, 1018] (})
- ContextRegion--> RBRACE: 0-1,
-[1018, 1022] (
-
-)
- ContextRegion--> S: 0-4,
-[1022, 1033] (@font-face )
- ContextRegion--> FONT_FACE: 0-10/11,
-[1033, 1040] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1040, 1065] (font-family : "Swiss 721")
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-25,
-[1065, 1066] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1066, 1072] (
- )
- ContextRegion--> S: 0-6,
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_URI: 6-26/27, ContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, ContextRegion--> DECLARATION_VALUE_STRING: 34-47, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, ContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, ContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, ContextRegion--> DECLARATION_VALUE_STRING: 56-85, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86,
-[1158, 1159] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1159, 1165] (
- )
- ContextRegion--> S: 0-6,
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[1203, 1204] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1204, 1210] (
- )
- ContextRegion--> S: 0-6,
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, ContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37,
-[1247, 1249] (
-)
- ContextRegion--> S: 0-2,
-[1249, 1250] (})
- ContextRegion--> RBRACE: 0-1,
-[1250, 1254] (
-
-)
- ContextRegion--> S: 0-4,
-[1254, 1266] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[1266, 1267] ({)
- ContextRegion--> LBRACE: 0-1,
-[1267, 1284] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[1284, 1285] (})
- ContextRegion--> RBRACE: 0-1,
-[1285, 1289] (
-
-)
- ContextRegion--> S: 0-4,
-[1289, 1302] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[1302, 1309] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, ContextRegion--> SELECTOR_SEPARATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, ContextRegion--> SELECTOR_SEPARATOR: 14-15/16, ContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, ContextRegion--> SELECTOR_SEPARATOR: 18-19/20, ContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23,
-[1332, 1343] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1343, 1369] (voice-family : paul, child)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26,
-[1369, 1370] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1370, 1380] (
- )
- ContextRegion--> S: 0-10,
-[1380, 1391] (stress : 20)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-11,
-[1391, 1392] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1392, 1402] (
- )
- ContextRegion--> S: 0-10,
-[1402, 1415] (richness : 90)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_NUMBER: 11-13,
-[1415, 1416] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1416, 1426] (
- )
- ContextRegion--> S: 0-10,
-[1426, 1453] (cue-before : url("ping.au"))
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_URI: 13-27,
-[1453, 1459] (
- )
- ContextRegion--> S: 0-6,
-[1459, 1460] (})
- ContextRegion--> RBRACE: 0-1,
-[1460, 1466] (
- )
- ContextRegion--> S: 0-6,
-[1466, 1474] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1474, 1485] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1485, 1506] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[1506, 1507] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1507, 1517] (
- )
- ContextRegion--> S: 0-10,
-[1517, 1536] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[1536, 1537] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1537, 1547] (
- )
- ContextRegion--> S: 0-10,
-[1547, 1564] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[1564, 1570] (
- )
- ContextRegion--> S: 0-6,
-[1570, 1571] (})
- ContextRegion--> RBRACE: 0-1,
-[1571, 1577] (
- )
- ContextRegion--> S: 0-6,
-[1577, 1585] (P.peter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1585, 1596] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1596, 1611] (azimuth : right)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-15,
-[1611, 1612] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1612, 1622] (
- )
- ContextRegion--> S: 0-10,
-[1622, 1642] (elevation : -0.36rad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20,
-[1642, 1643] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1643, 1653] (
- )
- ContextRegion--> S: 0-10,
-[1653, 1666] (pitch : 210Hz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[1666, 1672] (
- )
- ContextRegion--> S: 0-6,
-[1672, 1673] (})
- ContextRegion--> RBRACE: 0-1,
-[1673, 1679] (
- )
- ContextRegion--> S: 0-6,
-[1679, 1686] (P.goat )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-6/7,
-[1686, 1697] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1697, 1712] (volume : x-soft)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_IDENT: 9-15,
-[1712, 1713] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1713, 1723] (
- )
- ContextRegion--> S: 0-10,
-[1723, 1741] (elevation : 66grad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18,
-[1741, 1742] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1742, 1752] (
- )
- ContextRegion--> S: 0-10,
-[1752, 1767] (pitch : 0.17kHz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15,
-[1767, 1773] (
- )
- ContextRegion--> S: 0-6,
-[1773, 1774] (})
- ContextRegion--> RBRACE: 0-1,
-[1774, 1776] (
-)
- ContextRegion--> S: 0-2,
-[1776, 1777] (})
- ContextRegion--> RBRACE: 0-1,
-[1777, 1781] (
-
-)
- ContextRegion--> S: 0-4,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
deleted file mode 100644
index 1ff3093..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
+++ /dev/null
@@ -1,19 +0,0 @@
-[0, 18] (a.newWindow /* */ )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-11/12, ContextRegion--> COMMENT: 12-17/18,
-[18, 25] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[25, 77] (background-image: url(../images/test.png) !important)
- ContextRegion--> DECLARATION_PROPERTY: 0-16, ContextRegion--> DECLARATION_SEPARATOR: 16-17/18, ContextRegion--> DECLARATION_VALUE_URI: 18-41/42, ContextRegion--> CSS_DECLARATION_VALUE_IMPORTANT: 42-52,
-[77, 78] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[78, 80] (
-)
- ContextRegion--> S: 0-2,
-[80, 81] (})
- ContextRegion--> RBRACE: 0-1,
-[81, 83] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
deleted file mode 100644
index 403a435..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
+++ /dev/null
@@ -1,29 +0,0 @@
-[H1] SELECTOR_ELEMENT_NAME - 0, 2
-[ ] S - 2, 1
-[{] LBRACE - 3, 1
-[
-
- ] S - 4, 5
-[color] DECLARATION_PROPERTY - 9, 5
-[:] DECLARATION_SEPARATOR - 14, 1
-[ ] S - 15, 1
-[white] DECLARATION_VALUE_IDENT - 16, 5
-[
- ] S - 21, 3
-[;] DECLARATION_DELIMITER - 24, 1
-[
-
- ] S - 25, 5
-[background-color] DECLARATION_PROPERTY - 30, 16
-[ ] S - 46, 1
-[:] DECLARATION_SEPARATOR - 47, 1
-[ ] S - 48, 1
-[black] DECLARATION_VALUE_IDENT - 49, 5
-[
-
-] S - 54, 5
-[}] RBRACE - 59, 1
-[
-] S - 60, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
deleted file mode 100644
index 34f6047..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
+++ /dev/null
@@ -1,73 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("hoge.css")] URI - 8, 15
-[;] DELIMITER - 23, 1
-[
-] S - 24, 2
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[/* comment */] COMMENT - 34, 13
-[ ] S - 47, 1
-[url(hoge.css)] URI - 48, 13
-[;] DELIMITER - 61, 1
-[
-] S - 62, 2
-[@import] IMPORT - 64, 7
-[ ] S - 71, 1
-["hoge.css"] STRING - 72, 10
-[ ] S - 82, 1
-[/* comment */] COMMENT - 83, 13
-[;] DELIMITER - 96, 1
-[
-] S - 97, 2
-[@IMPORT] IMPORT - 99, 7
-[ ] S - 106, 1
-['hoge.css'] STRING - 107, 10
-[ ] S - 117, 1
-[,] undefined - 118, 1
-[media1] MEDIUM - 119, 6
-[,] MEDIA_SEPARATOR - 125, 1
-[media2] MEDIUM - 126, 6
-[,] MEDIA_SEPARATOR - 132, 1
-[,] undefined - 133, 1
-[media3] MEDIUM - 134, 6
-[ ] S - 140, 1
-[m] undefined - 141, 1
-[e] undefined - 142, 1
-[d] undefined - 143, 1
-[i] undefined - 144, 1
-[a] undefined - 145, 1
-[4] undefined - 146, 1
-[,] MEDIA_SEPARATOR - 147, 1
-[media5] MEDIUM - 148, 6
-[ ] S - 154, 1
-[@import] IMPORT - 155, 7
-[ ] S - 162, 1
-[m] undefined - 163, 1
-[e] undefined - 164, 1
-[d] undefined - 165, 1
-[i] undefined - 166, 1
-[a] undefined - 167, 1
-[6] undefined - 168, 1
-[;] DELIMITER - 169, 1
-[
-
-] S - 170, 4
-[<!--] CDO - 174, 4
-[ ] S - 178, 1
-[/* hogehoge */] COMMENT - 179, 14
-[
-
-] S - 193, 4
-[-->] CDC - 197, 3
-[
-
-] S - 200, 4
-[/* comment 2 */] COMMENT - 204, 15
-[
-] S - 219, 2
-[kuso] SELECTOR_ELEMENT_NAME - 221, 4
-[
-] S - 225, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
deleted file mode 100644
index 3a3e11c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
+++ /dev/null
@@ -1,124 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("../sample2.css")] URI - 8, 21
-[;] DELIMITER - 29, 1
-[
-
-] S - 30, 4
-[/* Sample Styles */] COMMENT - 34, 19
-[
-
-] S - 53, 4
-[BODY] SELECTOR_ELEMENT_NAME - 57, 4
-[ ] S - 61, 1
-[{] LBRACE - 62, 1
-[
- ] S - 63, 3
-[color] DECLARATION_PROPERTY - 66, 5
-[ ] S - 71, 1
-[:] DECLARATION_SEPARATOR - 72, 1
-[ ] S - 73, 1
-[black] DECLARATION_VALUE_IDENT - 74, 5
-[;] DECLARATION_DELIMITER - 79, 1
-[
- ] S - 80, 3
-[background-color] DECLARATION_PROPERTY - 83, 16
-[ ] S - 99, 1
-[:] DECLARATION_SEPARATOR - 100, 1
-[ ] S - 101, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 102, 4
-[181] DECLARATION_VALUE_NUMBER - 106, 3
-[,] DECLARATION_VALUE_OPERATOR - 109, 1
-[ ] DECLARATION_VALUE_S - 110, 1
-[253] DECLARATION_VALUE_NUMBER - 111, 3
-[,] DECLARATION_VALUE_OPERATOR - 114, 1
-[ ] DECLARATION_VALUE_S - 115, 1
-[211] DECLARATION_VALUE_NUMBER - 116, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 119, 1
-[;] DECLARATION_DELIMITER - 120, 1
-[
- ] S - 121, 3
-[text-align] DECLARATION_PROPERTY - 124, 10
-[ ] S - 134, 1
-[:] DECLARATION_SEPARATOR - 135, 1
-[ ] S - 136, 1
-[center] DECLARATION_VALUE_IDENT - 137, 6
-[;] DECLARATION_DELIMITER - 143, 1
-[
- ] S - 144, 3
-[font-family] DECLARATION_PROPERTY - 147, 11
-[ ] S - 158, 1
-[:] DECLARATION_SEPARATOR - 159, 1
-[ ] S - 160, 1
-["Heisei Mincho W3"] DECLARATION_VALUE_STRING - 161, 18
-[,] DECLARATION_VALUE_OPERATOR - 179, 1
-[ ] DECLARATION_VALUE_S - 180, 1
-[serif] DECLARATION_VALUE_IDENT - 181, 5
-[
-] S - 186, 2
-[}] RBRACE - 188, 1
-[
-
-] S - 189, 4
-[@page] PAGE - 193, 5
-[ ] S - 198, 1
-[:left] CSS_PAGE_SELECTOR - 199, 5
-[ ] S - 204, 1
-[{] LBRACE - 205, 1
-[ ] S - 206, 1
-[margin-left] DECLARATION_PROPERTY - 207, 11
-[ ] S - 218, 1
-[:] DECLARATION_SEPARATOR - 219, 1
-[ ] S - 220, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 221, 3
-[ ] S - 224, 1
-[}] RBRACE - 225, 1
-[
-
-] S - 226, 4
-[@media] MEDIA - 230, 6
-[ ] S - 236, 1
-[aural] MEDIUM - 237, 5
-[ ] S - 242, 1
-[{] LBRACE - 243, 1
-[
- ] S - 244, 3
-[P] SELECTOR_ELEMENT_NAME - 247, 1
-[.heidi] SELECTOR_CLASS - 248, 6
-[ ] S - 254, 1
-[{] LBRACE - 255, 1
-[
- ] S - 256, 4
-[azimuth] DECLARATION_PROPERTY - 260, 7
-[ ] S - 267, 1
-[:] DECLARATION_SEPARATOR - 268, 1
-[ ] S - 269, 1
-[center-left] DECLARATION_VALUE_IDENT - 270, 11
-[;] DECLARATION_DELIMITER - 281, 1
-[
- ] S - 282, 4
-[elevation] DECLARATION_PROPERTY - 286, 9
-[ ] S - 295, 1
-[:] DECLARATION_SEPARATOR - 296, 1
-[ ] S - 297, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 298, 7
-[;] DECLARATION_DELIMITER - 305, 1
-[
- ] S - 306, 4
-[pause] DECLARATION_PROPERTY - 310, 5
-[ ] S - 315, 1
-[:] DECLARATION_SEPARATOR - 316, 1
-[ ] S - 317, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 318, 4
-[ ] DECLARATION_VALUE_S - 322, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 323, 4
-[
- ] S - 327, 3
-[}] RBRACE - 330, 1
-[
-] S - 331, 2
-[}] RBRACE - 333, 1
-[
-] S - 334, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
deleted file mode 100644
index 5d5d2e6..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[ ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[ ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[ ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[ ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[ ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[ ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[ ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[ ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[ ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[ ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[ ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[ ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[ ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[ ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[ ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[ ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[ ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[ ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[ ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[ ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[ ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[ ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[ ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[ ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[ ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[ ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[ ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[ ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[ ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[ ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[ ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[ ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[ ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[ ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[ ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[ ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[ ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[ ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[ ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[ ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[ ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[ ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[ ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[ ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[ ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[ ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[ ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[ ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[ ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[ ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[ ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[ ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[ ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[ ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[ ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[ ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[ ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[ ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[ ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[ ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[ ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[ ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
deleted file mode 100644
index 5d5d2e6..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[ ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[ ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[ ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[ ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[ ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[ ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[ ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[ ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[ ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[ ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[ ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[ ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[ ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[ ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[ ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[ ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[ ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[ ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[ ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[ ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[ ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[ ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[ ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[ ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[ ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[ ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[ ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[ ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[ ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[ ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[ ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[ ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[ ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[ ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[ ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[ ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[ ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[ ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[ ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[ ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[ ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[ ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[ ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[ ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[ ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[ ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[ ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[ ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[ ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[ ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[ ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[ ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[ ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[ ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[ ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[ ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[ ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[ ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[ ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[ ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[ ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[ ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
deleted file mode 100644
index 82217c0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
+++ /dev/null
@@ -1,101 +0,0 @@
-[declaration] SELECTOR_ELEMENT_NAME - 0, 11
-[ ] S - 11, 1
-[{] LBRACE - 12, 1
-[
- ] S - 13, 3
-[dimension] DECLARATION_PROPERTY - 16, 9
-[ ] S - 25, 1
-[:] DECLARATION_SEPARATOR - 26, 1
-[ ] S - 27, 1
-[100ex] DECLARATION_VALUE_DIMENSION - 28, 5
-[;] DECLARATION_DELIMITER - 33, 1
-[
- ] S - 34, 3
-[function] DECLARATION_PROPERTY - 37, 8
-[ ] S - 45, 1
-[:] DECLARATION_SEPARATOR - 46, 1
-[ ] S - 47, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 48, 5
-[100] DECLARATION_VALUE_NUMBER - 53, 3
-[,] DECLARATION_VALUE_OPERATOR - 56, 1
-[ ] DECLARATION_VALUE_S - 57, 1
-[200] DECLARATION_VALUE_NUMBER - 58, 3
-[,] DECLARATION_VALUE_OPERATOR - 61, 1
-[ ] DECLARATION_VALUE_S - 62, 1
-[300] DECLARATION_VALUE_NUMBER - 63, 3
-[,] DECLARATION_VALUE_OPERATOR - 66, 1
-[ ] DECLARATION_VALUE_S - 67, 1
-[400] DECLARATION_VALUE_NUMBER - 68, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 71, 1
-[,] DECLARATION_VALUE_OPERATOR - 72, 1
-[ ] DECLARATION_VALUE_S - 73, 1
-[format(] DECLARATION_VALUE_FUNCTION - 74, 7
-["intellifont"] DECLARATION_VALUE_STRING - 81, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 94, 1
-[,] DECLARATION_VALUE_OPERATOR - 95, 1
-[ ] DECLARATION_VALUE_S - 96, 1
-[local(] DECLARATION_VALUE_FUNCTION - 97, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 103, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 132, 1
-[;] DECLARATION_DELIMITER - 133, 1
-[
- ] S - 134, 3
-[hash] DECLARATION_PROPERTY - 137, 4
-[ ] S - 141, 1
-[:] DECLARATION_SEPARATOR - 142, 1
-[ ] S - 143, 1
-[#aabbcc] DECLARATION_VALUE_HASH - 144, 7
-[;] DECLARATION_DELIMITER - 151, 1
-[
- ] S - 152, 3
-[ident] DECLARATION_PROPERTY - 155, 5
-[ ] S - 160, 1
-[:] DECLARATION_SEPARATOR - 161, 1
-[ ] S - 162, 1
-[any] DECLARATION_VALUE_IDENT - 163, 3
-[;] DECLARATION_DELIMITER - 166, 1
-[
- ] S - 167, 3
-[number] DECLARATION_PROPERTY - 170, 6
-[ ] S - 176, 1
-[:] DECLARATION_SEPARATOR - 177, 1
-[ ] S - 178, 1
-[99999] DECLARATION_VALUE_NUMBER - 179, 5
-[;] DECLARATION_DELIMITER - 184, 1
-[
- ] S - 185, 3
-[percentage] DECLARATION_PROPERTY - 188, 10
-[ ] S - 198, 1
-[:] DECLARATION_SEPARATOR - 199, 1
-[ ] S - 200, 1
-[100%] DECLARATION_VALUE_PERCENTAGE - 201, 4
-[;] DECLARATION_DELIMITER - 205, 1
-[
- ] S - 206, 3
-[string] DECLARATION_PROPERTY - 209, 6
-[ ] S - 215, 1
-[:] DECLARATION_SEPARATOR - 216, 1
-[ ] S - 217, 1
-["string"] DECLARATION_VALUE_STRING - 218, 8
-[;] DECLARATION_DELIMITER - 226, 1
-[
- ] S - 227, 3
-[unicode-range] DECLARATION_PROPERTY - 230, 13
-[ ] S - 243, 1
-[:] DECLARATION_SEPARATOR - 244, 1
-[ ] S - 245, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 246, 4
-[,] DECLARATION_VALUE_OPERATOR - 250, 1
-[ ] DECLARATION_VALUE_S - 251, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 252, 9
-[,] DECLARATION_VALUE_OPERATOR - 261, 1
-[ ] DECLARATION_VALUE_S - 262, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 263, 5
-[;] DECLARATION_DELIMITER - 268, 1
-[
-] S - 269, 2
-[}] RBRACE - 271, 1
-[
-] S - 272, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
deleted file mode 100644
index ffed5b2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
+++ /dev/null
@@ -1,583 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("../sample2.css")] URI - 34, 21
-[ ] S - 55, 1
-[projection] MEDIUM - 56, 10
-[,] MEDIA_SEPARATOR - 66, 1
-[ ] S - 67, 1
-[tv] MEDIUM - 68, 2
-[;] DELIMITER - 70, 1
-[
-
-] S - 71, 4
-[BODY] SELECTOR_ELEMENT_NAME - 75, 4
-[ ] S - 79, 1
-[{] LBRACE - 80, 1
-[
- ] S - 81, 6
-[color] DECLARATION_PROPERTY - 87, 5
-[ ] S - 92, 1
-[:] DECLARATION_SEPARATOR - 93, 1
-[ ] S - 94, 1
-[black] DECLARATION_VALUE_IDENT - 95, 5
-[;] DECLARATION_DELIMITER - 100, 1
-[
- ] S - 101, 6
-[text-align] DECLARATION_PROPERTY - 107, 10
-[ ] S - 117, 1
-[:] DECLARATION_SEPARATOR - 118, 1
-[ ] S - 119, 1
-[center] DECLARATION_VALUE_IDENT - 120, 6
-[;] DECLARATION_DELIMITER - 126, 1
-[
- ] S - 127, 6
-[background-color] DECLARATION_PROPERTY - 133, 16
-[ ] S - 149, 1
-[:] DECLARATION_SEPARATOR - 150, 1
-[ ] S - 151, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 152, 4
-[ ] DECLARATION_VALUE_S - 156, 1
-[181] DECLARATION_VALUE_NUMBER - 157, 3
-[,] DECLARATION_VALUE_OPERATOR - 160, 1
-[ ] DECLARATION_VALUE_S - 161, 1
-[253] DECLARATION_VALUE_NUMBER - 162, 3
-[,] DECLARATION_VALUE_OPERATOR - 165, 1
-[ ] DECLARATION_VALUE_S - 166, 1
-[211] DECLARATION_VALUE_NUMBER - 167, 3
-[ ] DECLARATION_VALUE_S - 170, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 171, 1
-[
-] S - 172, 2
-[}] RBRACE - 174, 1
-[
-
-] S - 175, 4
-[UL] SELECTOR_ELEMENT_NAME - 179, 2
-[ ] S - 181, 1
-[{] LBRACE - 182, 1
-[
- ] S - 183, 6
-[color] DECLARATION_PROPERTY - 189, 5
-[ ] S - 194, 1
-[:] DECLARATION_SEPARATOR - 195, 1
-[ ] S - 196, 1
-[black] DECLARATION_VALUE_IDENT - 197, 5
-[;] DECLARATION_DELIMITER - 202, 1
-[
- ] S - 203, 6
-[list-style-image] DECLARATION_PROPERTY - 209, 16
-[ ] S - 225, 1
-[:] DECLARATION_SEPARATOR - 226, 1
-[ ] S - 227, 1
-[url("images/l_a01.gif")] DECLARATION_VALUE_URI - 228, 23
-[;] DECLARATION_DELIMITER - 251, 1
-[
- ] S - 252, 6
-[list-style-position] DECLARATION_PROPERTY - 258, 19
-[ ] S - 277, 1
-[:] DECLARATION_SEPARATOR - 278, 1
-[ ] S - 279, 1
-[outside] DECLARATION_VALUE_IDENT - 280, 7
-[
-] S - 287, 2
-[}] RBRACE - 289, 1
-[
-
-] S - 290, 4
-[H1] SELECTOR_ELEMENT_NAME - 294, 2
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[
- ] S - 298, 6
-[color] DECLARATION_PROPERTY - 304, 5
-[ ] S - 309, 1
-[:] DECLARATION_SEPARATOR - 310, 1
-[ ] S - 311, 1
-[white] DECLARATION_VALUE_IDENT - 312, 5
-[;] DECLARATION_DELIMITER - 317, 1
-[
- ] S - 318, 6
-[text-align] DECLARATION_PROPERTY - 324, 10
-[ ] S - 334, 1
-[:] DECLARATION_SEPARATOR - 335, 1
-[ ] S - 336, 1
-[center] DECLARATION_VALUE_IDENT - 337, 6
-[;] DECLARATION_DELIMITER - 343, 1
-[
- ] S - 344, 6
-[border-left-color] DECLARATION_PROPERTY - 350, 17
-[ ] S - 367, 1
-[:] DECLARATION_SEPARATOR - 368, 1
-[ ] S - 369, 1
-[#996666] DECLARATION_VALUE_HASH - 370, 7
-[;] DECLARATION_DELIMITER - 377, 1
-[
- ] S - 378, 6
-[padding-top] DECLARATION_PROPERTY - 384, 11
-[ ] S - 395, 1
-[:] DECLARATION_SEPARATOR - 396, 1
-[ ] S - 397, 1
-[0px] DECLARATION_VALUE_DIMENSION - 398, 3
-[;] DECLARATION_DELIMITER - 401, 1
-[
- ] S - 402, 6
-[padding-right] DECLARATION_PROPERTY - 408, 13
-[ ] S - 421, 1
-[:] DECLARATION_SEPARATOR - 422, 1
-[ ] S - 423, 1
-[1cm] DECLARATION_VALUE_DIMENSION - 424, 3
-[;] DECLARATION_DELIMITER - 427, 1
-[
- ] S - 428, 6
-[padding-bottom] DECLARATION_PROPERTY - 434, 14
-[ ] S - 448, 1
-[:] DECLARATION_SEPARATOR - 449, 1
-[ ] S - 450, 1
-[2] DECLARATION_VALUE_NUMBER - 451, 1
-[;] DECLARATION_DELIMITER - 452, 1
-[
- ] S - 453, 6
-[padding-left] DECLARATION_PROPERTY - 459, 12
-[ ] S - 471, 1
-[:] DECLARATION_SEPARATOR - 472, 1
-[ ] S - 473, 1
-[3em] DECLARATION_VALUE_DIMENSION - 474, 3
-[;] DECLARATION_DELIMITER - 477, 1
-[
- ] S - 478, 6
-[border-style] DECLARATION_PROPERTY - 484, 12
-[ ] S - 496, 1
-[:] DECLARATION_SEPARATOR - 497, 1
-[ ] S - 498, 1
-[solid] DECLARATION_VALUE_IDENT - 499, 5
-[;] DECLARATION_DELIMITER - 504, 1
-[
- ] S - 505, 6
-[border-top-width] DECLARATION_PROPERTY - 511, 16
-[ ] S - 527, 1
-[:] DECLARATION_SEPARATOR - 528, 1
-[ ] S - 529, 1
-[4.5ex] DECLARATION_VALUE_DIMENSION - 530, 5
-[;] DECLARATION_DELIMITER - 535, 1
-[
- ] S - 536, 6
-[border-right-width] DECLARATION_PROPERTY - 542, 18
-[ ] S - 560, 1
-[:] DECLARATION_SEPARATOR - 561, 1
-[ ] S - 562, 1
-[5in] DECLARATION_VALUE_DIMENSION - 563, 3
-[;] DECLARATION_DELIMITER - 566, 1
-[
- ] S - 567, 6
-[border-bottom-width] DECLARATION_PROPERTY - 573, 19
-[ ] S - 592, 1
-[:] DECLARATION_SEPARATOR - 593, 1
-[ ] S - 594, 1
-[6.02mm] DECLARATION_VALUE_DIMENSION - 595, 6
-[;] DECLARATION_DELIMITER - 601, 1
-[
- ] S - 602, 6
-[border-left-width] DECLARATION_PROPERTY - 608, 17
-[ ] S - 625, 1
-[:] DECLARATION_SEPARATOR - 626, 1
-[ ] S - 627, 1
-[7] DECLARATION_VALUE_NUMBER - 628, 1
-[
-] S - 629, 2
-[}] RBRACE - 631, 1
-[
-
-] S - 632, 4
-[H1] SELECTOR_ELEMENT_NAME - 636, 2
-[:before] SELECTOR_PSEUDO - 638, 7
-[ ] S - 645, 1
-[{] LBRACE - 646, 1
-[
- ] S - 647, 6
-[content] DECLARATION_PROPERTY - 653, 7
-[ ] S - 660, 1
-[:] DECLARATION_SEPARATOR - 661, 1
-[ ] S - 662, 1
-["Chapter "] DECLARATION_VALUE_STRING - 663, 10
-[ ] DECLARATION_VALUE_S - 673, 1
-[counter(] DECLARATION_VALUE_FUNCTION - 674, 8
-[ ] DECLARATION_VALUE_S - 682, 1
-[chapter] DECLARATION_VALUE_IDENT - 683, 7
-[ ] DECLARATION_VALUE_S - 690, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 691, 1
-[ ] DECLARATION_VALUE_S - 692, 1
-[". "] DECLARATION_VALUE_STRING - 693, 4
-[;] DECLARATION_DELIMITER - 697, 1
-[
- ] S - 698, 6
-[counter-increment] DECLARATION_PROPERTY - 704, 17
-[ ] S - 721, 1
-[:] DECLARATION_SEPARATOR - 722, 1
-[ ] S - 723, 1
-[chapter] DECLARATION_VALUE_IDENT - 724, 7
-[;] DECLARATION_DELIMITER - 731, 1
-[
- ] S - 732, 6
-[counter-reset] DECLARATION_PROPERTY - 738, 13
-[ ] S - 751, 1
-[:] DECLARATION_SEPARATOR - 752, 1
-[ ] S - 753, 1
-[section] DECLARATION_VALUE_IDENT - 754, 7
-[
-] S - 761, 2
-[}] RBRACE - 763, 1
-[
-
-] S - 764, 4
-[IMG] SELECTOR_ELEMENT_NAME - 768, 3
-[:before] SELECTOR_PSEUDO - 771, 7
-[ ] S - 778, 1
-[{] LBRACE - 779, 1
-[content] DECLARATION_PROPERTY - 780, 7
-[ ] S - 787, 1
-[:] DECLARATION_SEPARATOR - 788, 1
-[ ] S - 789, 1
-[attr(] DECLARATION_VALUE_FUNCTION - 790, 5
-[alt] DECLARATION_VALUE_IDENT - 795, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 798, 1
-[}] RBRACE - 799, 1
-[
-
-] S - 800, 4
-[DIV] SELECTOR_ELEMENT_NAME - 804, 3
-[.sample] SELECTOR_CLASS - 807, 7
-[ ] S - 814, 1
-[{] LBRACE - 815, 1
-[
- ] S - 816, 6
-[font-family] DECLARATION_PROPERTY - 822, 11
-[ ] S - 833, 1
-[:] DECLARATION_SEPARATOR - 834, 1
-[ ] S - 835, 1
-["Robson Celtic"] DECLARATION_VALUE_STRING - 836, 15
-[,] DECLARATION_VALUE_OPERATOR - 851, 1
-[ ] DECLARATION_VALUE_S - 852, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 853, 10
-[;] DECLARATION_DELIMITER - 863, 1
-[
- ] S - 864, 6
-[position] DECLARATION_PROPERTY - 870, 8
-[ ] S - 878, 1
-[:] DECLARATION_SEPARATOR - 879, 1
-[ ] S - 880, 1
-[absolute] DECLARATION_VALUE_IDENT - 881, 8
-[;] DECLARATION_DELIMITER - 889, 1
-[
- ] S - 890, 6
-[left] DECLARATION_PROPERTY - 896, 4
-[ ] S - 900, 1
-[:] DECLARATION_SEPARATOR - 901, 1
-[ ] S - 902, 1
-[833.5pc] DECLARATION_VALUE_DIMENSION - 903, 7
-[;] DECLARATION_DELIMITER - 910, 1
-[
- ] S - 911, 6
-[top] DECLARATION_PROPERTY - 917, 3
-[ ] S - 920, 1
-[:] DECLARATION_SEPARATOR - 921, 1
-[ ] S - 922, 1
-[90%] DECLARATION_VALUE_PERCENTAGE - 923, 3
-[;] DECLARATION_DELIMITER - 926, 1
-[
- ] S - 927, 6
-[width] DECLARATION_PROPERTY - 933, 5
-[ ] S - 938, 1
-[:] DECLARATION_SEPARATOR - 939, 1
-[ ] S - 940, 1
-[100pt] DECLARATION_VALUE_DIMENSION - 941, 5
-[;] DECLARATION_DELIMITER - 946, 1
-[
- ] S - 947, 6
-[height] DECLARATION_PROPERTY - 953, 6
-[ ] S - 959, 1
-[:] DECLARATION_SEPARATOR - 960, 1
-[ ] S - 961, 1
-[110.777px] DECLARATION_VALUE_DIMENSION - 962, 9
-[;] DECLARATION_DELIMITER - 971, 1
-[
- ] S - 972, 6
-[clip] DECLARATION_PROPERTY - 978, 4
-[ ] S - 982, 1
-[:] DECLARATION_SEPARATOR - 983, 1
-[ ] S - 984, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 985, 5
-[ ] DECLARATION_VALUE_S - 990, 1
-[-5px] DECLARATION_VALUE_DIMENSION - 991, 4
-[,] DECLARATION_VALUE_OPERATOR - 995, 1
-[ ] DECLARATION_VALUE_S - 996, 1
-[80px] DECLARATION_VALUE_DIMENSION - 997, 4
-[,] DECLARATION_VALUE_OPERATOR - 1001, 1
-[ ] DECLARATION_VALUE_S - 1002, 1
-[130px] DECLARATION_VALUE_DIMENSION - 1003, 5
-[,] DECLARATION_VALUE_OPERATOR - 1008, 1
-[ ] DECLARATION_VALUE_S - 1009, 1
-[0px] DECLARATION_VALUE_DIMENSION - 1010, 3
-[ ] DECLARATION_VALUE_S - 1013, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1014, 1
-[
-] S - 1015, 2
-[}] RBRACE - 1017, 1
-[
-
-] S - 1018, 4
-[@font-face] FONT_FACE - 1022, 10
-[ ] S - 1032, 1
-[{] LBRACE - 1033, 1
-[
- ] S - 1034, 6
-[font-family] DECLARATION_PROPERTY - 1040, 11
-[ ] S - 1051, 1
-[:] DECLARATION_SEPARATOR - 1052, 1
-[ ] S - 1053, 1
-["Swiss 721"] DECLARATION_VALUE_STRING - 1054, 11
-[;] DECLARATION_DELIMITER - 1065, 1
-[
- ] S - 1066, 6
-[src] DECLARATION_PROPERTY - 1072, 3
-[ ] S - 1075, 1
-[:] DECLARATION_SEPARATOR - 1076, 1
-[ ] S - 1077, 1
-[url("swiss721t.pfr")] DECLARATION_VALUE_URI - 1078, 20
-[ ] DECLARATION_VALUE_S - 1098, 1
-[format(] DECLARATION_VALUE_FUNCTION - 1099, 7
-["intellifont"] DECLARATION_VALUE_STRING - 1106, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1119, 1
-[,] DECLARATION_VALUE_OPERATOR - 1120, 1
-[ ] DECLARATION_VALUE_S - 1121, 1
-[local(] DECLARATION_VALUE_FUNCTION - 1122, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 1128, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1157, 1
-[;] DECLARATION_DELIMITER - 1158, 1
-[
- ] S - 1159, 6
-[unicode-range] DECLARATION_PROPERTY - 1165, 13
-[ ] S - 1178, 1
-[:] DECLARATION_SEPARATOR - 1179, 1
-[ ] S - 1180, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 1181, 4
-[,] DECLARATION_VALUE_OPERATOR - 1185, 1
-[ ] DECLARATION_VALUE_S - 1186, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 1187, 9
-[,] DECLARATION_VALUE_OPERATOR - 1196, 1
-[ ] DECLARATION_VALUE_S - 1197, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 1198, 5
-[;] DECLARATION_DELIMITER - 1203, 1
-[
- ] S - 1204, 6
-[font-weight] DECLARATION_PROPERTY - 1210, 11
-[ ] S - 1221, 1
-[:] DECLARATION_SEPARATOR - 1222, 1
-[ ] S - 1223, 1
-[100] DECLARATION_VALUE_NUMBER - 1224, 3
-[,] DECLARATION_VALUE_OPERATOR - 1227, 1
-[ ] DECLARATION_VALUE_S - 1228, 1
-[200] DECLARATION_VALUE_NUMBER - 1229, 3
-[,] DECLARATION_VALUE_OPERATOR - 1232, 1
-[ ] DECLARATION_VALUE_S - 1233, 1
-[300] DECLARATION_VALUE_NUMBER - 1234, 3
-[,] DECLARATION_VALUE_OPERATOR - 1237, 1
-[ ] DECLARATION_VALUE_S - 1238, 1
-[400] DECLARATION_VALUE_NUMBER - 1239, 3
-[,] DECLARATION_VALUE_OPERATOR - 1242, 1
-[ ] DECLARATION_VALUE_S - 1243, 1
-[500] DECLARATION_VALUE_NUMBER - 1244, 3
-[
-] S - 1247, 2
-[}] RBRACE - 1249, 1
-[
-
-] S - 1250, 4
-[@page] PAGE - 1254, 5
-[ ] S - 1259, 1
-[:left] CSS_PAGE_SELECTOR - 1260, 5
-[ ] S - 1265, 1
-[{] LBRACE - 1266, 1
-[margin-left] DECLARATION_PROPERTY - 1267, 11
-[ ] S - 1278, 1
-[:] DECLARATION_SEPARATOR - 1279, 1
-[ ] S - 1280, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 1281, 3
-[}] RBRACE - 1284, 1
-[
-
-] S - 1285, 4
-[@media] MEDIA - 1289, 6
-[ ] S - 1295, 1
-[aural] MEDIUM - 1296, 5
-[ ] S - 1301, 1
-[{] LBRACE - 1302, 1
-[
- ] S - 1303, 6
-[H1] SELECTOR_ELEMENT_NAME - 1309, 2
-[,] SELECTOR_SEPARATOR - 1311, 1
-[ ] S - 1312, 1
-[H2] SELECTOR_ELEMENT_NAME - 1313, 2
-[,] SELECTOR_SEPARATOR - 1315, 1
-[ ] S - 1316, 1
-[H3] SELECTOR_ELEMENT_NAME - 1317, 2
-[,] SELECTOR_SEPARATOR - 1319, 1
-[ ] S - 1320, 1
-[H4] SELECTOR_ELEMENT_NAME - 1321, 2
-[,] SELECTOR_SEPARATOR - 1323, 1
-[ ] S - 1324, 1
-[H5] SELECTOR_ELEMENT_NAME - 1325, 2
-[,] SELECTOR_SEPARATOR - 1327, 1
-[ ] S - 1328, 1
-[H6] SELECTOR_ELEMENT_NAME - 1329, 2
-[ ] S - 1331, 1
-[{] LBRACE - 1332, 1
-[
- ] S - 1333, 10
-[voice-family] DECLARATION_PROPERTY - 1343, 12
-[ ] S - 1355, 1
-[:] DECLARATION_SEPARATOR - 1356, 1
-[ ] S - 1357, 1
-[paul] DECLARATION_VALUE_IDENT - 1358, 4
-[,] DECLARATION_VALUE_OPERATOR - 1362, 1
-[ ] DECLARATION_VALUE_S - 1363, 1
-[child] DECLARATION_VALUE_IDENT - 1364, 5
-[;] DECLARATION_DELIMITER - 1369, 1
-[
- ] S - 1370, 10
-[stress] DECLARATION_PROPERTY - 1380, 6
-[ ] S - 1386, 1
-[:] DECLARATION_SEPARATOR - 1387, 1
-[ ] S - 1388, 1
-[20] DECLARATION_VALUE_NUMBER - 1389, 2
-[;] DECLARATION_DELIMITER - 1391, 1
-[
- ] S - 1392, 10
-[richness] DECLARATION_PROPERTY - 1402, 8
-[ ] S - 1410, 1
-[:] DECLARATION_SEPARATOR - 1411, 1
-[ ] S - 1412, 1
-[90] DECLARATION_VALUE_NUMBER - 1413, 2
-[;] DECLARATION_DELIMITER - 1415, 1
-[
- ] S - 1416, 10
-[cue-before] DECLARATION_PROPERTY - 1426, 10
-[ ] S - 1436, 1
-[:] DECLARATION_SEPARATOR - 1437, 1
-[ ] S - 1438, 1
-[url("ping.au")] DECLARATION_VALUE_URI - 1439, 14
-[
- ] S - 1453, 6
-[}] RBRACE - 1459, 1
-[
- ] S - 1460, 6
-[P] SELECTOR_ELEMENT_NAME - 1466, 1
-[.heidi] SELECTOR_CLASS - 1467, 6
-[ ] S - 1473, 1
-[{] LBRACE - 1474, 1
-[
- ] S - 1475, 10
-[azimuth] DECLARATION_PROPERTY - 1485, 7
-[ ] S - 1492, 1
-[:] DECLARATION_SEPARATOR - 1493, 1
-[ ] S - 1494, 1
-[center-left] DECLARATION_VALUE_IDENT - 1495, 11
-[;] DECLARATION_DELIMITER - 1506, 1
-[
- ] S - 1507, 10
-[elevation] DECLARATION_PROPERTY - 1517, 9
-[ ] S - 1526, 1
-[:] DECLARATION_SEPARATOR - 1527, 1
-[ ] S - 1528, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 1529, 7
-[;] DECLARATION_DELIMITER - 1536, 1
-[
- ] S - 1537, 10
-[pause] DECLARATION_PROPERTY - 1547, 5
-[ ] S - 1552, 1
-[:] DECLARATION_SEPARATOR - 1553, 1
-[ ] S - 1554, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 1555, 4
-[ ] DECLARATION_VALUE_S - 1559, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 1560, 4
-[
- ] S - 1564, 6
-[}] RBRACE - 1570, 1
-[
- ] S - 1571, 6
-[P] SELECTOR_ELEMENT_NAME - 1577, 1
-[.peter] SELECTOR_CLASS - 1578, 6
-[ ] S - 1584, 1
-[{] LBRACE - 1585, 1
-[
- ] S - 1586, 10
-[azimuth] DECLARATION_PROPERTY - 1596, 7
-[ ] S - 1603, 1
-[:] DECLARATION_SEPARATOR - 1604, 1
-[ ] S - 1605, 1
-[right] DECLARATION_VALUE_IDENT - 1606, 5
-[;] DECLARATION_DELIMITER - 1611, 1
-[
- ] S - 1612, 10
-[elevation] DECLARATION_PROPERTY - 1622, 9
-[ ] S - 1631, 1
-[:] DECLARATION_SEPARATOR - 1632, 1
-[ ] S - 1633, 1
-[-0.36rad] DECLARATION_VALUE_DIMENSION - 1634, 8
-[;] DECLARATION_DELIMITER - 1642, 1
-[
- ] S - 1643, 10
-[pitch] DECLARATION_PROPERTY - 1653, 5
-[ ] S - 1658, 1
-[:] DECLARATION_SEPARATOR - 1659, 1
-[ ] S - 1660, 1
-[210Hz] DECLARATION_VALUE_DIMENSION - 1661, 5
-[
- ] S - 1666, 6
-[}] RBRACE - 1672, 1
-[
- ] S - 1673, 6
-[P] SELECTOR_ELEMENT_NAME - 1679, 1
-[.goat] SELECTOR_CLASS - 1680, 5
-[ ] S - 1685, 1
-[{] LBRACE - 1686, 1
-[
- ] S - 1687, 10
-[volume] DECLARATION_PROPERTY - 1697, 6
-[ ] S - 1703, 1
-[:] DECLARATION_SEPARATOR - 1704, 1
-[ ] S - 1705, 1
-[x-soft] DECLARATION_VALUE_IDENT - 1706, 6
-[;] DECLARATION_DELIMITER - 1712, 1
-[
- ] S - 1713, 10
-[elevation] DECLARATION_PROPERTY - 1723, 9
-[ ] S - 1732, 1
-[:] DECLARATION_SEPARATOR - 1733, 1
-[ ] S - 1734, 1
-[66grad] DECLARATION_VALUE_DIMENSION - 1735, 6
-[;] DECLARATION_DELIMITER - 1741, 1
-[
- ] S - 1742, 10
-[pitch] DECLARATION_PROPERTY - 1752, 5
-[ ] S - 1757, 1
-[:] DECLARATION_SEPARATOR - 1758, 1
-[ ] S - 1759, 1
-[0.17kHz] DECLARATION_VALUE_DIMENSION - 1760, 7
-[
- ] S - 1767, 6
-[}] RBRACE - 1773, 1
-[
-] S - 1774, 2
-[}] RBRACE - 1776, 1
-[
-
-] S - 1777, 4
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css
deleted file mode 100644
index 00dbff4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css
+++ /dev/null
@@ -1,22 +0,0 @@
-[a] SELECTOR_ELEMENT_NAME - 0, 1
-[.newWindow] SELECTOR_CLASS - 1, 10
-[ ] S - 11, 1
-[/* */] COMMENT - 12, 5
-[ ] S - 17, 1
-[{] LBRACE - 18, 1
-[
- ] S - 19, 6
-[background-image] DECLARATION_PROPERTY - 25, 16
-[:] DECLARATION_SEPARATOR - 41, 1
-[ ] S - 42, 1
-[url(../images/test.png)] DECLARATION_VALUE_URI - 43, 23
-[ ] DECLARATION_VALUE_S - 66, 1
-[!important] CSS_DECLARATION_VALUE_IMPORTANT - 67, 10
-[;] DECLARATION_DELIMITER - 77, 1
-[
-] S - 78, 2
-[}] RBRACE - 80, 1
-[
-] S - 81, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
deleted file mode 100644
index 3c89826..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
+++ /dev/null
@@ -1,8 +0,0 @@
-H1 {
-
- color: white
- ;
-
- background-color : black
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
deleted file mode 100644
index 5a4c4dd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 @import media6;
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-kuso
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
deleted file mode 100644
index e57ccc0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@import url("../sample2.css");
-
-/* Sample Styles */
-
-BODY {
- color : black;
- background-color : rgb(181, 253, 211);
- text-align : center;
- font-family : "Heisei Mincho W3", serif
-}
-
-@page :left { margin-left : 4cm }
-
-@media aural {
- P.heidi {
- azimuth : center-left;
- elevation : 12.3deg;
- pause : 30ms 1.6s
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
deleted file mode 100644
index d2de4f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 { font-family: sans-serif }
-h1 em { color: blue }
-div p *[href] { color: blue }
-body > P { line-height: 1.3 }
-div ol>li p { }
-math + p { text-indent: 0 }
-h1.opener + h2 { margin-top: -5mm }
-h1[title] { color: blue; }
-span[class=example] { color: blue; }
-span[hello="Cleveland"][goodbye="Columbus"] { color: blue; }
-a[rel~="copyright"] { color: blue }
-a[href="http://www.w3.org/"] { color: blue }
-*[lang=fr] { display : none }
-*[lang|="en"] { color : red }
-DIALOGUE[character=romeo]
-{ voice-family: "Lawrence Olivier", charles, male }
-DIALOGUE[ character = juliet ]
-{ voice-family: "Vivien Leigh", victoria, female }
-*.pastoral { color: green }
-.pastoral { color: green }
-H1.pastoral { color: green }
-p.pastoral.marine { color: green }
-h1#chapter1 { text-align: center }
-div > p:first-child { text-indent: 0 }
-p:first-child em { font-weight : bold }
-* > a:first-child { font-weight : bold }
-a:first-child { font-weight : bold }
-a.external:visited { color: blue }
-a:focus:hover { background: white }
-html:lang(fr) { quotes: '<<' '>>' }
-html:lang(de) { quotes: '>>' '<<' '\2039' '\203A' }
-:lang(fr) > Q { quotes: '<<' '>>' }
-:lang(de) > Q { quotes: '>>' '<<' '\2039' '\203A' }
-p:first-letter { font-size: 3em; font-weight: normal }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
deleted file mode 100644
index d2de4f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 { font-family: sans-serif }
-h1 em { color: blue }
-div p *[href] { color: blue }
-body > P { line-height: 1.3 }
-div ol>li p { }
-math + p { text-indent: 0 }
-h1.opener + h2 { margin-top: -5mm }
-h1[title] { color: blue; }
-span[class=example] { color: blue; }
-span[hello="Cleveland"][goodbye="Columbus"] { color: blue; }
-a[rel~="copyright"] { color: blue }
-a[href="http://www.w3.org/"] { color: blue }
-*[lang=fr] { display : none }
-*[lang|="en"] { color : red }
-DIALOGUE[character=romeo]
-{ voice-family: "Lawrence Olivier", charles, male }
-DIALOGUE[ character = juliet ]
-{ voice-family: "Vivien Leigh", victoria, female }
-*.pastoral { color: green }
-.pastoral { color: green }
-H1.pastoral { color: green }
-p.pastoral.marine { color: green }
-h1#chapter1 { text-align: center }
-div > p:first-child { text-indent: 0 }
-p:first-child em { font-weight : bold }
-* > a:first-child { font-weight : bold }
-a:first-child { font-weight : bold }
-a.external:visited { color: blue }
-a:focus:hover { background: white }
-html:lang(fr) { quotes: '<<' '>>' }
-html:lang(de) { quotes: '>>' '<<' '\2039' '\203A' }
-:lang(fr) > Q { quotes: '<<' '>>' }
-:lang(de) > Q { quotes: '>>' '<<' '\2039' '\203A' }
-p:first-letter { font-size: 3em; font-weight: normal }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
deleted file mode 100644
index ea73cea..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
+++ /dev/null
@@ -1,10 +0,0 @@
-declaration {
- dimension : 100ex;
- function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright");
- hash : #aabbcc;
- ident : any;
- number : 99999;
- percentage : 100%;
- string : "string";
- unicode-range : U+??, U+100-220, U+4??;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
deleted file mode 100644
index fd34729..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
+++ /dev/null
@@ -1,82 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("../sample2.css") projection, tv;
-
-BODY {
- color : black;
- text-align : center;
- background-color : rgb( 181, 253, 211 )
-}
-
-UL {
- color : black;
- list-style-image : url("images/l_a01.gif");
- list-style-position : outside
-}
-
-H1 {
- color : white;
- text-align : center;
- border-left-color : #996666;
- padding-top : 0px;
- padding-right : 1cm;
- padding-bottom : 2;
- padding-left : 3em;
- border-style : solid;
- border-top-width : 4.5ex;
- border-right-width : 5in;
- border-bottom-width : 6.02mm;
- border-left-width : 7
-}
-
-H1:before {
- content : "Chapter " counter( chapter ) ". ";
- counter-increment : chapter;
- counter-reset : section
-}
-
-IMG:before {content : attr(alt)}
-
-DIV.sample {
- font-family : "Robson Celtic", sans-serif;
- position : absolute;
- left : 833.5pc;
- top : 90%;
- width : 100pt;
- height : 110.777px;
- clip : rect( -5px, 80px, 130px, 0px )
-}
-
-@font-face {
- font-family : "Swiss 721";
- src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright");
- unicode-range : U+??, U+100-220, U+4??;
- font-weight : 100, 200, 300, 400, 500
-}
-
-@page :left {margin-left : 4cm}
-
-@media aural {
- H1, H2, H3, H4, H5, H6 {
- voice-family : paul, child;
- stress : 20;
- richness : 90;
- cue-before : url("ping.au")
- }
- P.heidi {
- azimuth : center-left;
- elevation : 12.3deg;
- pause : 30ms 1.6s
- }
- P.peter {
- azimuth : right;
- elevation : -0.36rad;
- pitch : 210Hz
- }
- P.goat {
- volume : x-soft;
- elevation : 66grad;
- pitch : 0.17kHz
- }
-}
-
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css
deleted file mode 100644
index 5d19a7c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css
+++ /dev/null
@@ -1,3 +0,0 @@
-a.newWindow /* */ {
- background-image: url(../images/test.png) !important;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
deleted file mode 100644
index cdf6bd5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.osgi.framework.Bundle;
-
-/**
- *
- */
-public class FileUtil {
- public static final String commonEOL = "\r\n";
-
- public static File createFile(String directory, String filename) throws IOException {
- Bundle bundle = Platform.getBundle("org.eclipse.wst.css.core.tests"); //$NON-NLS-1$
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
- URL totalURL = new URL(url, totalPath);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- return file;
- }
-
- // public static Reader createReader(File file) throws
- // FileNotFoundException {
- // return new FileReader(file);
- // }
- //
- // public static Reader createReader(String directory, String filename)
- // throws IOException {
- // File file = createFile(directory, filename);
- // return createReader(file);
- // }
-
- public static String createString(String directory, String filename) throws FileNotFoundException, IOException {
- StringBuffer buf = new StringBuffer();
- Reader fileReader = new FileReader(createFile(directory, filename));
- BufferedReader reader = new BufferedReader(fileReader);
- String line;
- while ((line = reader.readLine()) != null) {
- buf.append(line);
- buf.append(commonEOL);
- }
- return buf.toString();
- // return new DataInputStream(new
- // FileInputStream(createFile(directory, filename))).readUTF();
- }
-
- static int uniqueNum = 0;
-
- public static ICSSModel createModel() {
- IStructuredModel model = null;
- try {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test" + uniqueNum++ + ".css", new NullInputStream(), null); //$NON-NLS-1$
-
- // always use the same line delimiter for these tests, regardless
- // of plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return (ICSSModel) model;
-
- }
-
- public static void dumpString(String string, String directory, String filename) throws IOException {
- File file = createFile(directory, filename);
- Writer writer = new FileWriter(file);
- writer.write(string);
- writer.close();
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
deleted file mode 100644
index b4ee9e8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index d4b3723..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml
deleted file mode 100644
index d653a3d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.css.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.classpath b/tests/org.eclipse.wst.css.tests.encoding/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore b/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
deleted file mode 100644
index f8471d8..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-cssencodingtests.jar
-javaCompiler.cssencodingtests.jar.args
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.project b/tests/org.eclipse.wst.css.tests.encoding/.project
deleted file mode 100644
index ea358d5..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 6bca3e3..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding
-Bundle-Version: 1.0.301.qualifier
-Bundle-ClassPath: cssencodingtests.jar
-Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.tests.encoding,
- org.eclipse.wst.css.tests.encoding.css
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.tests.encoding/about.html b/tests/org.eclipse.wst.css.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties
deleted file mode 100644
index 3c69e51..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = cssencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = cssencodingtests.jar
-source.cssencodingtests.jar = src/
-output.cssencodingtests.jar = bin/
-
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties b/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
deleted file mode 100644
index 176c747..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = CSS Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
deleted file mode 100644
index 290d54b..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.tests.encoding.css.CSSEncodingTester;
-import org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester;
-import org.eclipse.wst.css.tests.encoding.css.TestContentTypeDetectionForCSS;
-
-public class CSSEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{CSSEncodingTester.class, CSSHeadTokenizerTester.class, TestContentTypeDetectionForCSS.class};
-
- public static Test suite() {
- return new CSSEncodingTestSuite();
- }
-
- public CSSEncodingTestSuite() {
- super("CSS Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public CSSEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public CSSEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public CSSEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
deleted file mode 100644
index da799c0..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static CSSEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.css.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CSSEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public CSSEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
deleted file mode 100644
index 94e48ca..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding.css;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class CSSEncodingTester extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "css/";
- // private final String pluginLocation =
- // TestsPlugin.getInstallLocation().toString();
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = CSSEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((CSSResourceEncodingDetector)detector).getEncodingMemento();
-
- String foundIANAEncoding = null;
-
- if (encodingMemento != null) {
- foundIANAEncoding = encodingMemento.getDetectedCharsetName();
- }
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- if (expectedIANAEncoding == null) {
- expectedIANAResult = expectedIANAEncoding == foundIANAEncoding;
- }
- else {
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
- }
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if
- // throws exception.
- if (foundIANAEncoding != null) {
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inputStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testBestCase() throws IOException {
- String filename = fileLocation + "nonStandard.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "emptyFile.css";
- doTestFileStream(filename, null, new CSSResourceEncodingDetector());
- }
-
- public void testEUCJP() throws IOException {
- String filename = fileLocation + "encoding_test_eucjp.css";
- doTestFileStream(filename, "EUC-JP", new CSSResourceEncodingDetector());
- }
-
- public void testJIS() throws IOException {
- String filename = fileLocation + "encoding_test_jis.css";
- doTestFileStream(filename, "ISO-2022-JP", new CSSResourceEncodingDetector());
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.css";
- doTestFileStream(filename, null, new CSSResourceEncodingDetector());
- }
-
- public void testnonStandardIllFormed() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
- }
-
- public void testnonStandardIllFormed2() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed2.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
- }
-
- public void testShiftJIS() throws IOException {
- String filename = fileLocation + "encoding_test_sjis.css";
- doTestFileStream(filename, "SHIFT_JIS", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.css";
- doTestFileStream(filename, "UTF-16BE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.css";
- doTestFileStream(filename, "UTF-16LE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16beMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.css";
- doTestFileStream(filename, "UTF-16BE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16leMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.css";
- doTestFileStream(filename, "UTF-16LE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.css";
- doTestFileStream(filename, "UTF-16", new CSSResourceEncodingDetector());
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
deleted file mode 100644
index d63f624..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.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.wst.css.tests.encoding.css;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer;
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizerConstants;
-import org.eclipse.wst.css.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-
-public class CSSHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fcharset;
- private final String fileDir = "css/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = this.fileHome + this.fileDir;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
- CSSHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (this.DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = CSSEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new CSSHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- throw e;
- }
-
- HeadParserToken resultToken = null;
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = this.fcharset;
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
- else {
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
- }
-
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType == null) {
- result = false;
- }
- else {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(CSSHeadTokenizer tokenizer) throws IOException {
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- if (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- this.fcharset = valueToken.getText();
-
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- finalToken = token;
- return finalToken;
-
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fcharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fcharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws IOException {
- String filename = this.fileLocation + "nonStandard.css";
- doTestFile(filename, "ISO-8859-6");
-
- }
-
- public void testEmptyFile() throws IOException {
- String filename = this.fileLocation + "emptyFile.css";
- doTestFile(filename, null);
- }
-
- public void _testEUCJP() throws IOException {
- String filename = this.fileLocation + "encoding_test_eucjp.css";
- doTestFile(filename, "EUC-JP");
- }
-
- public void testJIS() throws IOException {
- String filename = this.fileLocation + "encoding_test_jis.css";
- doTestFile(filename, "ISO-2022-JP");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = this.fileLocation + "noEncoding.css";
- doTestFile(filename, null);
- }
-
- public void testnonStandardIllFormed() throws IOException {
- String filename = this.fileLocation + "nonStandardIllFormed.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testnonStandardIllFormed2() throws IOException {
- String filename = this.fileLocation + "nonStandardIllFormed2.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void _testShiftJIS() throws IOException {
- String filename = this.fileLocation + "encoding_test_sjis.css";
- doTestFile(filename, "SHIFT_JIS");
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.css";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.css";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16beMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.css";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16leMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.css";
- doTestFile(filename, "UTF-16LE");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.yy_advance(CSSHeadTokenizer.java:337)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.primGetNextToken(CSSHeadTokenizer.java:470)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.getNextToken(CSSHeadTokenizer.java:229)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.parseHeader(CSSHeadTokenizerTester.java:88)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:52)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:31)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.testUTF16BOM(CSSHeadTokenizerTester.java:186)
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.css";
- doTestFile(filename, "UTF-16");
- }
- */
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
deleted file mode 100644
index c4144a7..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding.css;
-
-
-public interface EncodingParserConstants {
-
- final String EOF = "EOF"; //$NON-NLS-1$
- final String InvalidTerminatedStringValue = "InvalidTerminatedStringValue"; //$NON-NLS-1$
- final String InvalidTermintatedUnDelimitedStringValue = "InvalidTermintatedUnDelimitedStringValue"; //$NON-NLS-1$
- final String MAX_CHARS_REACHED = "MAX_CHARS_REACHED"; //$NON-NLS-1$
- final String StringValue = "strval"; //$NON-NLS-1$
- final String UnDelimitedStringValue = "UnDelimitedStringValue"; //$NON-NLS-1$
- public final String UTF16BE = "UTF16BE"; //$NON-NLS-1$
- public final String UTF16LE = "UTF16LE"; //$NON-NLS-1$
-
-
- public final String UTF83ByteBOM = "UTF83ByteBOM"; //$NON-NLS-1$
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
deleted file mode 100644
index 515d159..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.css.tests.encoding.css;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForCSS extends TestContentTypeDetection {
- public void testFile7() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile1001() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile1002() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile1003() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_sjis.css", null);
- }
-
-
- public void testFile5() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
- public void testUTF16be() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16be.css", null);
- }
-
- public void testUTF16le() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16le.css", null);
- }
-
- public void testUTF16beMalformed() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16beMalformed.css", null);
- }
-
- public void testUTF16leMalformed() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16leMalformed.css", null);
- }
-
- public void testUTF16BOM() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16BOM.css", null);
- }
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml
deleted file mode 100644
index 8d65337..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.css.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
- font-family : "£Í£Ó £Ð¥´¥·¥Ã¥¯";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768b..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
- font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
- font-family : "lr oSVbN";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
- font-family: "Times New Roman", "MS Sans Serif";
- text-decoration: none;
- background-color: white;
-}
-
-TD {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- text-align: left;
-}
-
-TH {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: left;
-}
-
-H1 {
- font-family: "Times New Roman";
- font-size: 14pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: center
-}
-
-H2 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder
-}
-
-H3 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: italic
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997eb..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1f..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
deleted file mode 100644
index 724db8b..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css
deleted file mode 100644
index f8c05d5..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css
deleted file mode 100644
index d8527c1..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css
deleted file mode 100644
index 6c94ffb..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css
deleted file mode 100644
index c7dd678..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.ui.tests/.classpath b/tests/org.eclipse.wst.css.ui.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.css.ui.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.wst.css.ui.tests/.cvsignore b/tests/org.eclipse.wst.css.ui.tests/.cvsignore
deleted file mode 100644
index fb621e7..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.wst.css.ui.tests_1.0.0.jar
-cssuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.wst.css.ui.tests/.project b/tests/org.eclipse.wst.css.ui.tests/.project
deleted file mode 100644
index d41d16c..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.css.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.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.css.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.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.css.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.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.css.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.wst.css.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.css.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.wst.css.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 55c1497..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.ui.tests
-Bundle-Version: 1.0.200.qualifier
-Bundle-Activator: org.eclipse.wst.css.ui.tests.CSSUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.ui.tests,
- org.eclipse.wst.css.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.css.core,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.eclipse.ui.editors,
- org.eclipse.wst.sse.core,
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-ClassPath: cssuitests.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.ui.tests/about.html b/tests/org.eclipse.wst.css.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.css.ui.tests/build.properties b/tests/org.eclipse.wst.css.ui.tests/build.properties
deleted file mode 100644
index a997770..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
- cssuitests.jar,\
- about.html,\
- src/,\
- test.xml,\
- plugin.properties
-jars.compile.order = cssuitests.jar
-source.cssuitests.jar = src/
-output.cssuitests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.ui.tests/plugin.properties b/tests/org.eclipse.wst.css.ui.tests/plugin.properties
deleted file mode 100644
index 81436bb..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.ui.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = CSS UI Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
deleted file mode 100644
index e1bef5c..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.ui.tests.viewer.TestViewerConfigurationCSS;
-
-public class CSSUITestSuite extends TestSuite {
- public static Test suite() {
- return new CSSUITestSuite();
- }
-
- public CSSUITestSuite() {
- super("CSS UI Test Suite");
- addTest(new TestSuite(ExistenceTest.class, "CSS UI Existence Test"));
- addTest(new TestSuite(TestViewerConfigurationCSS.class));
- addTest(new TestSuite(TestEditorConfigurationCSS.class));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java
deleted file mode 100644
index 21f0f04..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSUITestsPlugin extends AbstractUIPlugin {
-
- //The shared instance.
- private static CSSUITestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public CSSUITestsPlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSUITestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.css.ui.tests", path);
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
deleted file mode 100644
index 893127f..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-
-/**
- *
- * @since 1.0
- */
-public class ExistenceTest extends TestCase {
- /**
- * tests if CSSUIPlugin can be loaded
- */
- public void testExists() {
- Plugin p = CSSUIPlugin.getDefault();
- assertNotNull("couldn't load CSS UI plugin", p);
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java
deleted file mode 100644
index 65ad4c9..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java
+++ /dev/null
@@ -1,54 +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.wst.css.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.views.contentoutline.CSSContentOutlineConfiguration;
-import org.eclipse.wst.css.ui.views.properties.CSSPropertySheetConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-
-/**
- * Tests retrieving editor contributions for css content type
- */
-public class TestEditorConfigurationCSS extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), StructuredTextViewerConfigurationCSS.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
- assertNotNull("no content outline configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), CSSContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), CSSPropertySheetConfiguration.class);
- }
-
- public void testGetDocumentationTextHover() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, ICSSPartitions.STYLE);
- assertNull("unexpected documentation text hover for " + ICSSPartitions.STYLE, o);
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java
deleted file mode 100644
index 0a0f2d4..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class TestViewerConfigurationCSS extends TestCase {
-
- private StructuredTextViewerConfigurationCSS fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationCSS() {
- super("TestViewerConfigurationCSS");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationCSS();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, ICSSPartitions.STYLE);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length > 0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 1);
- }
-
- /*
- * not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNotNull("there is no content formatter", cf);
- }
-
- /*
- * not necessary
- */
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if (strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- /*
- * not necessary
- */
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 0);
- }
-
- public void testGetIndentPrefixes() {
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
- if (prefixes != null) {
- return;
- }
- }
- assertTrue("there are no configured indent prefixes", false);
- }
-
- /*
- * not necessary
- */
- public void testGetInformationControlCreator() {
- // probably no display
- if (!fDisplayExists)
- return;
-
- IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("InformationControlCreator is null", infoCreator);
- }
-
- /*
- * not necessary
- */
- public void testGetInformationPresenter() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter is null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if (providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /*
- * not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler not null", r);
- }
-
- /*
- * not necessary
- */
- public void testGetTextHover() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{ICSSPartitions.STYLE};
- for (int i = 0; i < hoverPartitions.length; i++) {
- ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
- assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/test.xml b/tests/org.eclipse.wst.css.ui.tests/test.xml
deleted file mode 100644
index f55274d..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.css.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.css.ui.tests.CSSUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.classpath b/tests/org.eclipse.wst.dtd.core.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.cvsignore b/tests/org.eclipse.wst.dtd.core.tests/.cvsignore
deleted file mode 100644
index 59ab8ce..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-dtduitests.jar
-temp.folder
-javaCompiler.dtduitests.jar.args
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.project b/tests/org.eclipse.wst.dtd.core.tests/.project
deleted file mode 100644
index b31364f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.dtd.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e6b700e..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 14 17:56:18 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 837fad1..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.dtd.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: dtdcoretests.jar
-Bundle-Activator: org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.core.tests,
- org.eclipse.wst.dtd.core.tests.internal;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.wst.dtd.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.ui,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- com.ibm.icu,
- org.eclipse.emf.ecore
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.dtd.core.tests/about.html b/tests/org.eclipse.wst.dtd.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/build.properties b/tests/org.eclipse.wst.dtd.core.tests/build.properties
deleted file mode 100644
index d4984f1..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.dtdcoretests.jar = src/
-output.dtdcoretests.jar = bin/
-bin.includes = dtdcoretests.jar,\
- resources/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.dtd.core.tests/plugin.properties b/tests/org.eclipse.wst.dtd.core.tests/plugin.properties
deleted file mode 100644
index f069952..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.dtd.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = DTD Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd b/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd
deleted file mode 100644
index 1bb300f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- line one -->
-<!-- line two -->
-<!ELEMENT something ANY>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
deleted file mode 100644
index 6d7a202..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class DTDCoreTestSuite extends TestSuite {
- public DTDCoreTestSuite() {
- super("DTD Core TestSuite");
- addTest(new TestSuite(VerifyPlugin.class));
- addTest(new TestSuite(DTDParserTest.class));
- }
- public static Test suite() {
- return new DTDCoreTestSuite();
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java
deleted file mode 100644
index 8a05344..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDUtil;
-import org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin;
-
-public class DTDParserTest extends TestCase {
-
- private static final String UNEXPECTED_FILE_CONTENTS = "Unexpected file contents";
-
- public void testMultipleCommentParsing() throws IOException {
- DTDUtil util = new DTDUtil();
- String sampleDTDpath = "/resources/dtdParserTest/sample.dtd";
- URL bundleURL = DTDCoreTestsPlugin.getDefault().getBundle().getEntry(sampleDTDpath);
- assertNotNull(sampleDTDpath + " not found in bundle", bundleURL);
- // Do not rely on Common URI Resolver to find the contents
- URL fileURL = FileLocator.toFileURL(bundleURL);
- util.parse(fileURL.toExternalForm());
- DTDFile dtdFile = util.getDTDFile();
- assertEquals(UNEXPECTED_FILE_CONTENTS, 1, dtdFile.getDTDContent().size());
- Object object = dtdFile.getDTDContent().get(0);
- assertTrue(UNEXPECTED_FILE_CONTENTS, object instanceof DTDElement);
- DTDElement dtdElement = (DTDElement) object;
- String comment = dtdElement.getComment();
- assertEquals("Comment value was not as expected", " line one \n line two ", comment);
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java
deleted file mode 100644
index 876bc13..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
-
-
-public class VerifyPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Object plugin = null;
- try {
- plugin = DTDCorePlugin.getPlugin();
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("DTD core plugin could not be instantiated", plugin);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java
deleted file mode 100644
index 0398e3c..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-public class DTDCoreTestsPlugin extends Plugin {
-
- private static DTDCoreTestsPlugin plugin;
-
- public static DTDCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- public DTDCoreTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- plugin = this;
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/test.xml b/tests/org.eclipse.wst.dtd.core.tests/test.xml
deleted file mode 100644
index f70eb30..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.dtd.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.dtd.core.tests.DTDCoreTestSuite" />
- <!-- Some of the DTD model references UI objects, like Images -->
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.classpath b/tests/org.eclipse.wst.dtd.ui.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore b/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
deleted file mode 100644
index 59ab8ce..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-dtduitests.jar
-temp.folder
-javaCompiler.dtduitests.jar.args
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.project b/tests/org.eclipse.wst.dtd.ui.tests/.project
deleted file mode 100644
index f497e03..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.dtd.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.dtd.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.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.dtd.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.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index feeb98b..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.dtd.ui.tests
-Bundle-Version: 1.0.200.qualifier
-Bundle-ClassPath: dtduitests.jar
-Bundle-Activator: org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.ui.tests,
- org.eclipse.wst.dtd.ui.tests.internal;x-internal:=true,
- org.eclipse.wst.dtd.ui.tests.viewer
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.resources,
- org.eclipse.wst.dtd.core,
- org.eclipse.wst.dtd.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/about.html b/tests/org.eclipse.wst.dtd.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/build.properties b/tests/org.eclipse.wst.dtd.ui.tests/build.properties
deleted file mode 100644
index e1638e5..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.dtduitests.jar = src/
-output.dtduitests.jar = bin/
-bin.includes = dtduitests.jar,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties b/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties
deleted file mode 100644
index c8b5203..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.dtd.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = DTD UI Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
deleted file mode 100644
index e330ee8..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class DTDUIPreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.dtd.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);
- }
- }
-
- /**
- * 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 = DTDUIPlugin.getDefault().getPreferenceStore();
- assertNotNull("dtd preference store was null", store);
- }
-
- /**
- * 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() {
- //ISSUE: this does NOT use SET
- IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
- assertNotNull("dtd preference store was null", store);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
deleted file mode 100644
index 7710a54..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.dtd.ui.tests.viewer.TestViewerConfigurationDTD;
-
-
-
-public class DTDUITestSuite extends TestSuite {
- public static Test suite() {
- return new DTDUITestSuite();
- }
-
- public DTDUITestSuite() {
- super("DTD UI TestSuite");
- addTest(new TestSuite(VerifyUIPlugin.class));
- addTest(new TestSuite(DTDUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationDTD.class));
- addTest(new TestSuite(TestEditorConfigurationDTD.class));
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java
deleted file mode 100644
index 140883f..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java
+++ /dev/null
@@ -1,44 +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.wst.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.core.text.IDTDPartitions;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.views.contentoutline.DTDContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-
-/**
- * Tests retrieving editor contributions for dtd content type
- */
-public class TestEditorConfigurationDTD extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForDTD.ContentTypeID_DTD);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o.getClass(), StructuredTextViewerConfigurationDTD.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForDTD.ContentTypeID_DTD);
- assertNotNull("no content outline configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o.getClass(), DTDContentOutlineConfiguration.class);
- }
-
- public void testGetDocumentationTextHover() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IDTDPartitions.DTD_DEFAULT);
- assertNull("unexpected documentation text hover for " + IDTDPartitions.DTD_DEFAULT, o);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
deleted file mode 100644
index f65dade..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-
-public class VerifyUIPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Plugin plugin = null;
- try {
- plugin = DTDUIPlugin.getDefault();
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("editor plugin could not be instantiated", plugin);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
deleted file mode 100644
index 14ed0ca..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.dtd.ui.tests.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DTDUITestsPlugin extends Plugin {
- // The shared instance.
- private static DTDUITestsPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public DTDUITestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static DTDUITestsPlugin 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 = DTDUITestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.dtd.ui.tests.internal.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java
deleted file mode 100644
index fbd789e..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/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.wst.dtd.ui.tests.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.dtd.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.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
deleted file mode 100644
index 39ee842..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.dtd.core.text.IDTDPartitions;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.tests.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class TestViewerConfigurationDTD extends TestCase {
-
- private StructuredTextViewerConfigurationDTD fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationDTD() {
- super("TestViewerConfigurationDTD");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationDTD();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IDTDPartitions.DTD_DEFAULT);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length > 0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 1);
- }
-
- /**
- * Not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- /**
- * Not necessary
- */
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if (strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if(providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler is null", r);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
deleted file mode 100644
index 383db12..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
+++ /dev/null
@@ -1,493 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestDTD extends ViewPart {
- /**
- * Sets the viewer's highlighting text range to the text range indicated
- * by the selected Nodes.
- */
- protected class NodeRangeSelectionListener implements ISelectionChangedListener {
- public void selectionChanged(SelectionChangedEvent event) {
- if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
- IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- else {
- fSourceViewer.resetVisibleRegion();
- }
- }
- }
-
- protected class NumberInputDialog extends Dialog {
- public Text length;
-
- int lengthValue;
- public Text start;
- int startValue;
-
- public NumberInputDialog(Shell shell) {
- super(shell);
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(composite, SWT.NULL);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- container.setLayout(new GridLayout(2, true));
- setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
- Label label = new Label(container, SWT.NULL);
- label.setText("Start");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- label = new Label(container, SWT.NULL);
- label.setText("Length");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- start = new Text(container, SWT.BORDER);
- startValue = fSourceViewer.getVisibleRegion().getOffset();
- start.setText("" + startValue);
- start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- length = new Text(container, SWT.BORDER);
- lengthValue = fSourceViewer.getVisibleRegion().getLength();
- length.setText("" + lengthValue);
- length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // start.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == start) {
- // try {
- // startValue = Integer.decode(start.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // startValue = 0;
- // }
- // }
- // }
- // });
- // length.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == length) {
- // try {
- // lengthValue = Integer.decode(length.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // lengthValue = 0;
- // }
- // }
- // }
- // });
-
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- protected void okPressed() {
- try {
- startValue = Integer.decode(start.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- startValue = 0;
- }
- try {
- lengthValue = Integer.decode(length.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- lengthValue = 0;
- }
- super.okPressed();
- }
- }
-
- private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n <HEAD>\n <META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n <TITLE>place title here</TITLE>\n </HEAD>\n <BODY>\n place content here \n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
- private StructuredTextViewerConfiguration fConfig = null;
- private IContentOutlinePage fContentOutlinePage = null;
- private ISelectionChangedListener fHighlightRangeListener = null;
-
- private StructuredTextViewer fSourceViewer = null;
-
-
- private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
-
- protected void addActions(IContributionManager mgr) {
- if (mgr != null) {
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "New HTML";
- }
-
- public void run() {
- super.run();
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- setupViewerForNew();
- fSourceViewer.setEditable(true);
- }
- });
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility";
- }
-
- public void run() {
- super.run();
- NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All";
- }
-
- public void run() {
- super.run();
- fSourceViewer.resetVisibleRegion();
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- sourceViewer.resetVisibleRegion();
- sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- sourceViewer.resetVisibleRegion();
- }
- }
- });
- mgr.add(new Separator());
- // no longer able to set fInput to NULL
- // mgr.add(new Action() {
- // public String getText() {
- // return getToolTipText();
- // }
- //
- // public String getToolTipText() {
- // return "Set Input to NULL";
- // }
- // public void run() {
- // super.run();
- // viewer.setInput(null);
- // }
- // });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input from Active Editor";
- }
-
- public void run() {
- super.run();
- ITextEditor textEditor = getActiveEditor();
- if (textEditor != null) {
- setupViewerForEditor(textEditor);
- fSourceViewer.setEditable(true);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(true);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection As ReadOnly";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(false);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Stop Following Selection";
- }
-
- public void run() {
- super.run();
- stopFollowSelection();
- }
- });
- }
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
- */
- public void createPartControl(Composite parent) {
- IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
- addActions(mgr);
-
- // create source viewer & its content type-specific viewer
- // configuration
- fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationDTD();
-
- // set up the viewer with a document & viewer config
- setupViewerForNew();
-
- setupViewerPreferences();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- stopFollowSelection();
- fSourceViewer.unconfigure();
- }
-
- /**
- * Hooks up the viewer to follow the fSelection made in the active editor
- */
- private void followSelection() {
- ITextEditor editor = getActiveEditor();
- if (editor != null) {
- setupViewerForEditor(editor);
- if (fHighlightRangeListener == null)
- fHighlightRangeListener = new NodeRangeSelectionListener();
-
- fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
- if (fContentOutlinePage != null) {
- fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
- if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
- fSourceViewer.resetVisibleRegion();
-
- Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
- IndexedRegion startNode = (IndexedRegion) nodes[0];
- IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- }
- }
- }
-
- /**
- * Returns the current active text editor if possible
- *
- * @return ITextEditor
- */
- private ITextEditor getActiveEditor() {
- ITextEditor editor = null;
- IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editorPart instanceof ITextEditor)
- editor = (ITextEditor) editorPart;
- if (editor == null && editorPart != null)
- editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
- return editor;
- }
-
- /**
- * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
- */
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
- fSourceViewer.getControl().setFocus();
- }
-
- /**
- * Sets up the viewer with the same document/fInput as the given editor
- *
- * @param ITextEditor
- * editor - the editor to use *cannot to be null*
- */
- private void setupViewerForEditor(ITextEditor editor) {
- stopFollowSelection(); // if was following fSelection, stop
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- fSourceViewer.setDocument(doc);
-
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(new StructuredTextViewerConfigurationDTD());
- }
-
- /**
- * Set up source viewer with a new document & configure it
- */
- private void setupViewerForNew() {
- stopFollowSelection(); // if was following fSelection, stop
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForDTD.ContentTypeID_DTD);
- doc.set(DEFAULT_VIEWER_CONTENTS);
-
- fSourceViewer.setDocument(doc);
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(fConfig);
- }
-
- /**
- * Set up source viewer with any additional preferences it should have Ex:
- * font, tab width
- */
- private void setupViewerPreferences() {
- fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
- }
-
- /**
- * Cease following the fSelection made in the editor
- */
- private void stopFollowSelection() {
- if (fContentOutlinePage != null) {
- fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
- fSourceViewer.resetVisibleRegion();
- fContentOutlinePage = null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/test.xml b/tests/org.eclipse.wst.dtd.ui.tests/test.xml
deleted file mode 100644
index 9cbf4b6..0000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.dtd.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.dtd.ui.tests.DTDUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/.classpath b/tests/org.eclipse.wst.html.core.tests/.classpath
deleted file mode 100644
index be6fbf4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src" />
- <classpathentry kind="con"
- path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4" >
- <accessrules>
- <accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
- <accessrule kind="accessible" pattern="org/w3c/dom/stylesheets/**/*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin" />
-</classpath>
diff --git a/tests/org.eclipse.wst.html.core.tests/.cvsignore b/tests/org.eclipse.wst.html.core.tests/.cvsignore
deleted file mode 100644
index 8fde234..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-htmlcoretests.jar
-temp.folder
-javaCompiler.htmlcoretests.jar.args
diff --git a/tests/org.eclipse.wst.html.core.tests/.project b/tests/org.eclipse.wst.html.core.tests/.project
deleted file mode 100644
index 25bb240..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.html.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index df9584e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5434ec5..0000000
--- a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.core.tests;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-ClassPath: htmlcoretests.jar
-Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.core.tests,
- org.eclipse.wst.html.core.tests.format,
- org.eclipse.wst.html.core.tests.format.testfiles.html,
- org.eclipse.wst.html.core.tests.misc,
- org.eclipse.wst.html.core.tests.model,
- org.eclipse.wst.html.core.tests.parser,
- org.eclipse.wst.html.core.tests.parser.css,
- org.eclipse.wst.html.core.tests.text,
- org.eclipse.wst.html.core.tests.text.testfiles.html,
- org.eclipse.wst.html.core.tests.utils
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.core,
- com.ibm.icu,
- org.eclipse.core.resources
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
deleted file mode 100644
index b67db18..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest
-Source :
-<a href="<%=c%>">a</a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a href=")
-[9, 10] (<)
-[10, 12] (%=)
-[12, 13] (c)
-[13, 14] (%)
-[14, 18] (>">a)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a href=")@[18, 22] (</a>)
-----#text(<%=c%>">a)@{[9, 10] (<),[10, 12] (%=),[12, 13] (c),[13, 14] (%),[14, 18] (>">a)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
deleted file mode 100644
index 7962c61..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest2
-Source :
-<a b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 15] (<a b="c" d="e">)
-[15, 16] (f)
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 15] (<a b="c" d="e">)@[16, 20] (</a>)
-----#text(f)@[15, 16] (f)
-
-b.name=x:b
-b.value=c
-a b=null
-a x:b=c
-Source :
-<a x:b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 17] (<a x:b="c" d="e">)
-[17, 18] (f)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 17] (<a x:b="c" d="e">)@[18, 22] (</a>)
-----#text(f)@[17, 18] (f)
-
-Source :
-<a x:b="c" y:d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 19] (<a x:b="c" y:d="e">)
-[19, 20] (f)
-[20, 24] (</a>)
-
-Tree :
-#document
---a/a@[0, 19] (<a x:b="c" y:d="e">)@[20, 24] (</a>)
-----#text(f)@[19, 20] (f)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
deleted file mode 100644
index 8deb571..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
deleted file mode 100644
index 8ef86ab..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest2
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
deleted file mode 100644
index c7cc121..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest3
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new < content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new < content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new < content)@[3, 28] (<![CDATA[new < content]]>)
-
-new < content
-Source :
-<a><![CDATA[new > content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new > content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new > content)@[3, 28] (<![CDATA[new > content]]>)
-
-new > content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
deleted file mode 100644
index 2cca97b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.DocTypeTest
-Source :
-<!DOCTYPE HTML><html></html>
-
-
-StructuredDocument Regions :
-[0, 15] (<!DOCTYPE HTML>)
-[15, 21] (<html>)
-[21, 28] (</html>)
-
-Tree :
-#document
---HTML(null)(null)@[0, 15] (<!DOCTYPE HTML>)
---html/html@[15, 21] (<html>)@[21, 28] (</html>)
-
-Source :
-<!DOCTYPE HTML SYSTEM "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 30] (<!DOCTYPE HTML SYSTEM "sytem">)
-[30, 36] (<html>)
-[36, 43] (</html>)
-
-Tree :
-#document
---HTML(null)(sytem)@[0, 30] (<!DOCTYPE HTML SYSTEM "sytem">)
---html/html@[30, 36] (<html>)@[36, 43] (</html>)
-
-Source :
-<!DOCTYPE HTML PUBLIC "public" "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 39] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
-[39, 45] (<html>)
-[45, 52] (</html>)
-
-Tree :
-#document
---HTML(public)(sytem)@[0, 39] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
---html/html@[39, 45] (<html>)@[45, 52] (</html>)
-
-Source :
- <!DOCTYPE HTML PUBLIC "public" "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 1] ( )
-[1, 40] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
-[40, 46] (<html>)
-[46, 53] (</html>)
-
-Tree :
-#document
---#text( )@[0, 1] ( )
---HTML(public)(sytem)@[1, 40] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
---html/html@[40, 46] (<html>)@[46, 53] (</html>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt
deleted file mode 100644
index ffcd826..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest
-Source :
-<a><b e="f" c="d"><g /><h /></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 18] (<b e="f" c="d">)
-[18, 23] (<g />)
-[23, 28] (<h />)
-[28, 32] (</b>)
-[32, 36] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[32, 36] (</a>)
-----b/b@[3, 18] (<b e="f" c="d">)@[28, 32] (</b>)
-------g/@[18, 23] (<g />)
-------h/@[23, 28] (<h />)
-
-Source :
-<a><i e="f" c="d"><g /><h /></i></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 18] (<i e="f" c="d">)
-[18, 23] (<g />)
-[23, 28] (<h />)
-[28, 32] (</i>)
-[32, 36] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[32, 36] (</a>)
-----i/i@[3, 18] (<i e="f" c="d">)@[28, 32] (</i>)
-------g/@[18, 23] (<g />)
-------h/@[23, 28] (<h />)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt
deleted file mode 100644
index 9d46091..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest2
-Source :
-<a><b>c</b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 7] (c)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(c)@[6, 7] (c)
-
-a.tagName=x:a
-Source :
-<x:a><b>c</b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[13, 19] (</x:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-Source :
-<x:a><y:b>c</y:b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 10] (<y:b>)
-[10, 11] (c)
-[11, 17] (</y:b>)
-[17, 23] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[17, 23] (</x:a>)
-----y:b/y:b@[5, 10] (<y:b>)@[11, 17] (</y:b>)
-------#text(c)@[10, 11] (c)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt
deleted file mode 100644
index b5dabf4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest3
-Source :
-<x:a><b>c</b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[13, 19] (</x:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-a.tagName=a
-Source :
-<a><b>c</b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 7] (c)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(c)@[6, 7] (c)
-
-a.tagName=y:a
-Source :
-<y:a><b>c</b></y:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<y:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</y:a>)
-
-Tree :
-#document
---y:a/y:a@[0, 5] (<y:a>)@[13, 19] (</y:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-Source :
-<y:a><b>c</b></y:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<y:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</y:a>)
-
-Tree :
-#document
---y:a/y:a@[0, 5] (<y:a>)@[13, 19] (</y:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt
deleted file mode 100644
index 5ecafe9..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest
-Source :
-<p>a<br></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text()
-
-Source :
-<p>a<br></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text()
-----#text()
-
-Source :
-<p>a<br>b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 9] (b)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text(b)@[8, 9] (b)
-----#text()
-
-Source :
-<p>a<br>b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 9] (b)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text(b)@[8, 9] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt
deleted file mode 100644
index 5386efb..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest2
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p><b></b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (<b>)
-[6, 10] (</b>)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----b/b@[3, 6] (<b>)@[6, 10] (</b>)
-------#text()
-
-Source :
-<p><b>a</b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (<b>)
-[6, 7] (a)
-[7, 11] (</b>)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(a)@[6, 7] (a)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt
deleted file mode 100644
index 0e65eff..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest3
-Source :
-
-
-
-StructuredDocument Regions :
-
-Tree :
-#document
---#text()
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
---#text()
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt
deleted file mode 100644
index 4a72f84..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-
-Source :
-<p>&gt;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (&)
-[8, 11] (gt;)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(>)@{[3, 8] (&),[8, 11] (gt;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt
deleted file mode 100644
index 7172ef4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest2
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p>a&gt;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 12] (gt;)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(a>)@{[3, 4] (a),[4, 9] (&),[9, 12] (gt;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt
deleted file mode 100644
index 52cb3c9..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest3
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p>ab</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(ab)@[3, 5] (ab)
-
-Source :
-<p>ab&</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 10] (&)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(ab&)@{[3, 5] (ab),[5, 10] (&)}
-
-Source :
-<p>ab&c</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 10] (&)
-[10, 11] (c)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(ab&c)@{[3, 5] (ab),[5, 10] (&),[10, 11] (c)}
-
-Source :
-<p>dab&c</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (dab)
-[6, 11] (&)
-[11, 12] (c)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(dab&c)@{[3, 6] (dab),[6, 11] (&),[11, 12] (c)}
-
-Source :
-<p>dab&ce</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (dab)
-[6, 11] (&)
-[11, 13] (ce)
-[13, 17] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[13, 17] (</p>)
-----#text(dab&ce)@{[3, 6] (dab),[6, 11] (&),[11, 13] (ce)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt
deleted file mode 100644
index 0ce80f9..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest4
-Source :
-<p>a&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&),[9, 10] (b)}
-
-Source :
-<p>a&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text()
-----#text(a&b)@{[3, 4] (a),[4, 9] (&),[9, 10] (b)}
-
-Source :
-<p>ca&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&)
-[10, 11] (b)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(c)@[3,4]([3, 5] (ca))
-----#text(a&b)@{[4,5]([3, 5] (ca)),[5, 10] (&),[10, 11] (b)}
-
-Source :
-<p>ca&ba&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&)
-[10, 12] (ba)
-[12, 17] (&)
-[17, 18] (b)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(ca&b)@{[3, 5] (ca),[5, 10] (&),[10,11]([10, 12] (ba))}
-----#text(a&b)@{[11,12]([10, 12] (ba)),[12, 17] (&),[17, 18] (b)}
-
-Source :
-<p>ca&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&)
-[10, 11] (b)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(ca&b)@{[3, 5] (ca),[5, 10] (&),[10, 11] (b)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt
deleted file mode 100644
index 78eb8c4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest5
-Source :
-<p>a&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&),[9, 10] (b)}
-
-Source :
-<p>a&ba&b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 11] (ba)
-[11, 16] (&)
-[16, 17] (b)
-[17, 21] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[17, 21] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&),[9,10]([9, 11] (ba))}
-----#text(a&b)@{[10,11]([9, 11] (ba)),[11, 16] (&),[16, 17] (b)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt
deleted file mode 100644
index 61315f3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest6
-Source :
-<p>a&</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a&)@{[3, 4] (a),[4, 9] (&)}
-
-Source :
-<p>a&a&</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&)
-[9, 10] (a)
-[10, 15] (&)
-[15, 19] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[15, 19] (</p>)
-----#text(a&)@{[3, 4] (a),[4, 9] (&)}
-----#text(a&)@{[9, 10] (a),[10, 15] (&)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt
deleted file mode 100644
index 025d982..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest7
-Source :
-<a>aAA&unk;&unk&unk</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (a)
-[4, 9] (A)
-[9, 15] (A)
-[15, 20] (&unk;)
-[20, 24] (&unk)
-[24, 28] (&unk)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#text(aAA)@{[3, 4] (a),[4, 9] (A),[9, 15] (A)}
-----unk
-----#text(&unk&unk)@{[20, 24] (&unk),[24, 28] (&unk)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt
deleted file mode 100644
index 3decb1b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest8
-Source :
-&ibm;&rtp;
-
-
-StructuredDocument Regions :
-[0, 5] (&ibm;)
-[5, 10] (&rtp;)
-
-Tree :
-#document
---ibm
---rtp
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt
deleted file mode 100644
index 0802e3a..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest9
-Source :
-<
-
-
-StructuredDocument Regions :
-[0, 4] (<)
-
-Tree :
-#document
---#text(<)@[0, 4] (<)
-
-Source :
-<>
-
-
-StructuredDocument Regions :
-[0, 4] (<)
-[4, 7] (>)
-
-Tree :
-#document
---#text(<>)@{[0, 4] (<),[4, 7] (>)}
-
-Source :
-<>
-
-
-StructuredDocument Regions :
-[0, 4] (<)
-[4, 8] (>)
-
-Tree :
-#document
---#text(<>)@{[0, 4] (<),[4, 8] (>)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt
deleted file mode 100644
index 36aea6a..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.PITest
-Source :
-<a><?echo $PHP_SELF?></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 21] (<?echo $PHP_SELF?>)
-[21, 25] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[21, 25] (</a>)
-----echo($PHP_SELF)
-
-target(echo) data ($PHP_SELF)
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt
deleted file mode 100644
index a496797..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest
-Source :
-<P><B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 13] (<B>)
-[13, 17] (</B>)
-[17, 21] (</P>)
-[21, 24] (<P>)
-[24, 28] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[17, 21] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-----B/B@[10, 13] (<B>)@[13, 17] (</B>)
---P/P@[21, 24] (<P>)@[24, 28] (</P>)
-
-Source :
-a<P><B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 7] (<B>)
-[7, 11] (</B>)
-[11, 14] (<B>)
-[14, 18] (</B>)
-[18, 22] (</P>)
-[22, 25] (<P>)
-[25, 29] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[18, 22] (</P>)
-----B/B@[4, 7] (<B>)@[7, 11] (</B>)
-----B/B@[11, 14] (<B>)@[14, 18] (</B>)
---P/P@[22, 25] (<P>)@[25, 29] (</P>)
-
-Source :
-a<P>b<B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 15] (<B>)
-[15, 19] (</B>)
-[19, 23] (</P>)
-[23, 26] (<P>)
-[26, 30] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[19, 23] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----B/B@[12, 15] (<B>)@[15, 19] (</B>)
---P/P@[23, 26] (<P>)@[26, 30] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 24] (</P>)
-[24, 27] (<P>)
-[27, 31] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[20, 24] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
---P/P@[24, 27] (<P>)@[27, 31] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 28] (<P>)
-[28, 32] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---P/P@[25, 28] (<P>)@[28, 32] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 33] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[29, 33] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P>f</P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 30] (f)
-[30, 34] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[30, 34] (</P>)
-----#text(f)@[29, 30] (f)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P>f</P>g
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 30] (f)
-[30, 34] (</P>)
-[34, 35] (g)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[30, 34] (</P>)
-----#text(f)@[29, 30] (f)
---#text(g)@[34, 35] (g)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt
deleted file mode 100644
index 83990a6..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest2
-Source :
-<a b="" c="c">
-
-
-StructuredDocument Regions :
-[0, 15] (<a b="" c="c">)
-
-Tree :
-#document
---a@[0, 15] (<a b="" c="c">)
-
-b=[]
-c=[c]
-Source :
-<a b="" d c="c">
-
-
-StructuredDocument Regions :
-[0, 16] (<a b="" d c="c">)
-
-Tree :
-#document
---a@[0, 16] (<a b="" d c="c">)
-
-b=[]
-d=[]
-c=[c]
-Source :
-<a b="" c="c">
-
-
-StructuredDocument Regions :
-[0, 15] (<a b="" c="c">)
-
-Tree :
-#document
---a@[0, 15] (<a b="" c="c">)
-
-b=[]
-c=[c]
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt
deleted file mode 100644
index 4338afc..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest3
-Source :
-<a b >
-
-
-StructuredDocument Regions :
-[0, 7] (<a b >)
-
-Tree :
-#document
---a@[0, 7] (<a b >)
-
-b=[]
-org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent
-Source :
-<a b >
-
-
-StructuredDocument Regions :
-[0, 6] (<a b >)
-
-Tree :
-#document
---a@[0, 6] (<a b >)
-
-b=[]
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt
deleted file mode 100644
index 8c32ce2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest4
-Source :
-<a>
-
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 5] (
-
-)
-[5, 6] (<)
-[6, 8] (% )
-[8, 10] (a )
-[10, 11] (%)
-[11, 13] (>
-)
-[13, 14] (<)
-[14, 16] (% )
-[16, 18] (b )
-[18, 19] (%)
-[19, 21] (>
-)
-[21, 25] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[21, 25] (</a>)
-----#text(\n\n<% a %>\n<% b %>\n)@{[3, 5] (\n\n),[5, 6] (<),[6, 8] (% ),[8, 10] (a ),[10, 11] (%),[11, 13] (>\n),[13, 14] (<),[14, 16] (% ),[16, 18] (b ),[18, 19] (%),[19, 21] (>\n)}
-
-Source :
-<a>
-<
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 5] (<)
-[5, 6] (
-)
-[6, 7] (<)
-[7, 9] (% )
-[9, 11] (a )
-[11, 12] (%)
-[12, 14] (>
-)
-[14, 15] (<)
-[15, 17] (% )
-[17, 19] (b )
-[19, 20] (%)
-[20, 22] (>
-)
-[22, 26] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[22, 26] (</a>)
-----#text(\n<\n<% a %>\n<% b %>\n)@{[3, 4] (\n),[4, 5] (<),[5, 6] (\n),[6, 7] (<),[7, 9] (% ),[9, 11] (a ),[11, 12] (%),[12, 14] (>\n),[14, 15] (<),[15, 17] (% ),[17, 19] (b ),[19, 20] (%),[20, 22] (>\n)}
-
-Source :
-<a>
-<b
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b
-)
-[7, 8] (<)
-[8, 10] (% )
-[10, 12] (a )
-[12, 13] (%)
-[13, 15] (>
-)
-[15, 16] (<)
-[16, 18] (% )
-[18, 20] (b )
-[20, 21] (%)
-[21, 23] (>
-)
-[23, 27] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[23, 27] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b@[4, 7] (<b\n)
-------#text(<% a %>\n<% b %>\n)@{[7, 8] (<),[8, 10] (% ),[10, 12] (a ),[12, 13] (%),[13, 15] (>\n),[15, 16] (<),[16, 18] (% ),[18, 20] (b ),[20, 21] (%),[21, 23] (>\n)}
-
-Source :
-<a>
-<bc
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 8] (<bc
-)
-[8, 9] (<)
-[9, 11] (% )
-[11, 13] (a )
-[13, 14] (%)
-[14, 16] (>
-)
-[16, 17] (<)
-[17, 19] (% )
-[19, 21] (b )
-[21, 22] (%)
-[22, 24] (>
-)
-[24, 28] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[24, 28] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bc@[4, 8] (<bc\n)
-------#text(<% a %>\n<% b %>\n)@{[8, 9] (<),[9, 11] (% ),[11, 13] (a ),[13, 14] (%),[14, 16] (>\n),[16, 17] (<),[17, 19] (% ),[19, 21] (b ),[21, 22] (%),[22, 24] (>\n)}
-
-Source :
-<a>
-<bcd
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 9] (<bcd
-)
-[9, 10] (<)
-[10, 12] (% )
-[12, 14] (a )
-[14, 15] (%)
-[15, 17] (>
-)
-[17, 18] (<)
-[18, 20] (% )
-[20, 22] (b )
-[22, 23] (%)
-[23, 25] (>
-)
-[25, 29] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[25, 29] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcd@[4, 9] (<bcd\n)
-------#text(<% a %>\n<% b %>\n)@{[9, 10] (<),[10, 12] (% ),[12, 14] (a ),[14, 15] (%),[15, 17] (>\n),[17, 18] (<),[18, 20] (% ),[20, 22] (b ),[22, 23] (%),[23, 25] (>\n)}
-
-Source :
-<a>
-<bcde
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 10] (<bcde
-)
-[10, 11] (<)
-[11, 13] (% )
-[13, 15] (a )
-[15, 16] (%)
-[16, 18] (>
-)
-[18, 19] (<)
-[19, 21] (% )
-[21, 23] (b )
-[23, 24] (%)
-[24, 26] (>
-)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcde@[4, 10] (<bcde\n)
-------#text(<% a %>\n<% b %>\n)@{[10, 11] (<),[11, 13] (% ),[13, 15] (a ),[15, 16] (%),[16, 18] (>\n),[18, 19] (<),[19, 21] (% ),[21, 23] (b ),[23, 24] (%),[24, 26] (>\n)}
-
-Source :
-<a>
-<bcde>
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 10] (<bcde>)
-[10, 11] (
-)
-[11, 12] (<)
-[12, 14] (% )
-[14, 16] (a )
-[16, 17] (%)
-[17, 19] (>
-)
-[19, 20] (<)
-[20, 22] (% )
-[22, 24] (b )
-[24, 25] (%)
-[25, 27] (>
-)
-[27, 31] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[27, 31] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcde@[4, 10] (<bcde>)
-------#text(\n<% a %>\n<% b %>\n)@{[10, 11] (\n),[11, 12] (<),[12, 14] (% ),[14, 16] (a ),[16, 17] (%),[17, 19] (>\n),[19, 20] (<),[20, 22] (% ),[22, 24] (b ),[24, 25] (%),[25, 27] (>\n)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt
deleted file mode 100644
index 12a9003..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbbccc)@[5,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aadddddddccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 15] (aadddddddccc)
-[15, 19] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[15, 19] (</p>)
-----#text(aaddddddd)@[3,12]([3, 15] (aadddddddccc))
-----#text(ccc)@[12,15]([3, 15] (aadddddddccc))
-
-Source :
-<p>aadddddddccceee</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 18] (aadddddddccceee)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(aaddddddd)@[3,12]([3, 18] (aadddddddccceee))
-----#text(ccceee)@[12,18]([3, 18] (aadddddddccceee))
-
-Source :
-<p>aadddddddbbbbccceee</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 22] (aadddddddbbbbccceee)
-[22, 26] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[22, 26] (</p>)
-----#text(aaddddddd)@[3,12]([3, 22] (aadddddddbbbbccceee))
-----#text(bbbb)@[12,16]([3, 22] (aadddddddbbbbccceee))
-----#text(ccceee)@[16,22]([3, 22] (aadddddddbbbbccceee))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt
deleted file mode 100644
index 3a122c6..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest2
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbbccc)@[5,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt
deleted file mode 100644
index 4453a50..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest3
-Source :
-<p>aa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(aa)@[3, 5] (aa)
-
-Source :
-<p>aa<b>bbbb</b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[16, 20] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt
deleted file mode 100644
index 07bbf30..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest4
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>aaa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (aaa)
-[6, 10] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[6, 10] (</p>)
-----#text(aaa)@[3, 6] (aaa)
-
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>cccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (cccc)
-[7, 11] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[7, 11] (</p>)
-----#text(cccc)@[3, 7] (cccc)
-----#text()
-
-Source :
-<p>ccccaaa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 10] (ccccaaa)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(cccc)@[3,7]([3, 10] (ccccaaa))
-----#text(aaa)@[7,10]([3, 10] (ccccaaa))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt
deleted file mode 100644
index 9cedb59..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest5
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbb)@[3,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbb<br>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 16] (ccc)
-[16, 20] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[16, 20] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(ccc)@[13, 16] (ccc)
-
-Source :
-<p>aabbbb<br>cccd</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 17] (cccd)
-[17, 21] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[17, 21] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(cccd)@[13, 17] (cccd)
-
-Source :
-<p>aabbbb<br>cccde</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 18] (cccde)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(cccde)@[13, 18] (cccde)
-
-Source :
-<p>aa<b>bbbb</b><br>cccde</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (<br>)
-[20, 25] (cccde)
-[25, 29] (</p>)
-
-StructuredDocumentRegionChecker : warning : vain
-Tree :
-#document
---p/p@[0, 3] (<p>)@[25, 29] (</p>)
-----#text(aa)@[3,5]([3, 5] (aa))
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----br@[16, 20] (<br>)
-----#text(cccde)@[20, 25] (cccde)
-
-Source :
-<p>aa<b>bbbb</b><br><i>ccc</i>de</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (<br>)
-[20, 23] (<i>)
-[23, 26] (ccc)
-[26, 30] (</i>)
-[30, 32] (de)
-[32, 36] (</p>)
-
-StructuredDocumentRegionChecker : warning : vain
-StructuredDocumentRegionChecker : warning : vain
-Tree :
-#document
---p/p@[0, 3] (<p>)@[32, 36] (</p>)
-----#text(aa)@[3,5]([3, 5] (aa))
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----br@[16, 20] (<br>)
-----i/i@[20, 23] (<i>)@[26, 30] (</i>)
-------#text(ccc)@[23, 26] (ccc)
-----#text(de)@[30,32]([30, 32] (de))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt
deleted file mode 100644
index 29175f4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest6
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbdccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 13] (aabbbbdccc)
-[13, 17] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[13, 17] (</p>)
-----#text(aa)@[3,5]([3, 13] (aabbbbdccc))
-----#text(bbbbd)@[5,10]([3, 13] (aabbbbdccc))
-----#text(ccc)@[10,13]([3, 13] (aabbbbdccc))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt
deleted file mode 100644
index 5f39e75..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest7
-Source :
-<p>aaaabbbb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 11] (aaaabbbb)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(aaaa)@[3,7]([3, 11] (aaaabbbb))
-----#text(bbbb)@[7,11]([3, 11] (aaaabbbb))
-
-Source :
-<p>aaabb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaabb)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aaabb)@[3, 8] (aaabb)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt
deleted file mode 100644
index de4e783..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest8
-Source :
-<p>aaaabbbb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 11] (aaaabbbb)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(aaaa)@[3,7]([3, 11] (aaaabbbb))
-----#text(bbbb)@[7,11]([3, 11] (aaaabbbb))
-
-Source :
-<p>ab</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(ab)@[3, 5] (ab)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt
deleted file mode 100644
index 084ebdb..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TableTest
-Source :
-<html></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 13] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[6, 13] (</html>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><table border="1"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 30] (<table border="1">)
-[30, 34] (<tr>)
-[34, 38] (<td>)
-[38, 43] (</td>)
-[43, 47] (<td>)
-[47, 52] (</td>)
-[52, 57] (</tr>)
-[57, 61] (<tr>)
-[61, 65] (<td>)
-[65, 70] (</td>)
-[70, 74] (<td>)
-[74, 79] (</td>)
-[79, 84] (</tr>)
-[84, 92] (</table>)
-[92, 99] (</body>)
-[99, 106] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[99, 106] (</html>)
-----body/body@[6, 12] (<body>)@[92, 99] (</body>)
-------table/table@[12, 30] (<table border="1">)@[84, 92] (</table>)
---------tr/tr@[30, 34] (<tr>)@[52, 57] (</tr>)
-----------td/td@[34, 38] (<td>)@[38, 43] (</td>)
-----------td/td@[43, 47] (<td>)@[47, 52] (</td>)
---------tr/tr@[57, 61] (<tr>)@[79, 84] (</tr>)
-----------td/td@[61, 65] (<td>)@[65, 70] (</td>)
-----------td/td@[70, 74] (<td>)@[74, 79] (</td>)
-
-Source :
-<html><body><table border="1"><tr><td></td><td></td></tr><tr><td></td><td><font color="red">text</font></td></tr></table></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 30] (<table border="1">)
-[30, 34] (<tr>)
-[34, 38] (<td>)
-[38, 43] (</td>)
-[43, 47] (<td>)
-[47, 52] (</td>)
-[52, 57] (</tr>)
-[57, 61] (<tr>)
-[61, 65] (<td>)
-[65, 70] (</td>)
-[70, 74] (<td>)
-[74, 92] (<font color="red">)
-[92, 96] (text)
-[96, 103] (</font>)
-[103, 108] (</td>)
-[108, 113] (</tr>)
-[113, 121] (</table>)
-[121, 128] (</body>)
-[128, 135] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[128, 135] (</html>)
-----body/body@[6, 12] (<body>)@[121, 128] (</body>)
-------table/table@[12, 30] (<table border="1">)@[113, 121] (</table>)
---------tr/tr@[30, 34] (<tr>)@[52, 57] (</tr>)
-----------td/td@[34, 38] (<td>)@[38, 43] (</td>)
-----------td/td@[43, 47] (<td>)@[47, 52] (</td>)
---------tr/tr@[57, 61] (<tr>)@[108, 113] (</tr>)
-----------td/td@[61, 65] (<td>)@[65, 70] (</td>)
-----------td/td@[70, 74] (<td>)@[103, 108] (</td>)
-------------font/font@[74, 92] (<font color="red">)@[96, 103] (</font>)
---------------#text(text)@[92, 96] (text)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt
deleted file mode 100644
index e892cf2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest
-Source :
-<a>hello &lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&)
-[14, 17] (lt;)
-[17, 21] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[17, 21] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 14] (&),[14, 17] (lt;)}
-
-hello <
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt
deleted file mode 100644
index ab2ba53..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest2
-Source :
-<a>hello &lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&)
-[14, 17] (lt;)
-[17, 21] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[17, 21] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 14] (&),[14, 17] (lt;)}
-
-hello <
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt
deleted file mode 100644
index 0b04a3b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest3
-Invalid character ('<') found
-Source :
-<a>text</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (text)
-[7, 11] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[7, 11] (</a>)
-----#text(text)@[3, 7] (text)
-
-Source :
-<a>hello <</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 13] (<)
-[13, 17] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[13, 17] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 13] (<)}
-
-Invalid character ('&') found
-Source :
-<a>hello <</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 13] (<)
-[13, 17] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[13, 17] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 13] (<)}
-
-Source :
-<a>hello A</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (A)
-[14, 18] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[14, 18] (</a>)
-----#text(hello A)@{[3, 9] (hello ),[9, 14] (A)}
-
-Invalid character ('&') found
-Source :
-<a>hello A</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (A)
-[14, 18] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[14, 18] (</a>)
-----#text(hello A)@{[3, 9] (hello ),[9, 14] (A)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt
deleted file mode 100644
index 69fe980..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest
-Source :
-<html></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 13] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[6, 13] (</html>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><p></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (</p>)
-[19, 26] (</body>)
-[26, 33] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[26, 33] (</html>)
-----body/body@[6, 12] (<body>)@[19, 26] (</body>)
-------p/p@[12, 15] (<p>)@[15, 19] (</p>)
-
-Source :
-<html><body><p>text</p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (text)
-[19, 23] (</p>)
-[23, 30] (</body>)
-[30, 37] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[30, 37] (</html>)
-----body/body@[6, 12] (<body>)@[23, 30] (</body>)
-------p/p@[12, 15] (<p>)@[19, 23] (</p>)
---------#text(text)@[15, 19] (text)
-
-Source :
-<html><body><p><br>text</p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 27] (</p>)
-[27, 34] (</body>)
-[34, 41] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[34, 41] (</html>)
-----body/body@[6, 12] (<body>)@[27, 34] (</body>)
-------p/p@[12, 15] (<p>)@[23, 27] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
-Source :
-<html><body><p><br><img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 24] (<img>)
-[24, 28] (</p>)
-[28, 35] (</body>)
-[35, 42] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[35, 42] (</html>)
-----body/body@[6, 12] (<body>)@[28, 35] (</body>)
-------p/p@[12, 15] (<p>)@[24, 28] (</p>)
---------br@[15, 19] (<br>)
---------img@[19, 24] (<img>)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt
deleted file mode 100644
index b8f7da2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest10
-Source :
-<a b="c"><b></b></a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a b="c">)
-[9, 12] (<b>)
-[12, 16] (</b>)
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a b="c">)@[16, 20] (</a>)
-----b/b@[9, 12] (<b>)@[12, 16] (</b>)
-
-IStructuredDocumentRegion:
-<b>
-0(<)true
-0(b)true
-0(>)true
-
-Source :
-<a b="c"><b c="d"></b></a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a b="c">)
-[9, 18] (<b c="d">)
-[18, 22] (</b>)
-[22, 26] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a b="c">)@[22, 26] (</a>)
-----b/b@[9, 18] (<b c="d">)@[18, 22] (</b>)
-
-IStructuredDocumentRegion:
-<b c="d">
-0(<)true
-0(b)true
-0(c)true
-0(=)true
-0("d")true
-0(>)true
-
-Source :
-<a b="cd"><b c="d"></b></a>
-
-
-StructuredDocument Regions :
-[0, 10] (<a b="cd">)
-[10, 19] (<b c="d">)
-[19, 23] (</b>)
-[23, 27] (</a>)
-
-Tree :
-#document
---a/a@[0, 10] (<a b="cd">)@[23, 27] (</a>)
-----b/b@[10, 19] (<b c="d">)@[19, 23] (</b>)
-
-IStructuredDocumentRegion:
-<b c="d">
-0(<)true
-0(b)true
-0(c)true
-0(=)true
-0("d")true
-0(>)true
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt
deleted file mode 100644
index 3988cb3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest11
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt
deleted file mode 100644
index 811a8f7..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest12
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
-Source :
-<a></a><a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-[7, 10] (<a>)
-[10, 14] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
---a/a@[7, 10] (<a>)@[10, 14] (</a>)
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt
deleted file mode 100644
index 4854f7e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest13
-Source :
-<a>
-<b>
-</b> </a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 5] (
-)
-[5, 8] (<b>)
-[8, 10] (
-)
-[10, 14] (</b>)
-[14, 16] ( )
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[16, 20] (</a>)
-----#text(\r\n)@[3, 5] (\r\n)
-----b/b@[5, 8] (<b>)@[10, 14] (</b>)
-------#text(\r\n)@[8, 10] (\r\n)
-----#text( )@[14, 16] ( )
-
-Source :
-<a>
- </a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (
- )
-[7, 11] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[7, 11] (</a>)
-----#text(\r\n)@[3,5]([3, 7] (\r\n ))
-----#text( )@[5,7]([3, 7] (\r\n ))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt
deleted file mode 100644
index 9e6d5b6..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest14
-Source :
-<%= aaaa %>
-
-
-StructuredDocument Regions :
-[0, 1] (<)
-[1, 4] (%= )
-[4, 9] (aaaa )
-[9, 10] (%)
-[10, 11] (>)
-
-Tree :
-#document
---#text(<%= aaaa %>)@{[0, 1] (<),[1, 4] (%= ),[4, 9] (aaaa ),[9, 10] (%),[10, 11] (>)}
-
-Source :
-<% = aaaa %>
-
-
-StructuredDocument Regions :
-[0, 1] (<)
-[1, 5] (% = )
-[5, 10] (aaaa )
-[10, 11] (%)
-[11, 12] (>)
-
-Tree :
-#document
---#text(<% = aaaa %>)@{[0, 1] (<),[1, 5] (% = ),[5, 10] (aaaa ),[10, 11] (%),[11, 12] (>)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt
deleted file mode 100644
index 64dcf1f..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest2
-Source :
-<HTML>
-<HEAD></HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 21] (</HEAD>)
-[21, 23] (
-)
-[23, 29] (<BODY>)
-[29, 36] (</BODY>)
-[36, 38] (
-)
-[38, 45] (</HTML>)
-[45, 47] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[38, 45] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[14, 21] (</HEAD>)
-----#text(\r\n)@[21, 23] (\r\n)
-----BODY/BODY@[23, 29] (<BODY>)@[29, 36] (</BODY>)
-----#text(\r\n)@[36, 38] (\r\n)
---#text(\r\n)@[45, 47] (\r\n)
-
-Source :
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Updater Test 2">
-</HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 16] (
-)
-[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-[64, 66] (
-)
-[66, 73] (</HEAD>)
-[73, 75] (
-)
-[75, 81] (<BODY>)
-[81, 88] (</BODY>)
-[88, 90] (
-)
-[90, 97] (</HTML>)
-[97, 99] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[90, 97] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[66, 73] (</HEAD>)
-------#text(\r\n)@[14, 16] (\r\n)
-------meta@[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-------#text(\r\n)@[64, 66] (\r\n)
-----#text(\r\n)@[73, 75] (\r\n)
-----BODY/BODY@[75, 81] (<BODY>)@[81, 88] (</BODY>)
-----#text(\r\n)@[88, 90] (\r\n)
---#text(\r\n)@[97, 99] (\r\n)
-
-Source :
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Updater Test 2">
-<title></title></HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 16] (
-)
-[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-[64, 66] (
-)
-[66, 73] (<title>)
-[73, 81] (</title>)
-[81, 88] (</HEAD>)
-[88, 90] (
-)
-[90, 96] (<BODY>)
-[96, 103] (</BODY>)
-[103, 105] (
-)
-[105, 112] (</HTML>)
-[112, 114] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[105, 112] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[81, 88] (</HEAD>)
-------#text(\r\n)@[14, 16] (\r\n)
-------meta@[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-------#text(\r\n)@[64, 66] (\r\n)
-------title/title@[66, 73] (<title>)@[73, 81] (</title>)
---------#text()
-----#text(\r\n)@[88, 90] (\r\n)
-----BODY/BODY@[90, 96] (<BODY>)@[96, 103] (</BODY>)
-----#text(\r\n)@[103, 105] (\r\n)
---#text(\r\n)@[112, 114] (\r\n)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt
deleted file mode 100644
index 4ac73a5..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest3
-Source :
-<a><b></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 10] (</b>)
-[10, 14] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[10, 14] (</a>)
-----b/b@[3, 6] (<b>)@[6, 10] (</b>)
-
-Source :
-<a>
-<b></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b>)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b/b@[4, 7] (<b>)@[7, 11] (</b>)
-
-Source :
-<a>
-<b></b>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b>)
-[7, 11] (</b>)
-[11, 12] (
-)
-[12, 16] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[12, 16] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b/b@[4, 7] (<b>)@[7, 11] (</b>)
-----#text(\n)@[11, 12] (\n)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt
deleted file mode 100644
index a10d026..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest4
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt
deleted file mode 100644
index 95e13ea..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest5
-Source :
-<a>'</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (')
-[9, 13] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[9, 13] (</a>)
-----#text(')@[3, 9] (')
-
-Source :
-<a>'</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (')
-[9, 13] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[9, 13] (</a>)
-----#text(')@[3, 9] (')
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt
deleted file mode 100644
index f9c4d7a..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest6
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt
deleted file mode 100644
index 0b4a487..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest7
-Source :
-<P><B></B></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 14] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[10, 14] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-
-Source :
-<P><B></B><B></B></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 13] (<B>)
-[13, 17] (</B>)
-[17, 21] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[17, 21] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-----B/B@[10, 13] (<B>)@[13, 17] (</B>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt
deleted file mode 100644
index e5f6e32..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest8
-Source :
-<P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 7] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[3, 7] (</P>)
-
-Source :
-<P></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 7] (</P>)
-[7, 10] (<P>)
-[10, 14] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[3, 7] (</P>)
---P/P@[7, 10] (<P>)@[10, 14] (</P>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt
deleted file mode 100644
index 6a4a8ad..0000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest9
-Source :
-<style></style>
-
-
-StructuredDocument Regions :
-[0, 7] (<style>)
-[7, 15] (</style>)
-
-Tree :
-#document
---style/style@[0, 7] (<style>)@[7, 15] (</style>)
-
-Source :
-<style>p</style>
-
-
-StructuredDocument Regions :
-[0, 7] (<style>)
-[7, 8] (p)
-[8, 16] (</style>)
-
-Tree :
-#document
---style/style@[0, 7] (<style>)@[8, 16] (</style>)
-----#text(p)@[7, 8] (p)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt b/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt
deleted file mode 100644
index 8e24188..0000000
--- a/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-These notes pertain to the v20041210_2300 version
-in CVS repository.
-
-Note, the "05-24" directory *should* match
-the parser results from parser of same date,
-*but* after transition to org.eclipse, it seems
-the case of tags is different. Oddly, seems
-like the current treatement of case is correct,
-so ... 12-10 parser results should be used as
-reference, unless some new insight is gained.
-It does match previous version except for case.
-(And, the previous version was changed "by hand"
-to accomidate the transition to org.eclipse).
-
-TODO: this file, and 05-24 reference directory
-can be deleted around M3, once whole team has
-reviewed and confident 12-10 version is correct
-reference.
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/about.html b/tests/org.eclipse.wst.html.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.core.tests/build.properties b/tests/org.eclipse.wst.html.core.tests/build.properties
deleted file mode 100644
index a013d49..0000000
--- a/tests/org.eclipse.wst.html.core.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.htmlcoretests.jar = src/
-output.htmlcoretests.jar = bin/
-bin.includes = htmlcoretests.jar,\
- plugin.xml,\
- test.xml,\
- ParserResults2004-12-10-22-23-47/,\
- META-INF/,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.properties b/tests/org.eclipse.wst.html.core.tests/plugin.properties
deleted file mode 100644
index a35d421..0000000
--- a/tests/org.eclipse.wst.html.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.html.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.xml b/tests/org.eclipse.wst.html.core.tests/plugin.xml
deleted file mode 100644
index dc6aef0..0000000
--- a/tests/org.eclipse.wst.html.core.tests/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <!-- leave this empty plugin.xml here for now,
- because we do a funky thing
- to find it during the tests -->
-
-</plugin>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java
deleted file mode 100644
index b883005..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.core.tests.format.TestFormatProcessorHTML;
-import org.eclipse.wst.html.core.tests.misc.HTMLCorePreferencesTest;
-import org.eclipse.wst.html.core.tests.misc.HTMLTagInfoTest;
-import org.eclipse.wst.html.core.tests.model.BUG124835SetStyleAttributeValueTest;
-import org.eclipse.wst.html.core.tests.model.GetOverrideStyleTest;
-import org.eclipse.wst.html.core.tests.model.ModelModifications;
-import org.eclipse.wst.html.core.tests.model.TestCatalogContentModels;
-import org.eclipse.wst.html.core.tests.model.TestForNPEInCSSCreation;
-
-
-
-public class HTMLCoreTestSuite extends TestSuite {
-
- /**
- * to get picked up by BVT
- *
- * @return
- */
- public static Test suite() {
- return new HTMLCoreTestSuite();
- }
-
- public HTMLCoreTestSuite() {
- super("HTML Core TestSuite");
-
- addTest(ModelParserTests.suite());
- addTest(new TestSuite(HTMLCorePreferencesTest.class));
- addTest(new TestSuite(HTMLTagInfoTest.class));
- addTest(new TestSuite(ModelModifications.class));
- addTest(new TestSuite(TestForNPEInCSSCreation.class));
- addTest(new TestSuite(GetOverrideStyleTest.class));
- addTest(new TestSuite(BUG124835SetStyleAttributeValueTest.class));
- addTest(new TestSuite(TestFormatProcessorHTML.class));
- addTest(new TestSuite(TestCatalogContentModels.class));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java
deleted file mode 100644
index b37c006..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLCoreTestsPlugin extends Plugin {
- //The shared instance.
- private static HTMLCoreTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public HTMLCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.core.tests.SSEModelHTMLTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static HTMLCoreTestsPlugin 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 = HTMLCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java
deleted file mode 100644
index b542395..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/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.wst.html.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.html.core.tests"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java
deleted file mode 100644
index b39b6d3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.core.tests.parser.AttrTest;
-import org.eclipse.wst.html.core.tests.parser.AttrTest2;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest2;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest3;
-import org.eclipse.wst.html.core.tests.parser.DocTypeTest;
-import org.eclipse.wst.html.core.tests.parser.ElementTest;
-import org.eclipse.wst.html.core.tests.parser.ElementTest2;
-import org.eclipse.wst.html.core.tests.parser.ElementTest3;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest2;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest3;
-import org.eclipse.wst.html.core.tests.parser.EntityTest;
-import org.eclipse.wst.html.core.tests.parser.EntityTest2;
-import org.eclipse.wst.html.core.tests.parser.EntityTest3;
-import org.eclipse.wst.html.core.tests.parser.EntityTest4;
-import org.eclipse.wst.html.core.tests.parser.EntityTest5;
-import org.eclipse.wst.html.core.tests.parser.EntityTest6;
-import org.eclipse.wst.html.core.tests.parser.EntityTest7;
-import org.eclipse.wst.html.core.tests.parser.EntityTest8;
-import org.eclipse.wst.html.core.tests.parser.EntityTest9;
-import org.eclipse.wst.html.core.tests.parser.PITest;
-import org.eclipse.wst.html.core.tests.parser.ParserTest;
-import org.eclipse.wst.html.core.tests.parser.ParserTest2;
-import org.eclipse.wst.html.core.tests.parser.ParserTest3;
-import org.eclipse.wst.html.core.tests.parser.ParserTest4;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest2;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest3;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest4;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest5;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest6;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest7;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest8;
-import org.eclipse.wst.html.core.tests.parser.TableTest;
-import org.eclipse.wst.html.core.tests.parser.TextTest;
-import org.eclipse.wst.html.core.tests.parser.TextTest2;
-import org.eclipse.wst.html.core.tests.parser.TextTest3;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest10;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest11;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest12;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest13;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest14;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest2;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest3;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest4;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest5;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest6;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest7;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest8;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest9;
-
-
-
-public class ModelParserTests extends TestSuite {
- public static Test suite() {
- return new ModelParserTests();
- }
-
- public ModelParserTests() {
- super("ModelParserTests");
-
- addTest(new TestSuite(ParserTest.class, "ParserTest"));
- addTest(new TestSuite(ParserTest2.class, "ParserTest2"));
- addTest(new TestSuite(ParserTest3.class, "ParserTest3"));
- addTest(new TestSuite(ParserTest4.class, "ParserTest4"));
- addTest(new TestSuite(UpdaterTest.class, "UpdaterTest"));
- addTest(new TestSuite(UpdaterTest2.class, "UpdaterTest2"));
- addTest(new TestSuite(UpdaterTest3.class, "UpdaterTest3"));
- addTest(new TestSuite(UpdaterTest4.class, "UpdaterTest4"));
- addTest(new TestSuite(UpdaterTest5.class, "UpdaterTest5"));
- addTest(new TestSuite(UpdaterTest6.class, "UpdaterTest6"));
- addTest(new TestSuite(UpdaterTest7.class, "UpdaterTest7"));
- addTest(new TestSuite(UpdaterTest8.class, "UpdaterTest8"));
- addTest(new TestSuite(UpdaterTest9.class, "UpdaterTest9"));
- addTest(new TestSuite(UpdaterTest10.class, "UpdaterTest10"));
- addTest(new TestSuite(UpdaterTest11.class, "UpdaterTest11"));
- addTest(new TestSuite(UpdaterTest12.class, "UpdaterTest12"));
- addTest(new TestSuite(UpdaterTest13.class, "UpdaterTest13"));
- addTest(new TestSuite(UpdaterTest14.class, "UpdaterTest14"));
- addTest(new TestSuite(ElementTest.class, "ElementTest"));
- addTest(new TestSuite(ElementTest2.class, "ElementTest2"));
- addTest(new TestSuite(ElementTest3.class, "ElementTest3"));
- addTest(new TestSuite(TableTest.class, "TableTest"));
- addTest(new TestSuite(TextTest.class, "TextTest"));
- addTest(new TestSuite(TextTest2.class, "TextTest2"));
- addTest(new TestSuite(TextTest3.class, "TextTest3"));
- addTest(new TestSuite(SplitTextTest.class, "SplitTextTest"));
- addTest(new TestSuite(SplitTextTest2.class, "SplitTextTest2"));
- addTest(new TestSuite(SplitTextTest3.class, "SplitTextTest3"));
- addTest(new TestSuite(SplitTextTest4.class, "SplitTextTest4"));
- addTest(new TestSuite(SplitTextTest5.class, "SplitTextTest5"));
- addTest(new TestSuite(SplitTextTest6.class, "SplitTextTest6"));
- addTest(new TestSuite(SplitTextTest7.class, "SplitTextTest7"));
- addTest(new TestSuite(SplitTextTest8.class, "SplitTextTest8"));
- addTest(new TestSuite(EmptyTextTest.class, "EmptyTextTest"));
- addTest(new TestSuite(EmptyTextTest2.class, "EmptyTextTest2"));
- addTest(new TestSuite(EmptyTextTest3.class, "EmptyTextTest3"));
- addTest(new TestSuite(AttrTest.class, "AttrTest"));
- addTest(new TestSuite(AttrTest2.class, "AttrTest2"));
- addTest(new TestSuite(EntityTest.class, "EntityTest"));
- addTest(new TestSuite(EntityTest2.class, "EntityTest2"));
- addTest(new TestSuite(EntityTest3.class, "EntityTest3"));
- addTest(new TestSuite(EntityTest4.class, "EntityTest4"));
- addTest(new TestSuite(EntityTest5.class, "EntityTest5"));
- addTest(new TestSuite(EntityTest6.class, "EntityTest6"));
- addTest(new TestSuite(EntityTest7.class, "EntityTest7"));
- addTest(new TestSuite(EntityTest8.class, "EntityTest8"));
- addTest(new TestSuite(EntityTest9.class, "EntityTest9"));
- addTest(new TestSuite(DocTypeTest.class, "DocTypeTest"));
- addTest(new TestSuite(CDATASectionTest.class, "CDATASectionTest"));
- addTest(new TestSuite(CDATASectionTest2.class, "CDATASectionTest2"));
- addTest(new TestSuite(CDATASectionTest3.class, "CDATASectionTest3"));
- addTest(new TestSuite(PITest.class, "PITest"));
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/TestFormatProcessorHTML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/TestFormatProcessorHTML.java
deleted file mode 100644
index bdad8e2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/TestFormatProcessorHTML.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Eclipse Foundation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen Møller - jesper@selskabet.org
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.html.core.tests.utils.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-
-public class TestFormatProcessorHTML extends TestCase {
-
- private static final boolean SPLIT_MULTI_ATTRS = false;
-
- private static final String INDENT = "\t";
-
- private static final boolean CLEAR_ALL_BLANK_LINES = false;
-
- private static final int MAX_LINE_WIDTH = 72;
-
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
-
- public TestFormatProcessorHTML(String name) {
- super(name);
- }
-
- private HTMLFormatProcessorImpl formatProcessor;
-
- protected void setUp() throws Exception {
- formatProcessor = new HTMLFormatProcessorImpl();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- if (resetPreferences)
- resetPreferencesToDefault();
-
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = false;
- formatProcessor.formatModel(beforeModel);
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = true;
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- private void resetPreferencesToDefault() {
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- formatPreferences.setLineWidth(MAX_LINE_WIDTH);
- formatPreferences.setClearAllBlankLines(CLEAR_ALL_BLANK_LINES);
- formatPreferences.setIndent(INDENT);
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(SPLIT_MULTI_ATTRS);
- }
-
- public void testTableFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/html/tableformat.html", "testfiles/html/tableformat-fmt.html");
- }
-
- public void testEmbeddedCSSFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG92957
- formatAndAssertEquals("testfiles/html/htmlwithcss.html", "testfiles/html/htmlwithcss-fmt.html");
- }
-
- public void testAttributeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/html/attributesformat.html", "testfiles/html/attributesformat-fmt.html", false);
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat-fmt.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat-fmt.html
deleted file mode 100644
index 1c7e6be..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat-fmt.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!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>
-<p
- align="center"
- id="myp"
->Here is some text that I am writing.</p>
-<br
- id="mybr"
- title="notitle"
-/>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat.html
deleted file mode 100644
index f100e88..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/attributesformat.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!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>
-<p align="center" id="myp">Here is some text that I am writing.</p><br id="mybr" title="notitle"/>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss-fmt.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss-fmt.html
deleted file mode 100644
index b503ab3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss-fmt.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>
-<style type="text/css">
-<!--
-body {
- background-color: black;
- color: white;
-}
-
-a:link,a:visited,a:active {
- color: red;
- text-decoration: none
-}
-
-a:hover {
- color: red;
- font-weight: bold
-}
--->
-</style>
-</head>
-<body>
-<a href="http://eclipse.org">hello eclipse.</a>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss.html
deleted file mode 100644
index 45ef329..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/htmlwithcss.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!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>
-<style type="text/css">
-<!--
-body { background-color: black;
- color: white;}
-a:link,a:visited,a:active { color: red;
- text-decoration: none}
-a:hover {
- color: red; font-weight: bold
-}
--->
-</style>
-</head>
-<body>
-<a href="http://eclipse.org">hello eclipse.</a>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat-fmt.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat-fmt.html
deleted file mode 100644
index fc51220..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat-fmt.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!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>
-<table>
- <tr>
- <th>Column 1 Heading</th>
- <th>Column 2 Heading</th>
- </tr>
- <tr>
- <td>Row 1: Col 1</td>
- <td>Row 1: Col 2</td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat.html
deleted file mode 100644
index bdef50c..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/format/testfiles/html/tableformat.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!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>
-<table> <tr> <th>Column 1 Heading</th> <th>Column 2 Heading</th> </tr> <tr> <td>Row 1: Col 1</td> <td>Row 1: Col 2</td> </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java
deleted file mode 100644
index 64bb8bb..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.misc;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-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 HTML 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 HTMLCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.html.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, HTMLCorePreferenceNames.TAG_NAME_CASE);
- bundleGetPreference(bundleName, HTMLCorePreferenceNames.ATTR_NAME_CASE);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
- pluginGetDefaultPreference(node, HTMLCorePreferenceNames.ATTR_NAME_CASE, Integer.toString(HTMLCorePreferenceNames.LOWER));
- }
-
- 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(HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS);
- pluginSetPreferenceString(node, HTMLCorePreferenceNames.TAG_NAME_CASE);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
- String originalValue = node.get(prefKey, "bogus");
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- node.put(prefKey, expectedValue);
- String foundValue = node.get(prefKey, "");
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalValue))
- node.remove(prefKey);
- else
- node.put(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForHTML.ContentTypeID_HTML);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForHTML.ContentTypeID_HTML);
- 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
- HTMLDocumentLoader loader = new HTMLDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java
deleted file mode 100644
index 35fa661..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.misc;
-
-import org.eclipse.wst.html.core.tests.parser.ModelTest;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class HTMLTagInfoTest extends ModelTest {
-
- public HTMLTagInfoTest(String name) {
- super(name);
- }
-
- public HTMLTagInfoTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new HTMLTagInfoTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element html = document.createElement("HTML"); //$NON-NLS-1$
- document.appendChild(html);
- checkElementTagInfo(html);
-
- Element body = document.createElement("BODY"); //$NON-NLS-1$
- html.appendChild(body);
- checkElementTagInfo(body);
-
- Attr onclick = document.createAttribute("onclick"); //$NON-NLS-1$
- body.setAttributeNode(onclick);
- checkAttributeTagInfo(body, onclick);
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- private void checkElementTagInfo(Element node) {
- // check taginfo
- CMElementDeclaration elementDecl = getCMElementDeclaration(node);
- assertNotNull("Cannot check taginfo because no cm element declaration for " + node.getNodeName(), elementDecl); //$NON-NLS-1$
- if (elementDecl != null) {
- String tagInfo = (String) elementDecl.getProperty("tagInfo"); //$NON-NLS-1$
- assertNotNull("No taginfo found for " + elementDecl.getNodeName(), tagInfo); //$NON-NLS-1$
- }
- }
-
- private void checkAttributeTagInfo(Element element, Attr attribute) {
- // check taginfo
- CMElementDeclaration elementDecl = getCMElementDeclaration(element);
- assertNotNull("Cannot check taginfo because no element declaration for " + element.getNodeName(), elementDecl); //$NON-NLS-1$
- if (elementDecl != null) {
- CMAttributeDeclaration attDecl = getCMAttributeDeclaration(elementDecl, attribute.getName());
- assertNotNull("Cannot check taginfo because no attribute declaration for " + attribute.getName(), attDecl); //$NON-NLS-1$
-
- String tagInfo = (String) attDecl.getProperty("tagInfo"); //$NON-NLS-1$
- assertNull("Unexpected taginfo found for " + attDecl.getNodeName(), tagInfo); //$NON-NLS-1$
- }
- }
-
- /**
- * Retreives CMAttributeDeclaration indicated by attribute name within
- * elementDecl
- */
- private CMAttributeDeclaration getCMAttributeDeclaration(CMElementDeclaration elementDecl, String attName) {
- CMAttributeDeclaration attrDecl = null;
-
- if (elementDecl != null) {
- CMNamedNodeMap attributes = elementDecl.getAttributes();
- String noprefixName = DOMNamespaceHelper.getUnprefixedName(attName);
- if (attributes != null) {
- attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(noprefixName);
- if (attrDecl == null) {
- attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(attName);
- }
- }
- }
- return attrDecl;
- }
-
- /**
- * Retreives CMElementDeclaration for given node
- *
- * @return CMElementDeclaration - CMElementDeclaration of node or
- * <code>null</code> if not possible
- */
- private CMElementDeclaration getCMElementDeclaration(Element element) {
- CMElementDeclaration result = null;
-
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
- if (modelQuery != null)
- result = modelQuery.getCMElementDeclaration(element);
- return result;
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java
deleted file mode 100644
index 85d3cec..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.css.ElementCSSInlineStyle;
-
-public class BUG124835SetStyleAttributeValueTest extends TestCase {
- /**
- * Tests setting some css attribute values including setting the same
- * value several times for different attributes
- */
- public void testSetAttributeValue() {
- final String ABSOLUTE = "absolute";
- final String ONE = "1";
- final String PX = "50px";
-
- IDOMModel model = FileUtil.createHTMLModel();
- try {
- IDOMDocument doc = model.getDocument();
- Element element = doc.createElement(HTML40Namespace.ElementName.DIV);
- element.setAttribute(HTML40Namespace.ATTR_NAME_ID, "Layer0");
- element.setAttribute(HTML40Namespace.ATTR_NAME_STYLE, "");
- setInlineStyle(element, PropCMProperty.P_POSITION, ABSOLUTE);
- setInlineStyle(element, PropCMProperty.P_Z_INDEX, ONE);
- setInlineStyle(element, PropCMProperty.P_WIDTH, PX);
- setInlineStyle(element, PropCMProperty.P_HEIGHT, PX);
- setInlineStyle(element, PropCMProperty.P_TOP, PX);
- setInlineStyle(element, PropCMProperty.P_LEFT, PX);
-
- assertEquals(ABSOLUTE, getInlineStyle(element, PropCMProperty.P_POSITION));
- assertEquals(ONE, getInlineStyle(element, PropCMProperty.P_Z_INDEX));
- assertEquals(PX, getInlineStyle(element, PropCMProperty.P_WIDTH));
- assertEquals(PX, getInlineStyle(element, PropCMProperty.P_HEIGHT));
- assertEquals(PX, getInlineStyle(element, PropCMProperty.P_TOP));
- assertEquals(PX, getInlineStyle(element, PropCMProperty.P_LEFT));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private void setInlineStyle(Element element, String name, String value) {
- ICSSStyleDeclaration decl = null;
- try {
- decl = (ICSSStyleDeclaration) ((ElementCSSInlineStyle) element).getStyle();
- }
- catch (ClassCastException ex) {
- // do nothing
- }
- if (decl != null) {
- String priority = decl.getPropertyPriority(name);
- decl.setProperty(name, value, priority);
- }
- }
-
-
- private String getInlineStyle(Element element, String name) {
- String value = null;
- ICSSStyleDeclaration decl = null;
- try {
- decl = (ICSSStyleDeclaration) ((ElementCSSInlineStyle) element).getStyle();
- }
- catch (ClassCastException ex) {
- // do nothing
- }
- if (decl != null) {
- value = decl.getPropertyValue(name);
- }
- return value;
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java
deleted file mode 100644
index 7398332..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.model;
-
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.css.DocumentCSS;
-
-public class GetOverrideStyleTest extends TestCase {
- /**
- * Constructor for StyleTest.
- *
- * @param name
- */
- public GetOverrideStyleTest(String name) {
- super(name);
- }
-
- public GetOverrideStyleTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new GetOverrideStyleTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = FileUtil.createHTMLModel();
- try {
- model.getStructuredDocument().setText(null, "<style>p { border-color: blue; margin: 0; } </style> <p style=\"border-color: red; margin: 1;\">");
- Document document = model.getDocument();
-
- DocumentCSS ddd = (DocumentCSS) document;
- NodeList n = document.getElementsByTagName("p");
- ddd.getOverrideStyle((Element) n.item(0), "");
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
deleted file mode 100644
index acfecb1..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.html.core.tests.model;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-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.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.TestWriter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class ModelModifications extends TestCase {
-
- public void testPlainDocument() throws BadLocationException {
- IDocument document = new Document();
- document.set("");
- document.replace(0, 0, "test");
- document.set("");
- document.replace(0, 0, "test2");
- assertTrue(true);
-
- }
-
- public void testRepDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createHTMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetDocumentXMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createXMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.setText(this, "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testRepDocumentJSPMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createJSPModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createHTMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.setText(this, "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetDocumentJSPMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createJSPModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.setText(this, "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testRepDocumentXMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createXMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createHTMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testDocumentJSPMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createJSPModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testDocumentXMLMods() throws UnsupportedEncodingException, IOException {
- IDOMModel model = null; // assumes 0-byte html empty file
-
- model = createXMLModel();
-
- try {
- IDOMDocument doc = model.getDocument();
- Element ele = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele);
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
- Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
- doc.appendChild(ele2);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- * @return
- * @throws IOException
- * @throws UnsupportedEncodingException
- */
- private static IDOMModel createXMLModel() throws UnsupportedEncodingException, IOException {
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
- // always use the same line delimiter for these tests, regardless
- // of
- // plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
- return (IDOMModel) model;
-
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- * @return
- * @throws IOException
- * @throws UnsupportedEncodingException
- */
- private static IDOMModel createHTMLModel() throws UnsupportedEncodingException, IOException {
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test.html", new NullInputStream(), null);
-
- // always use the same line delimiter for these tests, regardless
- // of
- // plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
- return (IDOMModel) model;
-
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- * @return
- * @throws IOException
- * @throws UnsupportedEncodingException
- */
- private static IDOMModel createJSPModel() throws UnsupportedEncodingException, IOException {
-
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
- // always use the same line delimiter for these tests, regardless
- // of
- // plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-
-
- return (IDOMModel) model;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestCatalogContentModels.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestCatalogContentModels.java
deleted file mode 100644
index 28eeed5..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestCatalogContentModels.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.html.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class TestCatalogContentModels extends TestCase {
- private static final String contentTemplate = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html ${METHOD} ${PUBLIC} ${SYSTEM}>\n<html>\n<head>\n<title>Insert title here</title>\n</head>\n<body>\n</body>\n</html>";
-
- public TestCatalogContentModels() {
- this("HTML Content Models from XML Catalog");
- }
-
- public TestCatalogContentModels(String string) {
- super(string);
- }
-
- private void assertIsNotXHTMLContentModel(IDOMModel htmlModel) {
- Element html = htmlModel.getDocument().getDocumentElement();
- CMDocument correspondingCMDocument = ModelQueryUtil.getModelQuery(htmlModel).getCorrespondingCMDocument(html);
- assertNotNull("content model document not found", correspondingCMDocument);
- assertTrue("document is unexpectedly XHTML", correspondingCMDocument.supports(HTMLCMProperties.IS_XHTML));
- }
-
- private void assertIsXHTMLContentModel(IDOMModel htmlModel) {
- Element html = htmlModel.getDocument().getDocumentElement();
- CMDocument correspondingCMDocument = ModelQueryUtil.getModelQuery(htmlModel).getCorrespondingCMDocument(html);
- assertNotNull("content model document not found", correspondingCMDocument);
- assertTrue("document is not XHTML", correspondingCMDocument.supports(HTMLCMProperties.IS_XHTML));
- }
-
- private IDOMModel createHTMLModel(String publicId, String systemId) {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- String source = createTestContents(publicId, systemId);
- model.getStructuredDocument().set(source);
- return model;
- }
-
- private String createTestContents(String publicId, String systemId) {
- String result = null;
- if (systemId != null) {
- result = StringUtils.replace(contentTemplate, "${SYSTEM}", "\"" + systemId + "\"");
- }
- else {
- result = StringUtils.replace(contentTemplate, "${SYSTEM}", "");
- }
- if (publicId != null) {
- result = StringUtils.replace(contentTemplate, "${PUBLIC}", "\"" + publicId + "\"");
- }
- else {
- result = StringUtils.replace(contentTemplate, "${PUBLIC}", "");
- }
- if (publicId != null && systemId != null)
- result = StringUtils.replace(contentTemplate, "${METHOD}", "PUBLIC");
- else if (publicId == null && systemId != null)
- result = StringUtils.replace(contentTemplate, "${METHOD}", "SYSTEM");
- else
- result = StringUtils.replace(contentTemplate, "${METHOD}", "");
-
- return result;
- }
-
- public void testCHTMLdraft() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD Compact HTML 1.0 Draft//EN", null);
- assertIsNotXHTMLContentModel(htmlModel);
- }
-
- public void testHTML401Frameset() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD HTML 4.01 Frameset//EN", "http://www.w3.org/TR/html4/frameset.dtd");
- assertIsNotXHTMLContentModel(htmlModel);
- }
-
- public void testHTML401Strict() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD HTML 4.01//EN", "http://www.w3.org/TR/html4/strict.dtd");
- assertIsNotXHTMLContentModel(htmlModel);
- }
-
- public void testHTML401Transitional() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD HTML 4.01 Transitional//EN", "http://www.w3.org/TR/html4/loose.dtd");
- assertIsNotXHTMLContentModel(htmlModel);
- }
-
- public void testWML11() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//WAPFORUM//DTD WML 1.1//EN", null);
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testWML13() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//WAPFORUM//DTD WML 1.3//EN", "http://www.wapforum.org/DTD/wml13.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML10Basic() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD XHTML Basic 1.0//EN", "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML10Frameset() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD XHTML 1.0 Frameset//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML10Mobile() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//WAPFORUM//DTD XHTML Mobile 1.0//EN", "http://www.wapforum.org/DTD/xhtml-mobile10.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML10Strict() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML10Transitional() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-
- public void testXHTML11() throws Exception {
- IDOMModel htmlModel = createHTMLModel("-//W3C//DTD XHTML 1.1//EN", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd");
- assertIsXHTMLContentModel(htmlModel);
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java
deleted file mode 100644
index 74bf87e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.html.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-public class TestForNPEInCSSCreation extends TestCase {
-
-
- public void testCSSModel() {
-
- IDOMModel model = FileUtil.createHTMLModel();
-
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(getHTMLDocumentText());
-
- IDOMDocument doc = model.getDocument();
-
- // get head tag
- NodeList list = doc.getElementsByTagName(HTML40Namespace.ElementName.HEAD);
- Element head = (Element) list.item(0);
-
- // create and append style element
- Element ele = doc.createElement(HTML40Namespace.ElementName.STYLE);
- ele.setAttribute(HTML40Namespace.ATTR_NAME_TYPE, "text/css");
-
- String delim = model.getStructuredDocument().getLineDelimiter();
- if (delim == null)
- delim = "\n";//$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(delim);
- buffer.append("<!--");//$NON-NLS-1$
- buffer.append(delim);
- buffer.append("-->");//$NON-NLS-1$
- buffer.append(delim);
- Text text = doc.createTextNode(buffer.toString());
- ele.appendChild(text);
-
- head.insertBefore(ele, null);
-
- // get adapter for StyleSheet
- ICSSStyleSheet sheet = (ICSSStyleSheet) ((IStyleSheetAdapter) ((INodeNotifier) ele).getAdapterFor(IStyleSheetAdapter.class)).getSheet();
-
- // create style declaration
- ICSSStyleRule rule = sheet.createCSSStyleRule();
- rule.getStyle().setProperty("background-color", "lime", "");
- rule.getStyle().setProperty("background-color", "blue", "");
- rule.getStyle().setProperty("background-color", "#0080ff", "");
-
- //model.save();
-
-
- }
-
-
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- private String getHTMLDocumentText() {
- return "<html><head></head><body></body></html>";
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java
deleted file mode 100644
index 0ed2256..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-
-import junit.framework.TestSuite;
-
-
-public class AllModelParserTests {
-
- // public AllModelParserTests(String name) {
- // //super(name);
- // }
-
- public void holdOldTestMain() {
- runTest(new ParserTest());
- runTest(new ParserTest2());
- runTest(new ParserTest3());
- runTest(new ParserTest4());
- runTest(new UpdaterTest());
- runTest(new UpdaterTest2());
- runTest(new UpdaterTest3());
- runTest(new UpdaterTest4());
- runTest(new UpdaterTest5());
- runTest(new UpdaterTest6());
- runTest(new UpdaterTest7());
- runTest(new UpdaterTest8());
- runTest(new UpdaterTest9());
- runTest(new UpdaterTest10());
- runTest(new UpdaterTest11());
- runTest(new UpdaterTest12());
- runTest(new UpdaterTest13());
- runTest(new UpdaterTest14());
- runTest(new ElementTest());
- runTest(new ElementTest2());
- runTest(new ElementTest3());
- runTest(new TableTest());
- runTest(new TextTest());
- runTest(new TextTest2());
- runTest(new TextTest3());
- runTest(new SplitTextTest());
- runTest(new SplitTextTest2());
- runTest(new SplitTextTest3());
- runTest(new SplitTextTest4());
- runTest(new SplitTextTest5());
- runTest(new SplitTextTest6());
- runTest(new SplitTextTest7());
- runTest(new SplitTextTest8());
- runTest(new EmptyTextTest());
- runTest(new EmptyTextTest2());
- runTest(new EmptyTextTest3());
- runTest(new AttrTest());
- runTest(new AttrTest2());
- runTest(new EntityTest());
- runTest(new EntityTest2());
- runTest(new EntityTest3());
- runTest(new EntityTest4());
- runTest(new EntityTest5());
- runTest(new EntityTest6());
- runTest(new EntityTest7());
- runTest(new EntityTest8());
- runTest(new EntityTest9());
- runTest(new DocTypeTest());
- runTest(new CDATASectionTest());
- runTest(new CDATASectionTest2());
- runTest(new CDATASectionTest3());
- runTest(new PITest());
- }
-
- public static TestSuite getAllTests() {
-
-
- TestSuite testSuite = new TestSuite();
-
- testSuite.addTestSuite(ParserTest.class);
- testSuite.addTestSuite(ParserTest2.class);
- testSuite.addTestSuite(ParserTest3.class);
- testSuite.addTestSuite(ParserTest4.class);
- testSuite.addTestSuite(UpdaterTest.class);
- testSuite.addTestSuite(UpdaterTest2.class);
- testSuite.addTestSuite(UpdaterTest3.class);
- testSuite.addTestSuite(UpdaterTest4.class);
- testSuite.addTestSuite(UpdaterTest5.class);
- testSuite.addTestSuite(UpdaterTest6.class);
- testSuite.addTestSuite(UpdaterTest7.class);
- testSuite.addTestSuite(UpdaterTest8.class);
- testSuite.addTestSuite(UpdaterTest9.class);
- testSuite.addTestSuite(UpdaterTest10.class);
- testSuite.addTestSuite(UpdaterTest11.class);
- testSuite.addTestSuite(UpdaterTest12.class);
- testSuite.addTestSuite(UpdaterTest13.class);
- testSuite.addTestSuite(UpdaterTest14.class);
- testSuite.addTestSuite(ElementTest.class);
- testSuite.addTestSuite(ElementTest2.class);
- testSuite.addTestSuite(ElementTest3.class);
- testSuite.addTestSuite(TableTest.class);
- testSuite.addTestSuite(TextTest.class);
- testSuite.addTestSuite(TextTest2.class);
- testSuite.addTestSuite(TextTest3.class);
- testSuite.addTestSuite(SplitTextTest.class);
- testSuite.addTestSuite(SplitTextTest2.class);
- testSuite.addTestSuite(SplitTextTest3.class);
- testSuite.addTestSuite(SplitTextTest4.class);
- testSuite.addTestSuite(SplitTextTest5.class);
- testSuite.addTestSuite(SplitTextTest6.class);
- testSuite.addTestSuite(SplitTextTest7.class);
- testSuite.addTestSuite(SplitTextTest8.class);
- testSuite.addTestSuite(EmptyTextTest.class);
- testSuite.addTestSuite(EmptyTextTest2.class);
- testSuite.addTestSuite(EmptyTextTest3.class);
- testSuite.addTestSuite(AttrTest.class);
- testSuite.addTestSuite(AttrTest2.class);
- testSuite.addTestSuite(EntityTest.class);
- testSuite.addTestSuite(EntityTest2.class);
- testSuite.addTestSuite(EntityTest3.class);
- testSuite.addTestSuite(EntityTest4.class);
- testSuite.addTestSuite(EntityTest5.class);
- testSuite.addTestSuite(EntityTest6.class);
- testSuite.addTestSuite(EntityTest7.class);
- testSuite.addTestSuite(EntityTest8.class);
- testSuite.addTestSuite(EntityTest9.class);
- testSuite.addTestSuite(DocTypeTest.class);
- testSuite.addTestSuite(CDATASectionTest.class);
- testSuite.addTestSuite(CDATASectionTest2.class);
- testSuite.addTestSuite(CDATASectionTest3.class);
- testSuite.addTestSuite(PITest.class);
- // the follow is fairly long running
- //testSuite.addTestSuite(TestExampleFiles.class);
-
- return testSuite;
- }
-
-
-
- private void runTest(ModelTest test) {
- try {
- test.testModel();
- }
- catch (Exception ex) {
- ModelTest.printException(ex);
- }
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java
deleted file mode 100644
index 6161715..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class AttrTest extends ModelTest {
- /**
- * Constructor for AttrTest.
- *
- * @param name
- */
- public AttrTest(String name) {
- super(name);
- }
-
- public AttrTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new AttrTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- //Document document = model.getDocument();
-
- structuredDocument.setText(this, "<a href=\"<%=c%>\">a</a>");
-
- printSource(model);
- printTree(model);
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java
deleted file mode 100644
index 86b44c2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class AttrTest2 extends ModelTest {
- /**
- * Constructor for AttrTest2.
- *
- * @param name
- */
- public AttrTest2(String name) {
- super(name);
- }
-
- public AttrTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new AttrTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- a.setAttribute("b", "c");
- a.setAttribute("d", "e");
- Text t = document.createTextNode("f");
- document.appendChild(a);
- a.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- Attr b = a.getAttributeNode("b");
- b.setPrefix("x");
-
- fOutputWriter.writeln("b.name=" + b.getName());
- fOutputWriter.writeln("b.value=" + b.getValue());
- String ab = a.getAttribute("b");
- fOutputWriter.writeln("a b=" + ab);
- String axb = a.getAttribute("x:b");
- fOutputWriter.writeln("a x:b=" + axb);
-
- printSource(model);
- printTree(model);
-
- a.getAttributeNode("d").setPrefix("y");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java
deleted file mode 100644
index 3f315c3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AttrTest3 extends ModelTest {
- /**
- * Constructor for AttrTest3.
- *
- * @param name
- */
- public AttrTest3(String name) {
- super(name);
- }
-
- public AttrTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new AttrTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.setText(this, "<a xmlns='default-uri' xmlns:b='b-uri'><c d='d-value' b:e='e-value'/></a>");
-
- printSource(model);
- printTree(model);
-
- Element a = (Element) document.getFirstChild();
- Element c = (Element) a.getFirstChild();
-
- Attr xmlns = a.getAttributeNode("xmlns");
- fOutputWriter.writeln("xmlns [" + xmlns.getNamespaceURI() + "]");
- Attr xmlns_b = a.getAttributeNode("xmlns:b");
- fOutputWriter.writeln("xmlns:b [" + xmlns_b.getNamespaceURI() + "]");
- Attr d = c.getAttributeNode("d");
- fOutputWriter.writeln("d [" + d.getNamespaceURI() + "]");
- Attr b_e = c.getAttributeNode("b:e");
- fOutputWriter.writeln("b:e [" + b_e.getNamespaceURI() + "]");
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java
deleted file mode 100644
index 14a08f6..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class CDATASectionTest extends ModelTest {
- /**
- * Constructor for CDATASectionTest.
- *
- * @param name
- */
- public CDATASectionTest(String name) {
- super(name);
- }
-
- public CDATASectionTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new CDATASectionTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a><![CDATA[contentOfCDATASection]]></a>");
-
- printSource(model);
- printTree(model);
-
- Node a = document.getFirstChild();
- for (Node child = a.getFirstChild(); child != null; child = child.getNextSibling()) {
- if (child.getNodeType() != Node.CDATA_SECTION_NODE)
- continue;
- CDATASection cdata = (CDATASection) child;
- fOutputWriter.writeln(cdata.getData());
- }
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java
deleted file mode 100644
index fc66e6b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CDATASectionTest2 extends ModelTest {
- /**
- * Constructor for CDATASectionTest2.
- *
- * @param name
- */
- public CDATASectionTest2(String name) {
- super(name);
- }
-
- public CDATASectionTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new CDATASectionTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- CDATASection cdata = document.createCDATASection("contentOfCDATASection");
- a.appendChild(cdata);
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- cdata.setData("new content");
-
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- cdata.setData("new content");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java
deleted file mode 100644
index ee7cc3b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CDATASectionTest3 extends ModelTest {
- /**
- * Constructor for CDATASectionTest3.
- *
- * @param name
- */
- public CDATASectionTest3(String name) {
- super(name);
- }
-
- public CDATASectionTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new CDATASectionTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- CDATASection cdata = document.createCDATASection("contentOfCDATASection");
- a.appendChild(cdata);
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- cdata.setData("new < content");
-
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- cdata.setData("new > content");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(cdata.getData());
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java
deleted file mode 100644
index 584765f..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class DocTypeTest extends ModelTest {
- /**
- * Constructor for DocTypeTest.
- *
- * @param name
- */
- public DocTypeTest(String name) {
- super(name);
- }
-
- public DocTypeTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new DocTypeTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- IDOMDocument document = model.getDocument();
-
- IDOMDocumentType docType = (IDOMDocumentType) document.createDoctype("HTML");
- document.appendChild(docType);
- Element html = document.createElement("HTML");
- document.appendChild(html);
-
- printSource(model);
- printTree(model);
-
- docType.setSystemId("sytem");
-
- printSource(model);
- printTree(model);
-
- docType.setPublicId("public");
-
- printSource(model);
- printTree(model);
-
- document.insertBefore(document.createTextNode(" "), docType);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java
deleted file mode 100644
index 3d0714c..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ElementTest extends ModelTest {
- /**
- * Constructor for ElementTest.
- *
- * @param name
- */
- public ElementTest(String name) {
- super(name);
- }
-
- public ElementTest() {
- super();
- }
-
- public Element changeTagName(Element element, String tagName) {
- Document document = element.getOwnerDocument();
- Node parent = element.getParentNode();
- Element newElement = document.createElement(tagName);
- NamedNodeMap attributes = element.getAttributes();
- while (attributes.getLength() > 0) {
- Attr attr = (Attr) attributes.item(0);
- attr = element.removeAttributeNode(attr);
- newElement.setAttributeNode(attr);
- }
- while (element.hasChildNodes()) {
- Node child = element.getFirstChild();
- child = element.removeChild(child);
- newElement.appendChild(child);
- }
- parent.insertBefore(newElement, element);
- parent.removeChild(element);
- return newElement;
- }
-
- public static void main(java.lang.String[] args) {
- new ElementTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<a><b e=\"f\" c=\"d\"><g /><h /></b></a>");
- Node a = document.getFirstChild();
- Element b = (Element) a.getFirstChild();
-
- printSource(model);
- printTree(model);
-
- //Element i =
- changeTagName(b, "i");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java
deleted file mode 100644
index b52282e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class ElementTest2 extends ModelTest {
- /**
- * Constructor for ElementTest2.
- *
- * @param name
- */
- public ElementTest2(String name) {
- super(name);
- }
-
- public ElementTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ElementTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- Element b = document.createElement("b");
- Text t = document.createTextNode("c");
- document.appendChild(a);
- a.appendChild(b);
- b.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- a.setPrefix("x");
-
- fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
- printSource(model);
- printTree(model);
-
- b.setPrefix("y");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java
deleted file mode 100644
index 8a41561..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class ElementTest3 extends ModelTest {
- /**
- * Constructor for ElementTest3.
- *
- * @param name
- */
- public ElementTest3(String name) {
- super(name);
- }
-
- public ElementTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ElementTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("x:a");
- Element b = document.createElement("b");
- Text t = document.createTextNode("c");
- document.appendChild(a);
- a.appendChild(b);
- b.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- a.setPrefix("");
-
- fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
- printSource(model);
- printTree(model);
-
- a.setPrefix("y");
-
- fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
- printSource(model);
- printTree(model);
-
- a.setPrefix("y");
-
- printSource(model);
- printTree(model);
-
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java
deleted file mode 100644
index 6133c80..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest extends ModelTest {
- /**
- * Constructor for EmptyTextTest.
- *
- * @param name
- */
- public EmptyTextTest(String name) {
- super(name);
- }
-
- public EmptyTextTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EmptyTextTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a");
- p.appendChild(text);
- Element br = document.createElement("BR");
- p.appendChild(br);
- Text text2 = document.createTextNode("");
- p.appendChild(text2);
-
- printSource(model);
- printTree(model);
-
- Text text3 = document.createTextNode("");
- p.insertBefore(text3, text2);
-
- printSource(model);
- printTree(model);
-
- text3.setData("b");
-
- printSource(model);
- printTree(model);
-
- p.removeChild(text2);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java
deleted file mode 100644
index e88f41b..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest2 extends ModelTest {
- /**
- * Constructor for EmptyTextTest2.
- *
- * @param name
- */
- public EmptyTextTest2(String name) {
- super(name);
- }
-
- public EmptyTextTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EmptyTextTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.setData("a");
-
- printSource(model);
- printTree(model);
-
- text.setData("");
-
- printSource(model);
- printTree(model);
-
- Element b = document.createElement("B");
- p.appendChild(b);
- p.removeChild(text);
- b.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.setData("a");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java
deleted file mode 100644
index aecedfd..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest3 extends ModelTest {
- /**
- * Constructor for EmptyTextTest3.
- *
- * @param name
- */
- public EmptyTextTest3(String name) {
- super(name);
- }
-
- public EmptyTextTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EmptyTextTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Text text = document.createTextNode("");
- document.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Element a = document.createElement("a");
- document.insertBefore(a, text);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java
deleted file mode 100644
index b154fe2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest extends ModelTest {
- /**
- * Constructor for EntityTest.
- *
- * @param name
- */
- public EntityTest(String name) {
- super(name);
- }
-
- public EntityTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
-
- printSource(model);
- printTree(model);
-
- Text text = document.createTextNode(">");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java
deleted file mode 100644
index 5598bbf..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest2 extends ModelTest {
- /**
- * Constructor for EntityTest2.
- *
- * @param name
- */
- public EntityTest2(String name) {
- super(name);
- }
-
- public EntityTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.setData("a>");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java
deleted file mode 100644
index 919d0d0..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest3 extends ModelTest {
- /**
- * Constructor for EntityTest3.
- *
- * @param name
- */
- public EntityTest3(String name) {
- super(name);
- }
-
- public EntityTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.setData("ab");
-
- printSource(model);
- printTree(model);
-
- text.setData("ab&");
-
- printSource(model);
- printTree(model);
-
- text.setData("ab&c");
-
- printSource(model);
- printTree(model);
-
- text.setData("dab&c");
-
- printSource(model);
- printTree(model);
-
- text.setData("dab&ce");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java
deleted file mode 100644
index b072384..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest4 extends ModelTest {
- /**
- * Constructor for EntityTest4.
- *
- * @param name
- */
- public EntityTest4(String name) {
- super(name);
- }
-
- public EntityTest4() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest4().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a&b");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = document.createTextNode("");
- p.insertBefore(text2, text);
-
- printSource(model);
- printTree(model);
-
- text2.setData("c");
-
- printSource(model);
- printTree(model);
-
- text2.setData("ca&b");
-
- printSource(model);
- printTree(model);
-
- p.removeChild(text);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java
deleted file mode 100644
index 367d4af..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest5 extends ModelTest {
- /**
- * Constructor for EntityTest5.
- *
- * @param name
- */
- public EntityTest5(String name) {
- super(name);
- }
-
- public EntityTest5() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest5().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a&b");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = document.createTextNode("a&b");
- p.insertBefore(text2, text);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java
deleted file mode 100644
index 5b21f8d..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest6 extends ModelTest {
- /**
- * Constructor for EntityTest6.
- *
- * @param name
- */
- public EntityTest6(String name) {
- super(name);
- }
-
- public EntityTest6() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest6().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("a&");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = document.createTextNode("a&");
- p.insertBefore(text2, text);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java
deleted file mode 100644
index c1c8dd8..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest7 extends ModelTest {
- /**
- * Constructor for EntityTest7.
- *
- * @param name
- */
- public EntityTest7(String name) {
- super(name);
- }
-
- public EntityTest7() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest7().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- //Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a>aAA&unk;&unk&unk</a>");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java
deleted file mode 100644
index 6d7d471..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest8 extends ModelTest {
- /**
- * Constructor for EntityTest8.
- *
- * @param name
- */
- public EntityTest8(String name) {
- super(name);
- }
-
- public EntityTest8() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest8().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- //Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "&ibm;&rtp;");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java
deleted file mode 100644
index b80224e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest9 extends ModelTest {
- /**
- * Constructor for EntityTest9.
- *
- * @param name
- */
- public EntityTest9(String name) {
- super(name);
- }
-
- public EntityTest9() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new EntityTest9().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- //Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(this, 4, 0, ">");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(this, 7, 0, ";");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
deleted file mode 100644
index db6c9f4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Writer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.tests.utils.DateUtil;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.html.core.tests.utils.StringCompareUtil;
-import org.eclipse.wst.html.core.tests.utils.TestWriter;
-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.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.StructuredDocumentRegionChecker;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-public abstract class ModelTest extends TestCase {
-
- public final static String testResultsDirectoryPrefix = "ParserResults";
- private final static String fileExtension = ".txt";
- protected TestWriter fOutputWriter = new TestWriter();
- private int READ_BUFFER_SIZE = 4096;
-
- private boolean echoToSystemOut = false;
- private boolean printedOnce;
- private boolean printSummaryToSystemOut;
-
- /**
- * Constructor for ModelTest.
- *
- * @param name
- */
- public ModelTest(String name) {
- super(name);
- try {
- printClass();
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public ModelTest() {
- this("dummy");
- // try {
- // printClass();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- public static IDOMModel createHTMLModel() {
-
- //return new XMLModelImpl();
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test.html", new NullInputStream(), null);
-
- // always use the same line delimiter for these tests, regardless
- // of
- // plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- //assertTrue("basic XML empty model could not be created", model !=
- // null);
- return (IDOMModel) model;
-
- }
-
- public static IDOMModel createXMLModel() {
-
- //return new XMLModelImpl();
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- //assertTrue("modelManager must not be null", modelManager !=
- // null);
-
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
- // always use the same line delimiter for these tests, regardless
- // of
- // plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- //assertTrue("basic XML empty model could not be created", model !=
- // null);
- return (IDOMModel) model;
-
- }
-
- /**
- */
- private void printClass() throws IOException {
- fOutputWriter.writeln(getClass().getName());
- }
-
- public static void printException(Exception ex) {
- ex.printStackTrace();
- }
-
- private void printNode(Node node, int indent) {
- try {
- StringBuffer buffer = new StringBuffer(10);
- for (int i = 0; i < indent; i++)
- buffer.append("--");
- buffer.append(StringUtils.escape(node.toString()));
- fOutputWriter.writeln(buffer.toString());
- indent++;
- Node child = node.getFirstChild();
- while (child != null) {
- printNode(child, indent);
- child = child.getNextSibling();
- }
- }
- catch (Exception ex) {
- printException(ex);
- }
- }
-
- public void printSource(IDOMModel model) {
- try {
- fOutputWriter.writeln("Source :");
- fOutputWriter.writeln(model.getStructuredDocument().getText());
- fOutputWriter.writeln("");
- }
- catch (Exception ex) {
- printException(ex);
- }
- }
-
- public void printTree(IDOMModel model) {
- try {
- printFlatModel(model.getStructuredDocument());
- new StructuredDocumentRegionChecker(fOutputWriter).checkModel(model);
- fOutputWriter.writeln("Tree :");
- printNode(model.getDocument(), 0);
- fOutputWriter.writeln("");
-
- }
- catch (Exception ex) {
- printException(ex);
- }
-
- }
-
- protected void saveAndCompareTestResults() {
- try {
- String testOutputDirectory = testResultsDirectoryPrefix + DateUtil.now();
- String currentFilename = getClass().getName() + fileExtension;
- File fileout = FileUtil.makeFileFor(testOutputDirectory, currentFilename, testResultsDirectoryPrefix);
- Writer fileWriter = new FileWriter(fileout);
- fileWriter.write(fOutputWriter.toString());
- fileWriter.close();
- compareWithPreviousResults(fOutputWriter, currentFilename);
-
- if (echoToSystemOut) {
- System.out.println(fOutputWriter.toString());
- }
-
- fOutputWriter.close();
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Method compareWithPreviousResults.
- *
- * @param outputWriter
- * @param currentFilename
- */
- private void compareWithPreviousResults(TestWriter outputWriter, String currentFilename) throws IOException {
- boolean success = false;
- File previousResultsDir = FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- if (previousResultsDir != null) {
- String currentResults = outputWriter.toString();
- File previousResultsFile = new File(previousResultsDir, currentFilename);
- FileReader previousResultsFileReader = new FileReader(previousResultsFile);
- String previousResults = readString(previousResultsFileReader);
- StringCompareUtil stringCompare = new StringCompareUtil();
- // trying to "force" the same linedelimter didn't work well,
- // I think since the line delimiter is input on some tests,
- // and CVS is likely to change anyway (for ASCII files).
- // so we'll ignore in our comparisons. Note: we wouldn't
- // want to ignore whitespace. There might actually be some
- // tests that are not as accurate if we ignore EOL, but there
- // seems to be no easy way to handle, with out a lot of trouble.
- if (!stringCompare.equalsIgnoreLineSeperator(previousResults, currentResults)) {
- // previousResults.equals(currentResults)) {
- // fail
- success = false;
-
- System.out.println();
- System.out.println(currentFilename + " failed comparison to previous results");
- System.out.println("Previous: ");
- System.out.println(previousResults);
- System.out.println();
- System.out.println("Current: ");
- System.out.println(currentResults);
- System.out.println();
- }
- else {
- success = true;
- if (printSummaryToSystemOut) {
- System.out.println();
- System.out.println(currentFilename + " compared ok");
- System.out.println();
- }
- }
- }
- else {
- if (!printedOnce) {
- System.out.println();
- System.out.println("No Previous Directory found ... couldn't compare " + currentFilename + " with previous results");
- printedOnce = true;
- System.out.println();
- }
- }
- assertTrue("current is not equal to reference results for " + currentFilename, success);
- }
-
- /**
- * Method readString.
- *
- * @param previousResultsFileReader
- * @return String
- */
- private String readString(FileReader fileReader) throws IOException {
- return readInputStream(fileReader);
- }
-
- private String readInputStream(InputStreamReader inputStreamReader) throws IOException {
- int numRead = 0;
- StringBuffer buffer = new StringBuffer();
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = inputStreamReader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- // remember -- we didn't open stream ... so we don't close it
- return buffer.toString();
- }
-
- public abstract void testModel();
-
- protected void printFlatModel(IStructuredDocument flatModel) {
- fOutputWriter.writeln("");
- fOutputWriter.writeln("StructuredDocument Regions :");
- IStructuredDocumentRegion flatnode = flatModel.getFirstStructuredDocumentRegion();
- while (flatnode != null) {
-
- fOutputWriter.writeln(flatnode.toString());
- flatnode = flatnode.getNext();
-
- }
- fOutputWriter.writeln("");
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java
deleted file mode 100644
index d113bfb..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.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.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class NodeListTest extends ModelTest {
- /**
- * Constructor for PITest.
- *
- * @param name
- */
- public NodeListTest(String name) {
- super(name);
- }
-
- public NodeListTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new NodeListTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<p></p>");
- Node parent = document.getFirstChild();
-
- for (int i = 0; i < 1; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 1; i < 5; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 5; i < 10; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 10; i < 20; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 20; i < 50; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 50; i < 100; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 100; i < 200; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 200; i < 500; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 500; i < 1000; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 1000; i < 2000; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 2000; i < 5000; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
-
- for (int i = 5000; i < 10000; i++) {
- parent.appendChild(document.createElement("c"));
- }
-
- iterate(parent);
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-
- private void iterate(Node parent) {
- long start = System.currentTimeMillis();
- int i = 0;
- int t = 0;
- while (t < 1000) {
- NodeList childNodes = parent.getChildNodes();
- int length = childNodes.getLength();
- for (i = 0; i < length; i++) {
- childNodes.item(i);
- }
- // these 2 lines are required to invalidate the cache
- parent.appendChild(parent.getOwnerDocument().createTextNode(""));
- parent.removeChild(parent.getLastChild());
- t++;
- }
- float d = ((float) (System.currentTimeMillis() - start)) / t;
- System.out.println(d + " ms for " + i + " child nodes");
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java
deleted file mode 100644
index 59fe472..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java
deleted file mode 100644
index 31d2bbd..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-public class PITest extends ModelTest {
- /**
- * Constructor for PITest.
- *
- * @param name
- */
- public PITest(String name) {
- super(name);
- }
-
- public PITest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new PITest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a><?echo $PHP_SELF?></a>");
-
- printSource(model);
- printTree(model);
-
- Node a = document.getFirstChild();
- for (Node child = a.getFirstChild(); child != null; child = child.getNextSibling()) {
- if (child.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE)
- continue;
- ProcessingInstruction pi = (ProcessingInstruction) child;
- String target = pi.getTarget();
- if (target == null)
- target = "null";
- String data = pi.getData();
- if (data == null)
- data = "null";
- fOutputWriter.writeln("target(" + target + ") data (" + data + ")");
- }
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java
deleted file mode 100644
index 659f7c6..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class ParserTest extends ModelTest {
- /**
- * Constructor for ParserTest.
- *
- * @param name
- */
- public ParserTest(String name) {
- super(name);
- }
-
- public ParserTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ParserTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<P><B></B><B></B></P><P></P>");
- Node p = document.getFirstChild();
- Node b = p.getFirstChild();
- Node b2 = b.getNextSibling();
- Node p2 = p.getNextSibling();
- /*
- * Element p = document.createElement("P");
- * document.appendChild(p); Element b =
- * document.createElement("B"); p.appendChild(b); Element b2 =
- * document.createElement("B"); p.appendChild(b2); Element p2 =
- * document.createElement("P"); document.appendChild(p2);
- */
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 0, 0, "a");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) b).getStartOffset(), 0, "b");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) b2).getStartOffset(), 0, "c");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) b2).getEndOffset(), 0, "d");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) p2).getStartOffset(), 0, "e");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) p2).getStartOffset() + 3, 0, "f");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, ((IDOMNode) p2).getEndOffset(), 0, "g");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java
deleted file mode 100644
index 2b06151..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ParserTest2 extends ModelTest {
- /**
- * Constructor for ParserTest2.
- *
- * @param name
- */
- public ParserTest2(String name) {
- super(name);
- }
-
- public ParserTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ParserTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<a b=\"\" c=\"c\">");
-
- printSource(model);
- printTree(model);
-
- Element a = (Element) document.getFirstChild();
- NamedNodeMap attributes = a.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Node attr = attributes.item(i);
- String name = attr.getNodeName();
- String value = attr.getNodeValue();
- fOutputWriter.writeln(name + "=[" + value + "]");
- }
-
- structuredDocument.replaceText(null, 8, 0, "d");
-
- printSource(model);
- printTree(model);
-
- a = (Element) document.getFirstChild();
- attributes = a.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Node attr = attributes.item(i);
- String name = attr.getNodeName();
- String value = attr.getNodeValue();
- fOutputWriter.writeln(name + "=[" + value + "]");
- }
-
- structuredDocument.replaceText(null, 8, 1, "");
-
- printSource(model);
- printTree(model);
-
- a = (Element) document.getFirstChild();
- attributes = a.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Node attr = attributes.item(i);
- String name = attr.getNodeName();
- String value = attr.getNodeValue();
- fOutputWriter.writeln(name + "=[" + value + "]");
- }
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java
deleted file mode 100644
index 0c4e721..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ParserTest3 extends ModelTest {
- /**
- * Constructor for ParserTest3.
- *
- * @param name
- */
- public ParserTest3(String name) {
- super(name);
- }
-
- public ParserTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ParserTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- //StructuredDocumentEvent event =
- structuredDocument.replaceText(null, 0, 0, "<a b >");
- // dont's print instance of event, or many tests will fail when
- // event class is changed (exactly what is not needed for unit
- // tests!)
- // fOutputWriter.writeln(event.toString());
-
- printSource(model);
- printTree(model);
-
- Element a = (Element) document.getFirstChild();
- NamedNodeMap attributes = a.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Node attr = attributes.item(i);
- String name = attr.getNodeName();
- String value = attr.getNodeValue();
- fOutputWriter.writeln(name + "=[" + value + "]");
- }
-
- StructuredDocumentEvent event2 = structuredDocument.replaceText(null, 4, 1, "");
- // I removed this part of output, since renaming class or package
- // will cause test to fail!
- fOutputWriter.writeln(event2.toString());
-
- printSource(model);
- printTree(model);
-
- a = (Element) document.getFirstChild();
- attributes = a.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Node attr = attributes.item(i);
- String name = attr.getNodeName();
- String value = attr.getNodeValue();
- fOutputWriter.writeln(name + "=[" + value + "]");
- }
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java
deleted file mode 100644
index a6d3b68..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class ParserTest4 extends ModelTest {
- /**
- * Constructor for ParserTest4.
- *
- * @param name
- */
- public ParserTest4(String name) {
- super(name);
- }
-
- public ParserTest4() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new ParserTest4().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- //Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<a>\n\n<% a %>\n<% b %>\n</a>");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 4, 0, "<");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 5, 0, "b");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 6, 0, "c");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 7, 0, "d");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 8, 0, "e");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 9, 0, ">");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java
deleted file mode 100644
index 3f86e48..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Text;
-
-public class SourceTest extends ModelTest {
- /**
- * Constructor for SourceTest.
- *
- * @param name
- */
- public SourceTest(String name) {
- super(name);
- }
-
- public SourceTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SourceTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Text t = document.createTextNode("t");
- document.appendChild(t);
- SourceValidator validator = new SourceValidator(t);
-
- String source = null;
- String result = null;
-
- source = "aaa<bbb>ccc";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "aaa&\"'bbb><ccc"@";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "&&&";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "&bbb&<>ccc";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "&unk;&unk";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java
deleted file mode 100644
index a764220..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SourceTest2 extends ModelTest {
- /**
- * Constructor for SourceTest2.
- *
- * @param name
- */
- public SourceTest2(String name) {
- super(name);
- }
-
- public SourceTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SourceTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- Attr b = document.createAttribute("b");
- a.setAttributeNode(b);
- document.appendChild(a);
- SourceValidator validator = new SourceValidator(b);
-
- String source = null;
- String result = null;
-
- source = "aaa<bbb>ccc";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "aaa&bbb><ccc"@";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "&&&";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "\"aaa\"";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "\"a'a\"";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java
deleted file mode 100644
index 63cd991..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SourceTest3 extends ModelTest {
- /**
- * Constructor for SourceTest3.
- *
- * @param name
- */
- public SourceTest3(String name) {
- super(name);
- }
-
- public SourceTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SourceTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- Attr b = document.createAttribute("b");
- a.setAttributeNode(b);
- document.appendChild(a);
- SourceValidator validator = new SourceValidator(b);
-
- String source = null;
- String result = null;
-
- source = "<% aaa %><%= bbb %>/<%! ccc %>ddd";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = "<% aaa";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- source = ">< % aaa %>";
- fOutputWriter.writeln("source: " + source);
- try {
- validator.validateSource(source);
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
- result = validator.convertSource(source);
- fOutputWriter.writeln("result: " + result);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java
deleted file mode 100644
index e21d379..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest extends ModelTest {
- /**
- * Constructor for SplitTextTest.
- *
- * @param name
- */
- public SplitTextTest(String name) {
- super(name);
- }
-
- public SplitTextTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aabbbbccc");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = text.splitText(2);
-
- printSource(model);
- printTree(model);
-
- Text text3 = text2.splitText(4);
-
- printSource(model);
- printTree(model);
-
- p.removeChild(text2);
-
- printSource(model);
- printTree(model);
-
- text.appendData("ddddddd");
-
- printSource(model);
- printTree(model);
-
- text3.appendData("eee");
-
- printSource(model);
- printTree(model);
-
- p.insertBefore(text2, text3);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java
deleted file mode 100644
index f116cd8..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest2 extends ModelTest {
- /**
- * Constructor for SplitTextTest2.
- *
- * @param name
- */
- public SplitTextTest2(String name) {
- super(name);
- }
-
- public SplitTextTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aabbbbccc");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = text.splitText(2);
-
- printSource(model);
- printTree(model);
-
- Text text3 = text2.splitText(4);
-
- printSource(model);
- printTree(model);
-
- p.removeChild(text2);
-
- printSource(model);
- printTree(model);
-
- Element b = document.createElement("B");
- b.appendChild(text2);
- p.insertBefore(b, text3);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java
deleted file mode 100644
index e020d4f..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest3 extends ModelTest {
- /**
- * Constructor for SplitTextTest3.
- *
- * @param name
- */
- public SplitTextTest3(String name) {
- super(name);
- }
-
- public SplitTextTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aa");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Element b = document.createElement("B");
- Text text2 = document.createTextNode("bbbb");
- b.appendChild(text2);
- p.appendChild(b);
-
- printSource(model);
- printTree(model);
-
- Text text3 = document.createTextNode("ccc");
- p.appendChild(text3);
-
- printSource(model);
- printTree(model);
-
- p.removeChild(b);
-
- printSource(model);
- printTree(model);
-
- p.insertBefore(b, text3);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
-
- }
- finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java
deleted file mode 100644
index b8d70c0..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest4 extends ModelTest {
- /**
- * Constructor for SplitTextTest4.
- *
- * @param name
- */
- public SplitTextTest4(String name) {
- super(name);
- }
-
- public SplitTextTest4() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest4().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.appendData("aaa");
-
- printSource(model);
- printTree(model);
-
- text.deleteData(0, 3);
-
- printSource(model);
- printTree(model);
-
- Text text2 = document.createTextNode("cccc");
- p.insertBefore(text2, text);
-
- printSource(model);
- printTree(model);
-
- text.appendData("aaa");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
-
-
- }
- finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java
deleted file mode 100644
index 96004e1..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest5 extends ModelTest {
- /**
- * Constructor for SplitTextTest5.
- *
- * @param name
- */
- public SplitTextTest5(String name) {
- super(name);
- }
-
- public SplitTextTest5() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest5().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aabbbbccc");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Text text2 = text.splitText(6);
-
- printSource(model);
- printTree(model);
-
- Element br = document.createElement("BR");
- p.insertBefore(br, text2);
-
- printSource(model);
- printTree(model);
-
- text2.setData("cccd");
-
- printSource(model);
- printTree(model);
-
- text2.setData("cccde");
-
- printSource(model);
- printTree(model);
-
- Text text3 = text.splitText(2);
- Element b = document.createElement("B");
- b.appendChild(text3);
- p.insertBefore(b, br);
-
- printSource(model);
- printTree(model);
-
- Text text4 = text2.splitText(3);
- Element i = document.createElement("I");
- i.appendChild(text2);
- p.insertBefore(i, text4);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
-
- }
- finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java
deleted file mode 100644
index 15170c2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest6 extends ModelTest {
- /**
- * Constructor for SplitTextTest6.
- *
- * @param name
- */
- public SplitTextTest6(String name) {
- super(name);
- }
-
- public SplitTextTest6() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest6().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aabbbbccc");
- p.appendChild(text);
- Text text2 = text.splitText(2);
- // ==> // Text text3 =
- text2.splitText(4);
-
- printSource(model);
- printTree(model);
-
- text2.setData("bbbbd");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java
deleted file mode 100644
index d47aaf2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest7 extends ModelTest {
- /**
- * Constructor for SplitTextTest7.
- *
- * @param name
- */
- public SplitTextTest7(String name) {
- super(name);
- }
-
- public SplitTextTest7() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest7().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aaaa");
- Text text2 = document.createTextNode("bbbb");
- p.appendChild(text);
- p.appendChild(text2);
-
- printSource(model);
- printTree(model);
-
-
- // delete accross node boundry
- model.getStructuredDocument().replaceText(this, 6, 3, "");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java
deleted file mode 100644
index e717fd7..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest8 extends ModelTest {
- /**
- * Constructor for SplitTextTest8.
- *
- * @param name
- */
- public SplitTextTest8(String name) {
- super(name);
- }
-
- public SplitTextTest8() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new SplitTextTest8().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Text text = document.createTextNode("aaaa");
- Text text2 = document.createTextNode("bbbb");
- p.appendChild(text);
- p.appendChild(text2);
-
- printSource(model);
- printTree(model);
-
-
- // delete accross node boundry
- model.getStructuredDocument().replaceText(this, 4, 6, "");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java
deleted file mode 100644
index 5205cfd..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class TableTest extends ModelTest {
- /**
- * Constructor for TableTest.
- * @param name
- */
- public TableTest(String name) {
- super(name);
- }
-
- public TableTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new TableTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element html = document.createElement("HTML");
- document.appendChild(html);
-
- printSource(model);
- printTree(model);
-
- Element body = document.createElement("BODY");
- html.appendChild(body);
-
- printSource(model);
- printTree(model);
-
- Element table = document.createElement("TABLE");
- table.setAttribute("border", "1");
- Element td = null;
- for (int row = 0; row < 2; row++) {
- Element tr = document.createElement("TR");
- table.appendChild(tr);
- for (int col = 0; col < 2; col++) {
- td = document.createElement("TD");
- tr.appendChild(td);
- }
- }
- body.appendChild(table);
-
- printSource(model);
- printTree(model);
-
- Element font = document.createElement("FONT");
- font.setAttribute("color", "red");
- Text text = document.createTextNode("text");
- font.appendChild(text);
- td.appendChild(font);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java
deleted file mode 100644
index 40d2e45..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest extends ModelTest {
- /**
- * Constructor for TextTest.
- *
- * @param name
- */
- public TextTest(String name) {
- super(name);
- }
-
- public TextTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new TextTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- CharacterData text = document.createTextNode("text");
- a.appendChild(text);
-
- text.setData("hello <");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(text.getData());
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java
deleted file mode 100644
index 31e7096..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest2 extends ModelTest {
- /**
- * Constructor for TextTest2.
- *
- * @param name
- */
- public TextTest2(String name) {
- super(name);
- }
-
- public TextTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new TextTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- CharacterData text = document.createTextNode("text");
- a.appendChild(text);
-
- text.setNodeValue("hello <");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln(text.getNodeValue());
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java
deleted file mode 100644
index a921701..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest3 extends ModelTest {
- /**
- * Constructor for TextTest3.
- *
- * @param name
- */
- public TextTest3(String name) {
- super(name);
- }
-
- public TextTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new TextTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- IDOMNode text = (IDOMNode) document.createTextNode("text");
- a.appendChild(text);
-
- try {
- text.setSource("hello <");
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
-
- printSource(model);
- printTree(model);
-
- try {
- text.setSource("hello <");
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
-
- printSource(model);
- printTree(model);
-
- try {
- text.setSource("hello &unk;");
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
-
- printSource(model);
- printTree(model);
-
- try {
- text.setSource("hello A");
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
-
- printSource(model);
- printTree(model);
-
- try {
- text.setSource("hello & good-bye");
- }
- catch (InvalidCharacterException ex) {
- fOutputWriter.writeln(ex.getMessage());
- }
-
- printSource(model);
- printTree(model);
-
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java
deleted file mode 100644
index bc6de3d..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest extends ModelTest {
- /**
- * Constructor for UpdaterTest.
- *
- * @param name
- */
- public UpdaterTest(String name) {
- super(name);
- }
-
- public UpdaterTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element html = document.createElement("HTML");
- document.appendChild(html);
-
- printSource(model);
- printTree(model);
-
- Element body = document.createElement("BODY");
- html.appendChild(body);
-
- printSource(model);
- printTree(model);
-
- Element p = document.createElement("P");
- body.appendChild(p);
-
- printSource(model);
- printTree(model);
-
- Text text = document.createTextNode("text");
- p.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- Element br = document.createElement("BR");
- p.insertBefore(br, text);
-
- printSource(model);
- printTree(model);
-
- Element img = document.createElement("IMG");
- p.appendChild(img);
-
- printSource(model);
- printTree(model);
-
- p.removeChild(text);
-
- printSource(model);
- printTree(model);
-
- p.insertBefore(text, img);
-
- printSource(model);
- printTree(model);
-
- body.removeChild(p);
-
- printSource(model);
- printTree(model);
-
- body.appendChild(p);
-
- printSource(model);
- printTree(model);
-
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java
deleted file mode 100644
index ff30d90..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import java.util.Iterator;
-
-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.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest10 extends ModelTest {
- /**
- * Constructor for UpdaterTest10.
- *
- * @param name
- */
- public UpdaterTest10(String name) {
- super(name);
- }
-
- public UpdaterTest10() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest10().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- a.setAttribute("b", "c");
- Element b = document.createElement("b");
- a.appendChild(b);
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln("IStructuredDocumentRegion:");
- IDOMNode node = (IDOMNode) b;
- IStructuredDocumentRegion flatNode = node.getStartStructuredDocumentRegion();
- fOutputWriter.writeln(flatNode.getText());
- Iterator e = flatNode.getRegions().iterator();
- int i = 0;
- while (e.hasNext()) {
- ITextRegion region = (ITextRegion) e.next();
- boolean ok = true; // no longer has parent.
- // //(region.getParent() == flatNode);
- fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
- }
- fOutputWriter.writeln("");
-
- b.setAttribute("c", "d");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln("IStructuredDocumentRegion:");
- node = (IDOMNode) b;
- flatNode = node.getStartStructuredDocumentRegion();
- fOutputWriter.writeln(flatNode.getText());
- e = flatNode.getRegions().iterator();
- i = 0;
- while (e.hasNext()) {
- ITextRegion region = (ITextRegion) e.next();
- boolean ok = true; // no longer has parent.
- // (region.getParent() == flatNode);
- fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
- }
- fOutputWriter.writeln("");
-
- a.setAttribute("b", "cd");
-
- printSource(model);
- printTree(model);
-
- fOutputWriter.writeln("IStructuredDocumentRegion:");
- node = (IDOMNode) b;
- flatNode = node.getStartStructuredDocumentRegion();
- fOutputWriter.writeln(flatNode.getText());
- e = flatNode.getRegions().iterator();
- i = 0;
- while (e.hasNext()) {
- ITextRegion region = (ITextRegion) e.next();
- boolean ok = true; // (region.getParent() == flatNode);
- fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
- }
- fOutputWriter.writeln("");
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java
deleted file mode 100644
index 60046db..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest11 extends ModelTest {
- /**
- * Constructor for UpdaterTest11.
- *
- * @param name
- */
- public UpdaterTest11(String name) {
- super(name);
- }
-
- public UpdaterTest11() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest11().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- Text text = document.createTextNode("b");
- a.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- text.setData("b");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java
deleted file mode 100644
index 55c826e..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest12 extends ModelTest {
- /**
- * Constructor for UpdaterTest12.
- *
- * @param name
- */
- public UpdaterTest12(String name) {
- super(name);
- }
-
- public UpdaterTest12() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest12().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
-
- printSource(model);
- printTree(model);
-
- Element a2 = document.createElement("a");
- document.insertBefore(a2, a);
-
- printSource(model);
- printTree(model);
-
- document.removeChild(a2);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java
deleted file mode 100644
index 3839d64..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest13 extends ModelTest {
- /**
- * Constructor for UpdaterTest13.
- *
- * @param name
- */
- public UpdaterTest13(String name) {
- super(name);
- }
-
- public UpdaterTest13() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest13().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<a>\r\n<b>\r\n</a>");
-
- Element a = (Element) document.getFirstChild();
- Element b = (Element) a.getLastChild();
- Text text = document.createTextNode(" ");
- a.appendChild(text);
-
- printSource(model);
- printTree(model);
-
- a.removeChild(b);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java
deleted file mode 100644
index 1b62d13..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class UpdaterTest14 extends ModelTest {
- /**
- * Constructor for UpdaterTest14.
- *
- * @param name
- */
- public UpdaterTest14(String name) {
- super(name);
- }
-
- public UpdaterTest14() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest14().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- //Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<%= aaaa %>");
-
- printSource(model);
- printTree(model);
-
- structuredDocument.replaceText(null, 2, 0, " ");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java
deleted file mode 100644
index 3e051f5..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class UpdaterTest15 extends ModelTest {
- /**
- * Constructor for UpdaterTest15.
- *
- * @param name
- */
- public UpdaterTest15(String name) {
- super(name);
- }
-
- public UpdaterTest15() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest15().testModel();
- }
-
- public void testModel() {
- // XML case
- IDOMModel model = createXMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- //Document document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<%= aaaa %><P>");
-
- printSource(model);
- printTree(model);
-
- // HTML case
- model = createHTMLModel();
- structuredDocument = model.getStructuredDocument();
- //document = model.getDocument();
-
- structuredDocument.replaceText(null, 0, 0, "<%= aaaa %><P>");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java
deleted file mode 100644
index 9b99c20..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest2 extends ModelTest {
- /**
- * Constructor for UpdaterTest2.
- *
- * @param name
- */
- public UpdaterTest2(String name) {
- super(name);
- }
-
- public UpdaterTest2() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest2().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- Document document = model.getDocument();
-
- structuredDocument.setText(this, "<HTML>\r\n<HEAD></HEAD>\r\n<BODY></BODY>\r\n</HTML>\r\n");
- Element html = (Element) document.getFirstChild();
- Element head = (Element) html.getFirstChild().getNextSibling();
-
- printSource(model);
- printTree(model);
-
- Element meta = document.createElement("META");
- meta.setAttribute("name", "GENERATOR");
- meta.setAttribute("content", "Updater Test 2");
- head.appendChild(meta);
- Text text4 = document.createTextNode("\r\n");
- head.insertBefore(text4, meta);
- Text text5 = document.createTextNode("\r\n");
- head.appendChild(text5);
-
- printSource(model);
- printTree(model);
-
- Element title = document.createElement("TITLE");
- Text text6 = document.createTextNode("");
- title.appendChild(text6);
- head.appendChild(title);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java
deleted file mode 100644
index 5d28188..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest3 extends ModelTest {
- /**
- * Constructor for UpdaterTest3.
- *
- * @param name
- */
- public UpdaterTest3(String name) {
- super(name);
- }
-
- public UpdaterTest3() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest3().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- Element b = document.createElement("b");
- a.appendChild(b);
-
- printSource(model);
- printTree(model);
-
- Text t1 = document.createTextNode("\n");
- a.insertBefore(t1, b);
-
- printSource(model);
- printTree(model);
-
- Text t2 = document.createTextNode("\n");
- a.appendChild(t2);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java
deleted file mode 100644
index 965b138..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest4 extends ModelTest {
- /**
- * Constructor for UpdaterTest4.
- *
- * @param name
- */
- public UpdaterTest4(String name) {
- super(name);
- }
-
- public UpdaterTest4() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest4().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- Text t = document.createTextNode("b");
- a.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- t.setData("b");
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java
deleted file mode 100644
index 541b7a0..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class UpdaterTest5 extends ModelTest {
- /**
- * Constructor for UpdaterTest5.
- *
- * @param name
- */
- public UpdaterTest5(String name) {
- super(name);
- }
-
- public UpdaterTest5() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest5().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a>'</a>");
-
- printSource(model);
- printTree(model);
-
- Node a = document.getFirstChild();
- Node t = a.getFirstChild();
- a.removeChild(t);
- a.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java
deleted file mode 100644
index 97715e4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest6 extends ModelTest {
- /**
- * Constructor for UpdaterTest6.
- *
- * @param name
- */
- public UpdaterTest6(String name) {
- super(name);
- }
-
- public UpdaterTest6() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest6().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element a = document.createElement("a");
- document.appendChild(a);
- Text t = document.createTextNode("b");
- a.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- a.removeChild(t);
-
- printSource(model);
- printTree(model);
-
- a.appendChild(t);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java
deleted file mode 100644
index 0f57e00..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest7 extends ModelTest {
- /**
- * Constructor for UpdaterTest7.
- *
- * @param name
- */
- public UpdaterTest7(String name) {
- super(name);
- }
-
- public UpdaterTest7() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest7().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
- Element b = document.createElement("B");
- p.appendChild(b);
-
- printSource(model);
- printTree(model);
-
- Element b2 = document.createElement("B");
- p.insertBefore(b2, b);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java
deleted file mode 100644
index eea5668..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest8 extends ModelTest {
- /**
- * Constructor for UpdaterTest8.
- *
- * @param name
- */
- public UpdaterTest8(String name) {
- super(name);
- }
-
- public UpdaterTest8() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest8().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
-
- Element p = document.createElement("P");
- document.appendChild(p);
-
- printSource(model);
- printTree(model);
-
- Element p2 = document.createElement("P");
- document.appendChild(p2);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
- }
- finally {
- model.releaseFromEdit();
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java
deleted file mode 100644
index a56b7a5..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest9 extends ModelTest {
- /**
- * Constructor for UpdaterTest9.
- *
- * @param name
- */
- public UpdaterTest9(String name) {
- super(name);
- }
-
- public UpdaterTest9() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTest9().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel();
- try {
- Document document = model.getDocument();
-
- Element style = document.createElement("STYLE");
- document.appendChild(style);
-
- printSource(model);
- printTree(model);
-
- Text text2 = document.createTextNode("p");
- style.appendChild(text2);
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java
deleted file mode 100644
index 3dfef39..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class UpdaterTestRegionChanged extends ModelTest {
- /**
- * Constructor for UpdaterTestRegionChanged.
- *
- * @param name
- */
- public UpdaterTestRegionChanged(String name) {
- super(name);
- }
-
- public UpdaterTestRegionChanged() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new UpdaterTestRegionChanged().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createXMLModel();
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
-
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 5, 1, "");
- if (fmEvent instanceof RegionChangedEvent) {
- fOutputWriter.writeln("ok: RegionChangedEvent");
- }
- else {
- fOutputWriter.writeln("not ok: " + fmEvent.getClass().getName());
- }
-
- Node after = document.getFirstChild();
-
- if (before != after) {
- fOutputWriter.writeln("not ok: Node replaced");
- }
- else {
- fOutputWriter.writeln("ok: Node not replaced");
- }
-
- saveAndCompareTestResults();
- }
- finally {
- model.releaseFromEdit();
- }
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java
deleted file mode 100644
index 4e30339..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser.css;
-
-import org.eclipse.wst.html.core.tests.parser.ModelTest;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.DocumentStyle;
-import org.w3c.dom.stylesheets.LinkStyle;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-public class StyleTest extends ModelTest {
- /**
- * Constructor for StyleTest.
- * @param name
- */
- public StyleTest(String name) {
- super(name);
- }
-
- public StyleTest() {
- super();
- }
-
- public static void main(java.lang.String[] args) {
- new StyleTest().testModel();
- }
-
- public void testModel() {
- IDOMModel model = createHTMLModel(); //new HTMLModelImpl();
- Document document = model.getDocument();
-
- Element style = document.createElement("STYLE");
- Text text = document.createTextNode("BODY { color : red; } P { color : green; } B { color : blue; }");
- style.appendChild(text);
- document.appendChild(style);
-
- printSource(model);
- printTree(model);
-
- DocumentStyle ds = (DocumentStyle) document;
- StyleSheetList ssl = ds.getStyleSheets();
- if (ssl.getLength() > 0) {
- CSSStyleSheet ss = (CSSStyleSheet) ssl.item(0);
- ss.deleteRule(1);
- }
-
- printSource(model);
- printTree(model);
-
- LinkStyle ls = (LinkStyle) style;
- CSSStyleSheet ss2 = (CSSStyleSheet) ls.getSheet();
- if (ss2 != null) {
- ss2.deleteRule(0);
- }
-
- printSource(model);
- printTree(model);
-
- saveAndCompareTestResults();
-
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java
deleted file mode 100644
index 622c920..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java
+++ /dev/null
@@ -1,67 +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:
- * Masaki Saitoh (MSAITOH@jp.ibm.com)
- * See Bug 153000 Style Adapters should be lazier
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=153000
- *
- *
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.text;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-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.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.stylesheets.LinkStyle;
-
-import junit.framework.TestCase;
-
-public class StyleAdapterPerfTest extends TestCase {
-
- /**
- * criteria for "fail", in msecs
- */
- private static final long MAX_EXPECTED_TIME = 4000;
-
- public void testPerformance() {
- try {
- String filename = "testfiles/html/example04.html";
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(filename, getClass().getResourceAsStream(filename), null);
- if (model instanceof IDOMModel) {
- IDOMDocument doc = ((IDOMModel) model).getDocument();
- NodeList nodes = doc.getElementsByTagName(HTML40Namespace.ElementName.STYLE);
- if (nodes != null && nodes.getLength() > 0) {
- Node node = nodes.item(0);
- if (node instanceof LinkStyle) {
- long start = System.currentTimeMillis();
- ((LinkStyle) node).getSheet();
- // System.out.println("elapsed time = " + (System.currentTimeMillis() - start));
- // TODO: we should probably use something likse o.e.core.runtime.PerformanceStats
- // I picked the following fail criteria simple since before fix, the printlin reports about 7000
- // on my computer, but with fix, reported about 1000.
- // The appropriate time may vary greatly depending on the build/test machine.
- // This is just to catch some large change in behavior
- long elapsedTime = System.currentTimeMillis() - start;
- if (elapsedTime > MAX_EXPECTED_TIME) {
- fail("getSheet took longer than expected the expected " + MAX_EXPECTED_TIME +"ms");
- }
- }
- }
- }
- if (model != null)
- model.releaseFromRead();
- }
- catch (Exception e) {
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
deleted file mode 100644
index 1d48a71..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerHTML extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerHTML(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- /**
- * must release model (from edit) after
- * @param filename relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- model = modelManager.getModelForEdit(filename, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- public void testDisconnectConnect() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/html/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- assertNotNull("partitioner was null for sDoc:" + sDoc, partitioner);
- try {
- stp.disconnect();
- }
- catch(Exception e) {
- assertTrue("problem disconnecting w/:" +sDoc + "/n" + e, false);
- }
- try {
- stp.connect(sDoc);
- }
- catch(Exception e) {
- assertTrue("problem connecting w/:" + sDoc + "/n" + e, false);
- }
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetDefaultPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/html/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/html/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("paritioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testHTML1() throws IOException, BadLocationException {
- int expectedPartitions = 4;
- int nPartitions = doComputePartitioningTest("testfiles/html/example01.html");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DECLARATION, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testHTML2() throws IOException, BadLocationException {
- int expectedPartitions = 7;
- //TODO Nitin, we need to review the Unknown to Script change (8/1/03, 9:00PM)
- int nPartitions = doComputePartitioningTest("testfiles/html/example02.html");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT});
- }
-
- public void testHTML3() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- String file = "testfiles/html/example03.html";
- int nPartitions = doComputePartitioningTest(file);
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT});
-
- // 121 if CRLF
- // ITypedRegion scriptPartition = getPartitionTest(file, 121);
- // 116 if LF or CR only
- // ITypedRegion scriptPartition = getPartitionTest(file, 121);
-
- ITypedRegion part1 = getPartitionTest(file, 121);
- ITypedRegion part2 = getPartitionTest(file, 116);
-
-// assertEquals("partition is wrong type!", scriptPartition.getType(), IHTMLPartitions.ST_SCRIPT);
- // the critical position is surrounded with HTML > 5 characters in either direction; this should be good enough
- assertTrue("partition is wrong type! :(" + part1.getType() + "|" + part2.getType() + ")", part1.getType().equals(IHTMLPartitions.SCRIPT) || part2.getType().equals(IHTMLPartitions.SCRIPT));
- assertTrue("partition is not zero length!", (part1.getLength() == 0 || part2.getLength() == 0));
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file, using the
- * default partitioner for that file type. This test allows for verifying the zero-length
- * partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html
deleted file mode 100644
index 4a0ffe2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html SYSTEM nonsense>
-<html>
-<bo<!--comments-->dy>
-abcdefghijklmnopqrstuvwxyz
-</body></html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html
deleted file mode 100644
index a0286c4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html
deleted file mode 100644
index dc8daf3..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head>
-<META creator=wssa/4.0pre119>
-<title>Script Tests</title>
-</head>
-<body>
-<Script language="javascript"></SCRIPT>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html
deleted file mode 100644
index f8078ef..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html
+++ /dev/null
@@ -1,2283 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<TITLE>empty.htm</TITLE>
-<STYLE type="text/css">
-<!--
-.class0 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class1 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class2 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class3 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class3 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class4 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class5 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class6 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class7 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class8 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class9 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class10 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class11 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class12 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class13 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class13 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class14 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class15 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class16 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class17 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class18 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class19 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class20 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class21 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class22 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class23 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class23 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class24 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class25 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class26 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class27 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class28 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class29 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class30 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class31 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class32 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class33 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class33 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class34 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class35 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class36 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class37 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class38 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class39 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class40 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class41 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class42 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class43 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class43 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class44 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class45 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class46 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class47 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class48 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class49 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class50 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class51 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class52 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class53 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class53 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class54 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class55 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class56 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class57 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class58 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class59 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class60 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class61 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class62 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class63 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class63 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class64 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class65 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class66 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class67 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class68 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class69 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class70 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class71 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class72 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class73 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class73 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class74 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class75 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class76 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class77 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class78 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class79 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class80 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class81 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class82 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class83 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class83 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class84 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class85 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class86 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class87 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class88 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class89 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class90 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class91 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class92 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class93 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class93 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class94 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class95 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class96 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class97 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class98 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class99 {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class0 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class1 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class2 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class3 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class3 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class4 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class5 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class6 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class7 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class8 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class9 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class10 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class11 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class12 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class13 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class13 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class14 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class15 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class16 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class17 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class18 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class19 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class20 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class21 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class22 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class23 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class23 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class24 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class25 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class26 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class27 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class28 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class29 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class30 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class31 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class32 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class33 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class33 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class34 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class35 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class36 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class37 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class38 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class39 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class40 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class41 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class42 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class43 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class43 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class44 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class45 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class46 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class47 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class48 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class49 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class50 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class51 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class52 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class53 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class53 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class54 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class55 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class56 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class57 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class58 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class59 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class60 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class61 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class62 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class63 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class63 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class64 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class65 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class66 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class67 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class68 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class69 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class70 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class71 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class72 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class73 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class73 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class74 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class75 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class76 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class77 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class78 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class79 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class80 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class81 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class82 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class83 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class83 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class84 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class85 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class86 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class87 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class88 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class89 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class90 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class91 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class92 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class93 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class93 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class94 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class95 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class96 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class97 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class98 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
-.class99 TD {
- background-color: red;
- border-color: lime;
- margin: 10px;
- border-width: 1px;
- border-style: solid
-}
--->
-</STYLE>
-</HEAD>
-<BODY>
-<TABLE border="0" cellpadding="0" cellspacing="0">
- <TBODY>
- <TR>
- <TD colspan="2"><TABLE border="1">
- <TBODY>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD></TR>
- <TR>
- <TD rowspan="4">
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- <TD>
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <TR><TD>
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <TR><TD>
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <TR><TD>
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- <TR>
- <TD>a</TD>
- <TD>b</TD>
- <TD>c</TD>
- <TD>d</TD>
- <TD>e</TD>
- <TD>f</TD>
- <TD>g</TD>
- <TD>h</TD>
- <TD>i</TD>
- <TD>j</TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java
deleted file mode 100644
index 94e16a2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.html.core.tests.Logger;
-import org.w3c.dom.Document;
-
-/**
- */
-public class CommonXML {
-
- public synchronized static DocumentBuilder getDocumentBuilder() {
- DocumentBuilder result = null;
- try {
- result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
- DocumentBuilder result = null;
- try {
- DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
- instance.setValidating(validating);
- result = instance.newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public static void serialize(Document document, OutputStream ostream) throws IOException {
- Source domSource = new DOMSource(document);
- try {
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- try {
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
- }
- catch (IllegalArgumentException e) {
- // unsupported properties
- }
- serializer.transform(domSource, new StreamResult(ostream));
- }
- catch (TransformerConfigurationException e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerFactoryConfigurationError e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerException e) {
- throw new IOException(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java
deleted file mode 100644
index 01710a9..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
- /**
- * Constructor for AllTests.
- * @param name
- */
- private static String now = null;
-
-
- public static String now() {
- // just calculate once, so whole run as same timestamp
- if (DateUtil.now == null) {
- DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
- Calendar calendar = Calendar.getInstance();
- Date today = calendar.getTime();
- DateUtil.now = format.format(today);
- }
- return DateUtil.now;
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
deleted file mode 100644
index 7b245a2..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
-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.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
- private static final String PLUGIN_ID = "org.eclipse.wst.html.core.tests";
- public static final String commonEOL = "\r\n";
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
-
- static File previousResultsDirectory = null;
- static private String logSubDirectoryPath;
-
- private static boolean notTriedYet = true;
- static int uniqueNum = 0;
-
- public static class DirFilenameFilter implements FilenameFilter {
- String startOfAcceptableNames;
-
- public DirFilenameFilter(String startOfDirName) {
- startOfAcceptableNames = startOfDirName;
- }
-
- /**
- * @see java.io.FileFilter#accept(File)
- */
- public boolean accept(File pathname, String filename) {
- // we'll just assume if it starts with right key, it is a directory ... for now
- return filename.startsWith(startOfAcceptableNames);
- }
-
- }
-
- public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
- if (previousResultsDirectory == null && notTriedYet) {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- //String installPath = url.getPath();
- // add known file so URL method below can be used
- // (doesn't seem to work for directory?)
- URL totalURL = new URL(url, "plugin.xml");
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File pluginHomeDir = new File(finalPath);
- FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
- File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
- // assume first in list is newest, then start looking with the
- // second item ... just to avoid "null" case checking
- if (allDirs.length > 0) {
- File currentNewest = allDirs[0];
- for (int i = 1; i < allDirs.length; i++) {
- File current = allDirs[i];
- // NOTE: we go by modified date, not by the actual time stamp in name.
- // This should work for all normal cases, but may not if someone does some
- // "funny" copying, or updating from repository.
- if (current.lastModified() > currentNewest.lastModified()) {
- currentNewest = current;
- }
- }
- previousResultsDirectory = currentNewest;
- }
- notTriedYet = false;
- }
- return previousResultsDirectory;
- }
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- //URL finalurl = Platform.asLocalURL(totalURL);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!dir.exists()) {
- // a little safety net, be sure the previous newest directory
- // is initialized, just in case no one else has done so
- if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
- FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- }
- // now its "safe" to make the new one
- dir.mkdirs();
- }
- return file;
- }
-
- /**
- * Just a general utility method
- * @param filename
- * @return String
- */
- public static String getExtension(String filename) {
- String extension = null;
- int dotPostion = filename.lastIndexOf('.');
- if (dotPostion > -1) {
- extension = filename.substring(dotPostion + 1);
- }
- else {
- extension = new String();
- }
- return extension;
- }
-
- /**
- * General purpose utility method to ensure the log
- * directory exists, and returns the name.
- */
- public static String getLogDirectory() {
- if (logSubDirectoryPath == null) {
- String mainDirectory = "/logs";
- File dir = new File(mainDirectory);
- ensureExists(dir);
- String subDirectory = TimestampUtil.timestamp();
- logSubDirectoryPath = mainDirectory + "/" + subDirectory;
- File subdir = new File(logSubDirectoryPath);
- ensureExists(subdir);
- }
- return logSubDirectoryPath;
- }
-
- public static void ensureExists(File dir) {
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public static String getPerformanceOutputLogName() {
- String result = null;
- String directoryName = FileUtil.getLogDirectory();
- String extension = ".out";
- String baseName = "sedTests";
- long now = System.currentTimeMillis();
- String nowStr = String.valueOf(now);
- result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
- return result;
- }
- public static IDOMModel createHTMLModel() {
- IStructuredModel model = null;
- try {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test" + uniqueNum++ + ".html", new NullInputStream(), null); //$NON-NLS-1$
-
- // always use the same line delimiter for these tests, regardless
- // of plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return (IDOMModel) model;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java
deleted file mode 100644
index a33ba6a..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java
deleted file mode 100644
index 709a0ef..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-
-
-/**
- * The SourceEditingRuntimeException is often thrown by Source Editor methods when
- * a service we use throws a checked exception, but we want to convert and treat
- * as a runtime exception. (Such as BadLocationException is a common example).
- */
-public class TestRuntimeException extends RuntimeException {
- /**
- * Default <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 1L;
- private Throwable originalException;
-
- public TestRuntimeException() {
- super();
- }
-
- public TestRuntimeException(String s) {
- super(s);
- }
-
- /**
- * This form of the constructor is used to wrapper another exception.
- */
- public TestRuntimeException(Throwable t) {
- super();
- originalException = t;
- }
-
- /**
- * This form of the constructor is used to wrapper another exception, but still
- * provide a new descriptive message.
- */
- public TestRuntimeException(Throwable t, String s) {
- super(s);
- originalException = t;
- }
-
- public String getMessage() {
- String result = super.getMessage();
- if ((result != null) && (!result.endsWith("."))) //$NON-NLS-1$
- result = result + "."; //$NON-NLS-1$
- if (originalException != null) {
- String embeddedMessage = originalException.getMessage();
- // not all exceptions (e.g. many NullPointer exception) have messages
- String originalError = "Original error:"; //$NON-NLS-1$
- if (embeddedMessage != null)
- result = result + " " + originalError + " " + embeddedMessage;//$NON-NLS-2$//$NON-NLS-1$
- else
- result = result + " " + originalError + " " + originalException.toString();//$NON-NLS-2$//$NON-NLS-1$
- }
- return result;
- }
-
- public Throwable getOriginalException() {
- return originalException;
- }
-
- public String toString() {
- // we don't put super.toString or getClass to "hide" that it was a
- // SourceEditing exception (otherwise, focus goes on that,
- // instead of original exception.
- String message = getMessage();
- // message should never be null ... but just in case
- return (message != null) ? message : super.toString();
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java
deleted file mode 100644
index 593f562..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import java.io.StringWriter;
-
-public class TestWriter extends StringWriter {
- // we don't really want to use the system EOL, since
- // we want a common once across platforms, CVS, etc.
- public final static String commonEOL = "\r\n";
-
- //System.getProperty("line.separator");
-
- public void writeln(String line) {
- write(line);
- write(commonEOL);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java
deleted file mode 100644
index 44ac3b4..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
- private static Date timestamp = null;
- private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
- // private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
- private static String nowShort = null;
-
- public static String timestamp() {
-
- if (TimestampUtil.nowShort == null) {
- TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
- }
- return TimestampUtil.nowShort;
- }
-
- protected static Date ensureTimestamp() {
- // just calculate 'timestamp' once per class loading,
- // so this 'timestamp' remains the same during
- // entire run.
- if (TimestampUtil.timestamp == null) {
- Calendar calendar = Calendar.getInstance();
- TimestampUtil.timestamp = calendar.getTime();
- }
- return TimestampUtil.timestamp;
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java
deleted file mode 100644
index 9370ace..0000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.utils;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // we dont' care
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // we dont' care
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // we don't care
- }
-
- public void subTask(String name) {
- // we don't care
- }
-
- public void worked(int work) {
- // we don't care
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/test.xml b/tests/org.eclipse.wst.html.core.tests/test.xml
deleted file mode 100644
index 4692926..0000000
--- a/tests/org.eclipse.wst.html.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.html.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.html.core.tests.HTMLCoreTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.classpath b/tests/org.eclipse.wst.html.tests.encoding/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore b/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
deleted file mode 100644
index 399dfb7..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-htmlencodingtests.jar
-javaCompiler.htmlencodingtests.jar.args
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.project b/tests/org.eclipse.wst.html.tests.encoding/.project
deleted file mode 100644
index 6068b5b..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.html.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 9e38abb..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding
-Bundle-Version: 1.0.201.qualifier
-Bundle-ClassPath: htmlencodingtests.jar
-Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.tests.encoding,
- org.eclipse.wst.html.tests.encoding.html
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.sse.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.tests.encoding/about.html b/tests/org.eclipse.wst.html.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/build.properties b/tests/org.eclipse.wst.html.tests.encoding/build.properties
deleted file mode 100644
index 5d9a3eb..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.htmlencodingtests.jar = src/
-output.htmlencodingtests.jar = bin/
-bin.includes = htmlencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties b/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
deleted file mode 100644
index e49b532..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.html.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
deleted file mode 100644
index f9458f5..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.tests.encoding.html.HTMLEncodingTests;
-import org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester;
-import org.eclipse.wst.html.tests.encoding.html.TestContentTypeDetectionForHTML;
-
-public class HTMLEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, TestContentTypeDetectionForHTML.class};
-
- public static Test suite() {
- return new HTMLEncodingTestSuite();
- }
-
- public HTMLEncodingTestSuite() {
- super("HTML Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public HTMLEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public HTMLEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public HTMLEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
deleted file mode 100644
index d72162f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static HTMLEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static HTMLEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.html.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = HTMLEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public HTMLEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
deleted file mode 100644
index f26283f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.tests.encoding.html;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.contenttype.HTMLResourceEncodingDetector;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class HTMLEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private boolean DEBUG = false;
- private final String fileDir = "html/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public HTMLEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = HTMLEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((HTMLResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = null;
- if (encodingMemento != null) {
- foundIANAEncoding = encodingMemento.getJavaCharsetName();
- }
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- if (expectedIANAEncoding == null) {
- expectedIANAResult = (expectedIANAEncoding == foundIANAEncoding);
- }
- else {
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
- }
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if
- // throws exception.
- if (expectedIANAEncoding != null) {
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
-
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.html";
- // HTML has no spec default encoding. Will use platform default encoding.
- doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
- }
-
- public void testIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.html";
- String ianaInFile = "UTF-8";
- doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
- }
-
- public void testMultiNonDefault() throws IOException {
- String filename = fileLocation + "MultiNonDefault.html";
- doTestFileStream(filename, "ISO-8859-6", new HTMLResourceEncodingDetector());
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "NoEncoding.html";
- // HTML has no spec default encoding. Will use platform default encoding.
- doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
- }
-
- public void testnoquotes() throws IOException {
- String filename = fileLocation + "noquotes.html";
- doTestFileStream(filename, "UTF-8", new HTMLResourceEncodingDetector());
-
- }
-
- public void testNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.html";
- String ianaInFile = "UTF-8";
- doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16BE() throws IOException {
- String filename = fileLocation + "utf16be.html";
- doTestFileStream(filename, "UTF-16BE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16LE() throws IOException {
- String filename = fileLocation + "utf16le.html";
- doTestFileStream(filename, "UTF-16LE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16LENoQuotes() throws IOException {
- String filename = fileLocation + "noquotesUTF16le.html";
- doTestFileStream(filename, "UTF-16LE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = this.fileLocation + "utf16BOM.html";
- doTestFileStream(filename, "UTF-16", new HTMLResourceEncodingDetector());
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
deleted file mode 100644
index 18963f2..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.tests.encoding.html;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer;
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizerConstants;
-import org.eclipse.wst.html.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-
-public class HTMLHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fCharset;
-
- private String fContentTypeValue;
- private final String fileDir = "html/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = this.fileHome + this.fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
- HTMLHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (this.DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = HTMLEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new HTMLHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- HeadParserToken resultToken = null;
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
- else {
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
- }
- else {
- // TODO: need to work on case issues
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue.toUpperCase()));
- }
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testNormalNonDefault() {
- // String filename = fileLocation + "NormalNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (this.fXMLDecEncodingName != null) {
- result = this.fXMLDecEncodingName;
- }
- else if (this.fPageEncodingValue != null) {
- result = this.fPageEncodingValue;
- }
- else if (this.fCharset != null) {
- result = this.fCharset;
- }
- return result;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType == null) {
- result = false;
- }
- else {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- private void parseContentTypeValue(String contentType) {
- Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*");
- String[] parts = pattern.split(contentType);
- if (parts.length > 0) {
- // if only one item, it can still be charset instead of
- // contentType
- if (parts.length == 1) {
- if (parts[0].length() > 6) {
- String checkForCharset = parts[0].substring(0, 7);
- if (checkForCharset.equalsIgnoreCase("charset")) {
- int eqpos = parts[0].indexOf('=');
- eqpos = eqpos + 1;
- if (eqpos < parts[0].length()) {
- this.fCharset = parts[0].substring(eqpos);
- this.fCharset = this.fCharset.trim();
- }
- }
- }
- }
- else {
- // fContentType = parts[0];
- }
-
- }
- if (parts.length > 1) {
- this.fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(HTMLHeadTokenizer tokenizer) throws IOException {
- this.fPageEncodingValue = null;
- this.fCharset = null;
- /*
- * if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) { if
- * (tokenizer.hasMoreTokens()) { ITextHeadRegion valueToken =
- * tokenizer.getNextToken(); String valueTokenType =
- * valueToken.getType(); if (isLegal(valueTokenType)) { resultValue =
- * valueToken.getText(); if (DEBUG) { System.out.println("XML Head
- * Tokenizer Found Encoding: " + resultValue); } } } }
- */
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- if (this.DEBUG) {
- System.out.println(token);
- }
- String tokenType = token.getType();
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- if (this.DEBUG) {
- System.out.println(valueToken);
- }
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- this.fContentTypeValue = valueToken.getText();
-
- }
- }
- }
-
- }
- while (tokenizer.hasMoreTokens());
- if (this.fContentTypeValue != null) {
- parseContentTypeValue(this.fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
-
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws IOException {
- String filename = this.fileLocation + "NormalNonDefault.html";
- doTestFile(filename, "UTF-8");
-
- }
-
- // public void testIllFormed() {
- // String filename = fileLocation + "testIllFormed.jsp";
- // doTestFile(filename);
- // }
- // public void testIllFormed2() {
- // String filename = fileLocation + "testIllFormed2.jsp";
- // doTestFile(filename);
- // }
- // public void testIllformedNormalNonDefault() {
- // String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- // doTestFile(filename);
- // }
- public void testEmptyFile() throws IOException {
- String filename = this.fileLocation + "EmptyFile.html";
- doTestFile(filename, null);
- }
-
- public void testIllFormedNormalNonDefault() throws IOException {
- String filename = this.fileLocation + "IllformedNormalNonDefault.html";
- doTestFile(filename, "UTF-8");
- }
-
- public void testLargeCase() throws IOException {
- String filename = this.fileLocation + "LargeNonDefault.html";
- doTestFile(filename, "ISO-8859-1");
-
- }
-
- public void testLargeNoEncoding() throws IOException {
- String filename = this.fileLocation + "LargeNoEncoding.html";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
-
- }
-
- public void testMultiNonDefault() throws IOException {
- String filename = this.fileLocation + "MultiNonDefault.html";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = this.fileLocation + "NoEncoding.html";
- doTestFile(filename, null);
- }
-
- public void testnoquotes() throws IOException {
- String filename = this.fileLocation + "noquotes.html";
- doTestFile(filename, "UTF-8");
-
- }
-
- public void testnoquotesUTF16le() throws IOException {
- String filename = this.fileLocation + "noquotesUTF16le.html";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16le() throws IOException {
- String filename = this.fileLocation + "utf16le.html";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16be() throws IOException {
- String filename = this.fileLocation + "utf16be.html";
- doTestFile(filename, "UTF-16BE");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.yy_advance(HTMLHeadTokenizer.java:340)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.primGetNextToken(HTMLHeadTokenizer.java:477)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.getNextToken(HTMLHeadTokenizer.java:232)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.parseHeader(HTMLHeadTokenizerTester.java:175)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:57)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:37)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.testUTF16BOM(HTMLHeadTokenizerTester.java:293)
-
- public void testUTF16BOM() throws IOException {
- String filename = this.fileLocation + "utf16BOM.html";
- doTestFile(filename, "UTF-16");
- }
- */
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
deleted file mode 100644
index dc7ea24..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.html.tests.encoding.html;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForHTML extends TestContentTypeDetection {
- public void testFile57() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNoEncoding.html", null);
- }
-
-
- public void testFile60() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16be.html", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16le.html", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/noquotesUTF16le.html", null);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16BOM.html", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/test.xml b/tests/org.eclipse.wst.html.tests.encoding/test.xml
deleted file mode 100644
index fbbf772..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.html.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
deleted file mode 100644
index ef8b5c8..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
deleted file mode 100644
index 84ca60e..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
deleted file mode 100644
index 3bcdd14..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
deleted file mode 100644
index f772113..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
deleted file mode 100644
index 070e4fe..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
deleted file mode 100644
index ba30c9f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
deleted file mode 100644
index 254cde4..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content=text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html
deleted file mode 100644
index acbd519..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
deleted file mode 100644
index d8d62de..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html
deleted file mode 100644
index 0afe69b..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html
deleted file mode 100644
index f4efb61..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.ui.tests/.classpath b/tests/org.eclipse.wst.html.ui.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.html.ui.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.wst.html.ui.tests/.cvsignore b/tests/org.eclipse.wst.html.ui.tests/.cvsignore
deleted file mode 100644
index aaa8372..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-htmluitests.jar
-temp.folder
-javaCompiler.htmluitests.jar.args
diff --git a/tests/org.eclipse.wst.html.ui.tests/.project b/tests/org.eclipse.wst.html.ui.tests/.project
deleted file mode 100644
index a9f401f..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.html.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.html.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.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.html.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.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.html.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.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.html.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.wst.html.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.html.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.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 7978f88..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-ClassPath: htmluitests.jar
-Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.ui.tests,
- org.eclipse.wst.html.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.ui.workbench.texteditor,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.ui.tests/about.html b/tests/org.eclipse.wst.html.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.ui.tests/build.properties b/tests/org.eclipse.wst.html.ui.tests/build.properties
deleted file mode 100644
index c84e64d..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- htmluitests.jar,\
- META-INF/,\
- about.html,\
- icons/,\
- plugin.properties
-jars.compile.order = htmluitests.jar
-source.htmluitests.jar = src/
-output.htmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.properties b/tests/org.eclipse.wst.html.ui.tests/plugin.properties
deleted file mode 100644
index ed966bb..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.html.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor for HTML Tests
-view.name.0 = Embedded HTML Structured Text Viewer
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.xml b/tests/org.eclipse.wst.html.ui.tests/plugin.xml
deleted file mode 100644
index ff9dcb3..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.xml
+++ /dev/null
@@ -1,15 +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.wst.html.ui.tests.viewer.ViewerTestHTML"
- id="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML">
- </view>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java
deleted file mode 100644
index bdad09e..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be 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 HTMLUIPreferencesTest 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, HTMLUIPreferenceNames.AUTO_PROPOSE);
- bundleGetPreference(bundleName, HTMLUIPreferenceNames.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 = HTMLUIPlugin.getDefault().getPreferenceStore();
-
- pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
- pluginGetDefaultPreference(store, HTMLUIPreferenceNames.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 = HTMLUIPlugin.getDefault().getPreferenceStore();
-
- pluginSetPreferenceBoolean(store, HTMLUIPreferenceNames.AUTO_PROPOSE);
- pluginSetPreferenceString(store, HTMLUIPreferenceNames.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);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
deleted file mode 100644
index ad8564f..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import org.eclipse.wst.html.ui.tests.viewer.TestViewerConfigurationHTML;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-
-public class HTMLUITestSuite extends junit.framework.TestSuite {
- public static Test suite() {
- return new HTMLUITestSuite();
- }
-
- public HTMLUITestSuite() {
- super("HTML UI TestSuite");
- addTest(new TestSuite(VerifyEditorPlugin.class));
- addTest(new TestSuite(HTMLUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationHTML.class));
- addTest(new TestSuite(TestEditorConfigurationHTML.class));
- // addTest(new SSEModelTestSuite());
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
deleted file mode 100644
index cecaec3..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLUITestsPlugin extends Plugin {
- //The shared instance.
- private static HTMLUITestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public HTMLUITestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.ui.tests.SSEForHTMLTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static HTMLUITestsPlugin 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 = HTMLUITestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
deleted file mode 100644
index ddf14df..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/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.wst.html.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.wst.html.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.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
deleted file mode 100644
index 8e8fb02..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.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.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.internal.taginfo.HTMLTagInfoHoverProcessor;
-import org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for html content type
- */
-public class TestEditorConfigurationHTML extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), StructuredTextViewerConfigurationHTML.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), HTMLContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-
- public void testGetDocumentationTextHover() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IHTMLPartitions.HTML_DEFAULT);
- assertNotNull("no documentation text hover for " + IHTMLPartitions.HTML_DEFAULT, o);
- // check for over-qualified subclasses
- assertEquals("unexpected documentation text hover for " + IHTMLPartitions.HTML_DEFAULT, o.getClass(), HTMLTagInfoHoverProcessor.class);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index 5c7b94b..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-
-
-public class VerifyEditorPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Plugin plugin = null;
- try {
- plugin = HTMLUIPlugin.getInstance();
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("editor plugin could not be instantiated", plugin);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
deleted file mode 100644
index 2473bad..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.tests.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationHTML extends TestCase {
-
- private StructuredTextViewerConfigurationHTML fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationHTML() {
- super("TestViewerConfigurationHTML");
- }
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- if(Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if(PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationHTML();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetAnnotationHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
- assertNotNull("AnnotationHover is null", hover);
- }
-
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IHTMLPartitions.HTML_DEFAULT);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length>0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 1);
- }
-
- /**
- * Not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNotNull("there is no content formatter", cf);
- }
-
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if(strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 1);
- }
-
- public void testGetIndentPrefixes() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
- if(prefixes != null) {
- return;
- }
- }
- assertTrue("there are no configured indent prefixes", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationControlCreator() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("InformationControlCreator is null", infoCreator);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationPresenter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter is null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if(providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler is null", r);
- }
-
- public void testGetTextHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT};
- for (int i = 0; i < hoverPartitions.length; i++) {
- ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
- assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
deleted file mode 100644
index 4ab2114..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestHTML extends ViewPart {
- private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
- private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n <HEAD>\n <META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n <TITLE>place title here</TITLE>\n </HEAD>\n <BODY>\n place content here \n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
-
- private StructuredTextViewer fSourceViewer = null;
- private StructuredTextViewerConfiguration fConfig = null;
- private IContentOutlinePage fContentOutlinePage = null;
- private ISelectionChangedListener fHighlightRangeListener = null;
-
- /**
- * Sets the viewer's highlighting text range to the text range indicated
- * by the selected Nodes.
- */
- protected class NodeRangeSelectionListener implements ISelectionChangedListener {
- public void selectionChanged(SelectionChangedEvent event) {
- if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
- IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- else {
- fSourceViewer.resetVisibleRegion();
- }
- }
- }
-
- protected class NumberInputDialog extends Dialog {
- public NumberInputDialog(Shell shell) {
- super(shell);
- }
-
- public Text start;
- int startValue;
- public Text length;
- int lengthValue;
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(composite, SWT.NULL);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- container.setLayout(new GridLayout(2, true));
- setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
- Label label = new Label(container, SWT.NULL);
- label.setText("Start");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- label = new Label(container, SWT.NULL);
- label.setText("Length");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- start = new Text(container, SWT.BORDER);
- startValue = fSourceViewer.getVisibleRegion().getOffset();
- start.setText("" + startValue);
- start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- length = new Text(container, SWT.BORDER);
- lengthValue = fSourceViewer.getVisibleRegion().getLength();
- length.setText("" + lengthValue);
- length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // start.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == start) {
- // try {
- // startValue = Integer.decode(start.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // startValue = 0;
- // }
- // }
- // }
- // });
- // length.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == length) {
- // try {
- // lengthValue = Integer.decode(length.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // lengthValue = 0;
- // }
- // }
- // }
- // });
-
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- protected void okPressed() {
- try {
- startValue = Integer.decode(start.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- startValue = 0;
- }
- try {
- lengthValue = Integer.decode(length.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- lengthValue = 0;
- }
- super.okPressed();
- }
- }
-
- protected void addActions(IContributionManager mgr) {
- if (mgr != null) {
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "New HTML";
- }
-
- public void run() {
- super.run();
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- setupViewerForNew();
- fSourceViewer.setEditable(true);
- }
- });
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility";
- }
-
- public void run() {
- super.run();
- NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All";
- }
-
- public void run() {
- super.run();
- fSourceViewer.resetVisibleRegion();
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- sourceViewer.resetVisibleRegion();
- sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- sourceViewer.resetVisibleRegion();
- }
- }
- });
- mgr.add(new Separator());
- // no longer able to set input to NULL
- // mgr.add(new Action() {
- // public String getText() {
- // return getToolTipText();
- // }
- //
- // public String getToolTipText() {
- // return "Set Input to NULL";
- // }
- // public void run() {
- // super.run();
- // viewer.setInput(null);
- // }
- // });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input from Active Editor";
- }
-
- public void run() {
- super.run();
- ITextEditor textEditor = getActiveEditor();
- if (textEditor != null) {
- setupViewerForEditor(textEditor);
- fSourceViewer.setEditable(true);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(true);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection As ReadOnly";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(false);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Stop Following Selection";
- }
-
- public void run() {
- super.run();
- stopFollowSelection();
- }
- });
- }
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
- */
- public void createPartControl(Composite parent) {
- IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
- addActions(mgr);
-
- // create source viewer & its content type-specific viewer
- // configuration
- fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationHTML();
-
- // set up the viewer with a document & viewer config
- setupViewerForNew();
-
- setupViewerPreferences();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- stopFollowSelection();
- fSourceViewer.unconfigure();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
- fSourceViewer.getControl().setFocus();
- }
-
- /**
- * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
- */
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- }
-
- /**
- * Set up source viewer with any additional preferences it should have Ex:
- * font, tab width
- */
- private void setupViewerPreferences() {
- fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
- }
-
- /**
- * Set up source viewer with a new document & configure it
- */
- private void setupViewerForNew() {
- stopFollowSelection(); // if was following selection, stop
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- doc.set(DEFAULT_VIEWER_CONTENTS);
-
- fSourceViewer.setDocument(doc);
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(fConfig);
- }
-
- /**
- * Returns the current active text editor if possible
- *
- * @return ITextEditor
- */
- private ITextEditor getActiveEditor() {
- ITextEditor editor = null;
- IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editorPart instanceof ITextEditor)
- editor = (ITextEditor) editorPart;
- if (editor == null && editorPart != null)
- editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
- return editor;
- }
-
- /**
- * Sets up the viewer with the same document/input as the given editor
- *
- * @param ITextEditor
- * editor - the editor to use *cannot to be null*
- */
- private void setupViewerForEditor(ITextEditor editor) {
- stopFollowSelection(); // if was following selection, stop
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- fSourceViewer.setDocument(doc);
-
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(new StructuredTextViewerConfigurationHTML());
- }
-
- /**
- * Hooks up the viewer to follow the selection made in the active editor
- */
- private void followSelection() {
- ITextEditor editor = getActiveEditor();
- if (editor != null) {
- setupViewerForEditor(editor);
- if (fHighlightRangeListener == null)
- fHighlightRangeListener = new NodeRangeSelectionListener();
-
- fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
- if (fContentOutlinePage != null) {
- fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
- if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
- fSourceViewer.resetVisibleRegion();
-
- Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
- IndexedRegion startNode = (IndexedRegion) nodes[0];
- IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- }
- }
- }
-
- /**
- * Cease following the selection made in the editor
- */
- private void stopFollowSelection() {
- if (fContentOutlinePage != null) {
- fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
- fSourceViewer.resetVisibleRegion();
- fContentOutlinePage = null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/test.xml b/tests/org.eclipse.wst.html.ui.tests/test.xml
deleted file mode 100644
index 2ba6ac2..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.html.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/.classpath b/tests/org.eclipse.wst.jsdt.web.core.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/.project b/tests/org.eclipse.wst.jsdt.web.core.tests/.project
deleted file mode 100644
index 42be089..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.jsdt.web.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.web.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 681b83b..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.core.tests;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.wst.jsdt.web.core.tests.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.jsdt.web.core,
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.wst.jsdt.web.core.tests,
- org.eclipse.wst.jsdt.web.core.tests.translation
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/build.properties b/tests/org.eclipse.wst.jsdt.web.core.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/Activator.java b/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/Activator.java
deleted file mode 100644
index 9d7c637..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/Activator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-
- public static final boolean DEBUG_CONSOLE = false;
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core.tests";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java b/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java
deleted file mode 100644
index a1291af..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.tests.translation;
-
-import java.io.ByteArrayInputStream;
-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.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapterFactory;
-import org.eclipse.wst.jsdt.web.core.tests.Activator;
-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 TestHtmlTranslation extends TestCase {
-
-
- protected IModelManager fModelManager = null;
- private static final String testFilesDirectory = "testFiles";
- public TestHtmlTranslation(){
- fModelManager = StructuredModelManager.getModelManager();
- }
-
- public void testHTMLFormat() {
- // get model
- IStructuredModel structuredModel = getModel("test1.html");
- assertNotNull("missing test model", structuredModel);
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "test1.html";
- String expected = getFile(expectedFileName);
-
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- assertTrue("expected function definition is missing", translation.getJsText().indexOf("function blah()") >= 0);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- protected String readFile(String fileName) {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- URL url = Activator.getDefault().getBundle().getEntry(fileName);
- fileInputStream = url.openStream();
-
- 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 (IOException exception) {
- // should already be closed
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) {
- return readFile("/testfiles/".concat(fileName));
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/testFiles/test1.html b/tests/org.eclipse.wst.jsdt.web.core.tests/testFiles/test1.html
deleted file mode 100644
index da53c78..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/testFiles/test1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<script>
-function blah(){
-
-
-
-}
-</script>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/.classpath b/tests/org.eclipse.wst.jsdt.web.ui.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/.project b/tests/org.eclipse.wst.jsdt.web.ui.tests/.project
deleted file mode 100644
index ee6c3f5..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.jsdt.web.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/Activator.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/Activator.java
deleted file mode 100644
index 9074f01..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.ui.tests";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/JSTranslationEditorInput.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/JSTranslationEditorInput.java
deleted file mode 100644
index 85e47d2..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/JSTranslationEditorInput.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.web.ui.tests.translation;
-
-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.jface.text.Document;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.internal.util.DocumentInputStream;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * @author nitin
- *
- */
-public class JSTranslationEditorInput 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(new Document(getTranslationAdapter().getJsTranslation(false).getJsText()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getFullPath()
- */
- public IPath getFullPath() {
- return new Path(getTranslationAdapter().getJsTranslation(false).getJavaPath());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getName()
- */
- public String getName() {
- return new Path(fModel.getBaseLocation()).lastSegment() + ".js";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#isReadOnly()
- */
- public boolean isReadOnly() {
- return true;
- }
- }
-
- IDOMModel fModel;
-
- private JSPTranslationStorage fStorage;
-
- /**
- *
- */
- public JSTranslationEditorInput(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();
- }
-
- JsTranslationAdapter getTranslationAdapter() {
- JsTranslationAdapter adapter = (JsTranslationAdapter) fModel.getDocument().getAdapterFor(IJsTranslation.class);
- return adapter;
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/test.xml b/tests/org.eclipse.wst.jsdt.web.ui.tests/test.xml
deleted file mode 100644
index 88e001e..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.jsdt.web.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.jsdt.web.ui.tests.AllWebUITests" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.classpath b/tests/org.eclipse.wst.sse.ui.tests/.classpath
deleted file mode 100644
index 7e6e2ac..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="jface.text.tests"/>
- <classpathentry kind="src" path="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">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.cvsignore b/tests/org.eclipse.wst.sse.ui.tests/.cvsignore
deleted file mode 100644
index 1adfc97..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-sseeditortests.jar
-javaCompiler.sseeditortests.jar.args
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.project b/tests/org.eclipse.wst.sse.ui.tests/.project
deleted file mode 100644
index 0b072b9..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.sse.ui.tests</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d0f755b..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.ui.tests; singleton:=true
-Bundle-Version: 1.0.201.qualifier
-Bundle-ClassPath: sseeditortests.jar
-Bundle-Activator: org.eclipse.wst.sse.ui.tests.SSETestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.ui.tests,
- org.eclipse.wst.sse.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.sse.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jface.text,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.modulecore,
- com.ibm.icu
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.sse.ui.tests/about.html b/tests/org.eclipse.wst.sse.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/build.properties b/tests/org.eclipse.wst.sse.ui.tests/build.properties
deleted file mode 100644
index 37d41d0..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/build.properties
+++ /dev/null
@@ -1,23 +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
-###############################################################################
-source.sseeditortests.jar = src/,\
- jface.text.tests/,\
- text.tests/
-output.sseeditortests.jar = bin/
-bin.includes = plugin.xml,\
- sseeditortests.jar,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = src/,\
- jface.text.tests/,\
- text.tests/
diff --git a/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java
deleted file mode 100644
index 1d6e394..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/AbstractUndoManagerTest.java
deleted file mode 100644
index 361e701..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultPairMatcherTest.java
deleted file mode 100644
index deafc45..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/DefaultUndoManagerTest.java
deleted file mode 100644
index ada6b8c..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/HTML2TextReaderTester.java
deleted file mode 100644
index 4fa4c4a..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
deleted file mode 100644
index 8abfedd..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
+++ /dev/null
@@ -1,36 +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;
-
-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 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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextEvent.java
deleted file mode 100644
index 584d5bb..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TestTextViewer.java
deleted file mode 100644
index 41859b3..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextHoverPopupTest.java
deleted file mode 100644
index abfa697..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextPresentationTest.java
deleted file mode 100644
index 689e8dc..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/TextViewerUndoManagerTest.java
deleted file mode 100644
index effd287..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
deleted file mode 100644
index a20fbaf..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/reconciler/ReconcilerTestSuite.java
deleted file mode 100644
index 32dfe18..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerTest.java
deleted file mode 100644
index 4dc114b..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/DefaultPartitionerZeroLengthTest.java
deleted file mode 100644
index 9e1792a..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java
deleted file mode 100644
index f670161..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/RulesTestSuite.java
deleted file mode 100644
index 48deb6d..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java
deleted file mode 100644
index 1b0c8b6..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java b/tests/org.eclipse.wst.sse.ui.tests/jface.text.tests/org/eclipse/jface/text/tests/rules/WordRuleTest.java
deleted file mode 100644
index 6f5ecfd..0000000
--- a/tests/org.eclipse.wst.sse.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.wst.sse.ui.tests/plugin.properties b/tests/org.eclipse.wst.sse.ui.tests/plugin.properties
deleted file mode 100644
index 0eb3f6d..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.sse.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor Tests
-editor.name.0 = Generic Structured Text Editor
-category.name.0 = SSE Testing
-view.name.0 = ExtendedStorageEditorInput Management Tester
-view.name.1 = Action Tester
-action.label.0 = org.eclipse.ui.popupMenus Test Action
-action.label.1 = Make Read-Only
-action.label.2 = Clear all Read-Only
-
diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
deleted file mode 100644
index 1d63ebd..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <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"
- id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
- </editor>
- </extension>
-
- <!-- Editor actionsets -->
- <extension point="org.eclipse.ui.actionSetPartAssociations">
- <actionSetPartAssociation
- targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
- <part
- id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
- </part>
- </actionSetPartAssociation>
- <actionSetPartAssociation
- targetID="org.eclipse.ui.NavigateActionSet">
- <part
- id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
- </part>
- </actionSetPartAssociation>
- </extension>
-
- <extension point="org.eclipse.ui.views">
- <category
- name="%category.name.0"
- id="org.eclipse.wst.sse.ui.tests">
- </category>
- <view
- name="%view.name.0"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView"
- id="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView">
- </view>
- <view
- name="%view.name.1"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.wst.sse.ui.tests.ActionTestView"
- id="org.eclipse.wst.sse.ui.tests.ActionTestView">
- </view>
- </extension>
-
- <extension point="org.eclipse.ui.popupMenus">
- <viewerContribution
- targetID="org.eclipse.wst.sse.ui.StructuredTextEditor.EditorContext"
- id="org.eclipse.wst.sse.ui.tests.test">
- <action
- label="%action.label.0"
- class="org.eclipse.wst.sse.ui.tests.TestActionDelegate"
- menubarPath="additions"
- id="org.eclipse.wst.sse.ui.tests.test.1" />
- <action
- label="%action.label.1"
- class="org.eclipse.wst.sse.ui.tests.ReadOnlyToggleDelegate"
- menubarPath="additions"
- id="org.eclipse.wst.sse.ui.tests.test.2" />
- <action
- label="%action.label.2"
- class="org.eclipse.wst.sse.ui.tests.ClearReadOnlyDelegate"
- menubarPath="additions"
- id="org.eclipse.wst.sse.ui.tests.test.2" />
- </viewerContribution>
- </extension>
-
- <extension point="org.eclipse.wst.sse.ui.editorConfiguration">
- <provisionalConfiguration
- type="linestyleprovider"
- class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
- target="org.eclipse.wst.html.SCRIPT.language.BLUE" />
- <provisionalConfiguration
- type="linestyleprovider"
- class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
- target="org.eclipse.wst.html.SCRIPT.type.TEXT/BLUE" />
- <provisionalConfiguration
- type="linestyleprovider"
- class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
- target="org.eclipse.jst.jsp.SCRIPT.BLUE" />
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java
deleted file mode 100644
index 8bf29d3..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-
-/**
- * @author nitin
- *
- * A view to hang actions off of to execute arbitrary code at arbitrary times.
- */
-public class ActionTestView extends ViewPart {
-
- private class ComponentViewer extends Action {
- public void run() {
- super.run();
- if (fSelection != null && !fSelection.isEmpty() && fSelection instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) fSelection;
- if (selection.getFirstElement() instanceof IResource) {
- IResource resource = (IResource) selection.getFirstElement();
- IVirtualResource[] virtualResources = ComponentCore.createResources(resource.getProject());
- // Only return results for Flexible projects
- if (virtualResources != null) {
- for (int i = 0; i < virtualResources.length; i++) {
- System.out.println(virtualResources[i].getComponent().getRootFolder().getWorkspaceRelativePath());
- }
- }
- }
- }
- }
- }
-
- class EmptyTextSetter extends Action {
- public EmptyTextSetter() {
- super("Set Text Editor text to empty");
- setToolTipText("Set Text Editor text to empty using set() API");
- }
-
- public void run() {
- super.run();
- IEditorPart editor = getViewSite().getPage().getActiveEditor();
- ITextEditor textEditor = null;
- if (editor instanceof ITextEditor)
- textEditor = (ITextEditor) editor;
- else
- textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
- if (textEditor != null) {
- IDocument document = textEditor.getDocumentProvider().getDocument(editor.getEditorInput());
- document.set("");
- }
- else {
- print("Error getting IDocument.\n");
- }
- }
- }
-
- Control fControl = null;
-
- ISelection fSelection;
- private ISelectionListener fSelectionListener;
-
- private List createActions() {
- List actions = new ArrayList();
-
- actions.add(new EmptyTextSetter());
- actions.add(new ComponentViewer());
- return actions;
- }
-
- /**
- * @return
- */
- private List createContribututions() {
- List actions = new ArrayList();
- return actions;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- public void createPartControl(Composite parent) {
- ITextViewer text = new TextViewer(parent, SWT.READ_ONLY);
- text.setDocument(new Document());
- fControl = text.getTextWidget();
- text.getDocument().set("Use either the toolbar or the menu to run your actions\n\n");
- }
-
- private ISelectionListener getSelectionListener() {
- if (fSelectionListener == null) {
- fSelectionListener = new ISelectionListener() {
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- fSelection = selection;
- }
- };
- }
- return fSelectionListener;
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
- */
- public void init(IViewSite site) throws PartInitException {
- super.init(site);
- List actions = createActions();
- for (int i = 0; i < actions.size(); i++) {
- site.getActionBars().getToolBarManager().add((IAction) actions.get(i));
- site.getActionBars().getMenuManager().add((IAction) actions.get(i));
- }
- List contributions = createContribututions();
- for (int i = 0; i < contributions.size(); i++) {
- site.getActionBars().getToolBarManager().add((IContributionItem) contributions.get(i));
- site.getActionBars().getMenuManager().add((IContributionItem) contributions.get(i));
- }
- site.getWorkbenchWindow().getSelectionService().addPostSelectionListener(getSelectionListener());
- }
-
- void print(String s) {
- ((StyledText) fControl).append(s);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fControl != null && !fControl.isDisposed()) {
- fControl.setFocus();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ClearReadOnlyDelegate.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ClearReadOnlyDelegate.java
deleted file mode 100644
index cc5b436..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ClearReadOnlyDelegate.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.wst.sse.ui.tests;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class ClearReadOnlyDelegate extends Action implements IEditorActionDelegate {
-
- ISelection fSelection = null;
- IEditorPart fEditor = null;
-
- public ClearReadOnlyDelegate() {
- }
-
- public ClearReadOnlyDelegate(String text) {
- super(text);
- }
-
- public ClearReadOnlyDelegate(String text, ImageDescriptor image) {
- super(text, image);
- }
-
- public ClearReadOnlyDelegate(String text, int style) {
- super(text, style);
- }
-
- public void setActiveEditor(IAction action, IEditorPart targetEditor) {
- fEditor = targetEditor;
- }
-
- public void run(IAction action) {
- ITextEditor editor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- if (document instanceof IStructuredDocument) {
- ((IStructuredDocument) document).clearReadOnly(0, document.getLength());
- }
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- fSelection = selection;
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java
deleted file mode 100644
index a442c0d..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the
- * StructuredTextEditor's common 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 CommonEditorPreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.sse.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, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- }
-
- 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 = SSEUIPlugin.getDefault().getPreferenceStore();
-
- pluginGetDefaultPreference(store, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, Boolean.toString(true));
- }
-
- 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 = SSEUIPlugin.getDefault().getPreferenceStore();
-
- pluginSetPreferenceBoolean(store, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- }
-
- 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);
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
deleted file mode 100644
index 929be0a..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
+++ /dev/null
@@ -1,824 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-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.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IReusableEditor;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.OpenWithMenu;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.IElementStateListener;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IExtendedStorageEditorInput;
-
-
-/**
- * @author nitin
- *
- * A view to assist in testing out StructuredTextEditor's IEditorInput
- * handling.
- *
- * Permanently in-progress.
- */
-public class ExtendedStorageEditorInputView extends ViewPart {
- /**
- * Adds an IFileEditorInput to the list of inputs with which to test
- */
- class AddFileInputAction extends Action {
- public AddFileInputAction() {
- super("Add FileEditorInput");
- }
-
- public void run() {
- super.run();
- ResourceSelectionDialog dlg = new ResourceSelectionDialog(fInputList.getControl().getShell(), ResourcesPlugin.getWorkspace().getRoot(), "Choose");
- int retval = dlg.open();
- if (retval == Window.OK) {
- Object[] files = dlg.getResult();
- for (int i = 0; i < files.length; i++) {
- fInputs.add(new FileEditorInput((IFile) files[i]));
- }
- fInputList.refresh(true);
- }
- }
- }
-
- /**
- * Adds an IStorageEditorInput to the list of inputs with which to test
- */
- class AddStorageInputAction extends Action {
- public AddStorageInputAction() {
- super("Add StorageEditorInput");
- }
-
- public void run() {
- super.run();
- FileDialog dlg = new FileDialog(fInputList.getControl().getShell());
- String fileName = dlg.open();
- if (fileName != null) {
- fInputs.add(new FileBasedStorageEditorInput(new File(fileName)));
- fInputList.refresh(true);
- }
- }
- }
-
- /**
- * Handler for double-click
- */
- class DoubleClickListener implements IDoubleClickListener {
- public void doubleClick(DoubleClickEvent event) {
- new InputOpenAction().run();
- }
- }
-
- class EditorInputLabelProvider implements ITableLabelProvider {
- ILabelProvider baseProvider = new WorkbenchLabelProvider();
-
- public void addListener(ILabelProviderListener listener) {
- // not implemented
- }
-
- public void dispose() {
- // no need
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- if (element instanceof IFileEditorInput && columnIndex == 0) {
- return baseProvider.getImage(((IFileEditorInput) element).getFile());
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- IEditorInput input = (IEditorInput) element;
- String text = null;
- switch (columnIndex) {
- case 0 :
- try {
- if (element instanceof FileBasedStorageEditorInput) {
- IPath fullpath = ((FileBasedStorageEditorInput) element).getStorage().getFullPath();
- text = fullpath != null ? fullpath.toString() : ((FileBasedStorageEditorInput) element).getName();
- if (((FileBasedStorageEditorInput) element).isDirty()) {
- text = "*" + text;
- }
- }
- else if (element instanceof IFileEditorInput) {
- text = ((IFileEditorInput) element).getFile().getFullPath().toString();
- }
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
-
- break;
- case 1 :
- if (element instanceof FileBasedStorageEditorInput) {
- text = "FileBasedStorageEditorInput";
- }
- else if (element instanceof IFileEditorInput) {
- text = "FileEditorInput";
- }
- else {
- text = input.getClass().getName();
- }
- break;
- }
- if (text == null)
- text = "";
- return text;
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- // not implemented
- }
- }
-
-
- class FileBackedStorage implements IStorage {
- File fFile = null;
-
- FileBackedStorage(File file) {
- super();
- fFile = file;
- }
-
- boolean exists() {
- return fFile.exists();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getContents()
- */
- public InputStream getContents() throws CoreException {
- InputStream contents = null;
- try {
- contents = new FileInputStream(fFile);
- ByteBuffer buffer = ByteBuffer.allocate((int) fFile.length());
- byte[] bytes = new byte[2048];
- while (contents.available() > 0) {
- int count = contents.read(bytes);
- buffer.put(bytes, 0, count);
- }
- contents.close();
-
- contents = new ByteArrayInputStream(buffer.array());
- }
- catch (FileNotFoundException e) {
- contents = new ByteArrayInputStream(new byte[0]);
- }
- catch (IOException e) {
- contents = new ByteArrayInputStream(new byte[0]);
- }
- return contents;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getFullPath()
- */
- public IPath getFullPath() {
- if (provideIStorageFullPath) {
- return new Path(fFile.getAbsolutePath());
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getName()
- */
- public String getName() {
- return fFile.getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#isReadOnly()
- */
- public boolean isReadOnly() {
- return true;
- }
- }
-
- class FileBasedStorageEditorInput implements IExtendedStorageEditorInput {
- List fElementStateListeners = new Vector(0);
- boolean fIsDirty = false;
- FileBackedStorage fStorage = null;
-
- FileBasedStorageEditorInput(File file) {
- fStorage = new FileBackedStorage(file);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IExtendedStorageEditorInput#addElementStateListener(org.eclipse.ui.texteditor.IElementStateListener)
- */
- public void addElementStateListener(IElementStateListener listener) {
- fElementStateListeners.add(listener);
- }
-
- void elementContentAboutToBeReplaced() {
- for (int i = 0; i < fElementStateListeners.size(); i++) {
- ((IElementStateListener) fElementStateListeners.get(i)).elementContentAboutToBeReplaced(FileBasedStorageEditorInput.this);
- }
- }
-
- void elementContentReplaced() {
- for (int i = 0; i < fElementStateListeners.size(); i++) {
- ((IElementStateListener) fElementStateListeners.get(i)).elementContentReplaced(FileBasedStorageEditorInput.this);
- }
- }
-
- void elementDeleted() {
- for (int i = 0; i < fElementStateListeners.size(); i++) {
- ((IElementStateListener) fElementStateListeners.get(i)).elementDeleted(FileBasedStorageEditorInput.this);
- }
- }
-
- void elementDirtyStateChanged(boolean dirty) {
- setDirty(dirty);
- for (int i = 0; i < fElementStateListeners.size(); i++) {
- ((IElementStateListener) fElementStateListeners.get(i)).elementDirtyStateChanged(FileBasedStorageEditorInput.this, dirty);
- }
- }
-
- void elementMoved(Object oldElement, Object newElement) {
- for (int i = 0; i < fElementStateListeners.size(); i++) {
- ((IElementStateListener) fElementStateListeners.get(i)).elementMoved(FileBasedStorageEditorInput.this, FileBasedStorageEditorInput.this);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorInput#exists()
- */
- public boolean exists() {
- return fStorage.exists();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- File getFile() {
- return fStorage.fFile;
- }
-
- /*
- * (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 fStorage.getFullPath() != null ? fStorage.getFullPath().toString() : fStorage.getName();
- }
-
- boolean isDirty() {
- return fIsDirty;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IExtendedStorageEditorInput#removeElementStateListener(org.eclipse.ui.texteditor.IElementStateListener)
- */
- public void removeElementStateListener(IElementStateListener listener) {
- fElementStateListeners.remove(listener);
- }
-
- void setDirty(boolean dirty) {
- fIsDirty = dirty;
- }
- }
-
- class InputChangeDirtyStateAction extends Action implements IUpdate {
- public InputChangeDirtyStateAction() {
- super("Toggle dirty flag");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- if (inputs[i] instanceof FileBasedStorageEditorInput) {
- ((FileBasedStorageEditorInput) inputs[i]).elementDirtyStateChanged(!((FileBasedStorageEditorInput) inputs[i]).isDirty());
- }
- }
- fInputList.refresh(true);
- }
-
- public void update() {
- setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
- }
- }
-
- class InputDeleteAction extends Action implements IUpdate {
- public InputDeleteAction() {
- super("Delete Input");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- if (inputs[i] instanceof FileBasedStorageEditorInput) {
- ((FileBasedStorageEditorInput) inputs[i]).elementDeleted();
- }
- }
- for (int i = 0; i < inputs.length; i++) {
- fInputs.remove(inputs[i]);
- }
- fInputList.refresh();
- }
-
- public void update() {
- setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
- }
- }
-
- class InputMoveAction extends Action implements IUpdate {
- public InputMoveAction() {
- super("Move Input");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- if (inputs[i] instanceof FileBasedStorageEditorInput) {
- ((FileBasedStorageEditorInput) inputs[i]).elementMoved(inputs[i], inputs[i]);
- }
- }
- }
-
- public void update() {
- setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
- }
- }
-
- class InputOpenAction extends Action {
- public InputOpenAction() {
- super("Open");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- try {
- getSite().getWorkbenchWindow().getActivePage().openEditor(inputs[i], getEditorId(inputs[i]));
- }
- catch (PartInitException e) {
- openError(getSite().getWorkbenchWindow().getActivePage().getWorkbenchWindow().getShell(), "OpenSystemEditorAction.dialogTitle", e.getMessage(), e);
- }
- }
- }
- }
-
- class InputReplaceContentsAction extends Action implements IUpdate {
- public InputReplaceContentsAction() {
- super("Replace Input's Contents");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- ((FileBasedStorageEditorInput) inputs[i]).elementContentAboutToBeReplaced();
- ((FileBasedStorageEditorInput) inputs[i]).elementContentReplaced();
- }
- }
-
- public void update() {
- setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
- }
- }
-
- class RemoveInputAction extends Action {
- public RemoveInputAction() {
- super("Remove");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- fInputs.remove(inputs[i]);
- }
- fInputList.refresh();
- }
- }
-
- class ReuseEditorAction extends Action implements IUpdate {
- public ReuseEditorAction() {
- super("Reuse Editor");
- }
-
- public void run() {
- super.run();
- IEditorInput[] inputs = getSelectedInputs();
- for (int i = 0; i < inputs.length; i++) {
- IEditorPart editor = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editor instanceof IReusableEditor) {
- getSite().getWorkbenchWindow().getActivePage().reuseEditor(((IReusableEditor) editor), inputs[i]);
- }
- else {
- SSEUIPlugin.getDefault().getWorkbench().getDisplay().beep();
- }
- }
- }
-
- public void update() {
- boolean enable = true;
- try {
- enable = fSelectedElement != null && getSite().getWorkbenchWindow().getActivePage().getActiveEditor() instanceof IReusableEditor;
- }
- catch (Exception e) {
- enable = true;
- }
- setEnabled(enable);
- }
- }
-
-
- public static final boolean provideIStorageFullPath = true;
-
- /**
- * Open an error style dialog for PartInitException by including any extra
- * information from the nested CoreException if present.
- */
- public static void openError(Shell parent, String title, String message, PartInitException exception) {
- // Check for a nested CoreException
- CoreException nestedException = null;
- IStatus status = exception.getStatus();
- if (status != null && status.getException() instanceof CoreException)
- nestedException = (CoreException) status.getException();
-
- if (nestedException != null) {
- // Open an error dialog and include the extra
- // status information from the nested CoreException
- ErrorDialog.openError(parent, title, message, nestedException.getStatus());
- }
- else {
- // Open a regular error dialog since there is no
- // extra information to display
- MessageDialog.openError(parent, title, message);
- }
- }
-
- private List actions = null;
-
- TableViewer fInputList = null;
-
- List fInputs = new ArrayList(0);
-
- Object fSelectedElement = null;
-
-
- public ExtendedStorageEditorInputView() {
- super();
- actions = new ArrayList();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- public void createPartControl(Composite parent) {
- fInputList = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- fInputList.setContentProvider(new ArrayContentProvider());
- fInputList.setLabelProvider(new EditorInputLabelProvider());
- fInputList.addDoubleClickListener(new DoubleClickListener());
- fInputList.getTable().setHeaderVisible(true);
- fInputList.getTable().setLinesVisible(true);
- String[] columns = new String[]{"Path", "Type"};
- fInputList.setLabelProvider(new EditorInputLabelProvider());
-
-
- TableLayout tlayout = new TableLayout();
- CellEditor[] cellEditors = new CellEditor[5];
- for (int i = 0; i < columns.length; i++) {
- tlayout.addColumnData(new ColumnWeightData(1));
- TableColumn tc = new TableColumn(fInputList.getTable(), SWT.NONE);
- tc.setText(columns[i]);
- tc.setResizable(true);
- tc.setWidth(Display.getCurrent().getBounds().width / 14);
- }
- fInputList.setCellEditors(cellEditors);
- fInputList.setColumnProperties(columns);
-
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- fInputList.getTable().setLayoutData(gd);
-
- MenuManager menuManager = new MenuManager("#popup"); //$NON-NLS-1$
- menuManager.setRemoveAllWhenShown(false);
-
- menuManager.add(new InputOpenAction());
- menuManager.add(new Separator());
- menuManager.add(new InputMoveAction());
- menuManager.add(new InputChangeDirtyStateAction());
- menuManager.add(new InputDeleteAction());
- menuManager.add(new InputReplaceContentsAction());
- menuManager.add(new Separator());
- menuManager.add(new RemoveInputAction());
- Menu menu = menuManager.createContextMenu(fInputList.getControl());
- fInputList.getControl().setMenu(menu);
-
-
- SSETestsPlugin.getDefault().getPluginPreferences().setDefault(getInputsPreferenceName(), "");
- String paths[] = StringUtils.unpack(SSETestsPlugin.getDefault().getPluginPreferences().getString(getInputsPreferenceName()));
- for (int i = 0; i < paths.length; i++) {
- if (paths[i].startsWith("S!")) {
- fInputs.add(new FileBasedStorageEditorInput(new File(paths[i].substring(2))));
- menuManager.add(new OpenWithMenu(getSite().getPage(), null));
- }
- else if (paths[i].startsWith("F!")) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(paths[i].substring(2)));
- fInputs.add(new FileEditorInput(file));
- menuManager.add(new OpenWithMenu(getSite().getPage(), file));
- }
- }
-
- fInputList.setInput(fInputs);
- fInputList.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection sel = ((IStructuredSelection) event.getSelection());
- fSelectedElement = sel.getFirstElement();
- }
- });
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- List paths = new ArrayList(0);
- for (int i = 0; i < fInputs.size(); i++) {
- try {
- Object input = fInputs.get(i);
- String path = null;
- if (input instanceof FileBasedStorageEditorInput) {
- path = "S!" + ((FileBasedStorageEditorInput) input).getFile().getCanonicalPath();
- }
- else if (input instanceof IFileEditorInput) {
- path = "F!" + ((IFileEditorInput) input).getFile().getFullPath().toString();
- }
- if (path != null) {
- paths.add(path);
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
- SSETestsPlugin.getDefault().getPluginPreferences().setValue(getInputsPreferenceName(), StringUtils.pack((String[]) paths.toArray(new String[0])));
- SSETestsPlugin.getDefault().savePluginPreferences();
- }
-
- String getEditorId(IEditorInput input) {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IEditorRegistry editorRegistry = workbench.getEditorRegistry();
- IContentType[] types = null;
- String editorID = null;
- if (input instanceof IStorageEditorInput) {
- InputStream inputStream = null;
- try {
- inputStream = ((IStorageEditorInput) input).getStorage().getContents();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- try {
- types = Platform.getContentTypeManager().findContentTypesFor(inputStream, input.getName());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- try {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(input.getName(), types[0]);
- if (descriptor != null) {
- editorID = descriptor.getId();
- }
- if (editorID == null) {
- editorID = EditorsUI.DEFAULT_TEXT_EDITOR_ID;
- }
- return editorID;
- }
-
- /**
- * @return
- */
- String getInputsPreferenceName() {
- return "ExtendedStorageEditorInputView:inputs";
- }
-
- IEditorInput[] getSelectedInputs() {
- ISelection selection = fInputList.getSelection();
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection sel = (IStructuredSelection) selection;
- if (sel.isEmpty()) {
- return new IEditorInput[0];
- }
- Object[] arr = sel.toArray();
- IEditorInput[] inputs = new IEditorInput[arr.length];
- System.arraycopy(arr, 0, inputs, 0, inputs.length);
- return inputs;
- }
- return new IEditorInput[0];
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
- */
- public void init(IViewSite site) throws PartInitException {
- super.init(site);
-
- site.getActionBars().getToolBarManager().add(rememberAction(new AddStorageInputAction()));
- site.getActionBars().getToolBarManager().add(rememberAction(new AddFileInputAction()));
- site.getActionBars().getToolBarManager().add(rememberAction(new ReuseEditorAction()));
- site.getActionBars().getToolBarManager().add(rememberAction(new RemoveInputAction()));
-
- site.getActionBars().getMenuManager().add(rememberAction(new InputOpenAction()));
- site.getActionBars().getMenuManager().add(rememberAction(new ReuseEditorAction()));
- site.getActionBars().getMenuManager().add(new Separator());
- site.getActionBars().getMenuManager().add(rememberAction(new InputMoveAction()));
- site.getActionBars().getMenuManager().add(rememberAction(new InputChangeDirtyStateAction()));
- site.getActionBars().getMenuManager().add(rememberAction(new InputDeleteAction()));
- site.getActionBars().getMenuManager().add(rememberAction(new InputReplaceContentsAction()));
- }
-
- IAction rememberAction(IAction action) {
- actions.add(action);
- return action;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- fInputList.getControl().setFocus();
- }
-
-
- protected void updateEnablement() {
- for (int i = 0; i < actions.size(); i++) {
- Object action = actions.get(i);
- if (action instanceof IUpdate) {
- ((IUpdate) action).update();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java
deleted file mode 100644
index b1c6637..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.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.wst.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.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ReadOnlyToggleDelegate.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ReadOnlyToggleDelegate.java
deleted file mode 100644
index df394e4..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ReadOnlyToggleDelegate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.wst.sse.ui.tests;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class ReadOnlyToggleDelegate extends Action implements IEditorActionDelegate {
-
- ISelection fSelection = null;
- IEditorPart fEditor = null;
-
- public ReadOnlyToggleDelegate() {
- }
-
- public ReadOnlyToggleDelegate(String text) {
- super(text);
- }
-
- public ReadOnlyToggleDelegate(String text, ImageDescriptor image) {
- super(text, image);
- }
-
- public ReadOnlyToggleDelegate(String text, int style) {
- super(text, style);
- }
-
- public void setActiveEditor(IAction action, IEditorPart targetEditor) {
- fEditor = targetEditor;
- }
-
- public void run(IAction action) {
- ITextEditor editor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- if (document instanceof IStructuredDocument) {
- ITextSelection selection = (ITextSelection) fSelection;
- ((IStructuredDocument) document).makeReadOnly(selection.getOffset(), selection.getLength());
- }
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- fSelection = selection;
- setEnabled(!selection.isEmpty());
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java
deleted file mode 100644
index 5c4d91e..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSETestsPlugin extends Plugin {
- //The shared instance.
- private static SSETestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public SSETestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.sse.ui.tests.TestsPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static SSETestsPlugin 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 = SSETestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
deleted file mode 100644
index af41539..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.tests.JFaceTextTestSuite;
-import org.eclipse.wst.sse.ui.tests.viewer.TestViewerConfiguration;
-
-/**
- * @author pavery
- */
-public class SSEUITestSuite extends TestSuite {
- public static Test suite() {
- return new SSEUITestSuite();
- }
-
- public SSEUITestSuite() {
- super("SSE UI Test Suite");
- addTest(new TestSuite(VerifyEditorPlugin.class));
- addTest(new TestSuite(CommonEditorPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfiguration.class));
- addTest(new TestSuite(TestStructuredTextEditor.class));
- addTest(JFaceTextTestSuite.suite());
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
deleted file mode 100644
index caee374..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author nsd
- *
- */
-public class TestActionDelegate extends Action implements IEditorActionDelegate {
- IEditorPart editor = null;
- IAction faction = null;
-
- /**
- *
- */
- public TestActionDelegate() {
- super();
- }
-
- /**
- * @param text
- */
- public TestActionDelegate(String text) {
- super(text);
- }
-
- /**
- * @param text
- * @param image
- */
- public TestActionDelegate(String text, ImageDescriptor image) {
- super(text, image);
- }
-
- /**
- * @param text
- * @param style
- */
- public TestActionDelegate(String text, int style) {
- super(text, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction,
- * org.eclipse.ui.IEditorPart)
- */
- public void setActiveEditor(IAction targetAction, IEditorPart targetEditor) {
- editor = targetEditor;
- faction = targetAction;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction runAction) {
- MessageDialog.openInformation(editor.getEditorSite().getShell(), "Test", "Completed");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java
deleted file mode 100644
index c4c3eea..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.sse.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.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
deleted file mode 100644
index 9f83f0e..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.util.Collection;
-
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-
-public class TestLineStyleProvider implements LineStyleProvider {
-
- Color foreground = null;
-
- /**
- *
- */
- public TestLineStyleProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#init(org.eclipse.wst.sse.core.text.IStructuredDocument,
- * org.eclipse.wst.sse.ui.style.Highlighter)
- */
- public void init(IStructuredDocument document, Highlighter highlighter) {
- // nothing to init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#prepareRegions(org.eclipse.jface.text.ITypedRegion,
- * int, int, java.util.Collection)
- */
- public boolean prepareRegions(ITypedRegion currentRegion, int start, int length, Collection styleRanges) {
- // make everything bold grey
- if (foreground == null)
- foreground = EditorUtility.getColor(new RGB(127, 127, 127));
- styleRanges.add(new StyleRange(start, length, foreground, null, SWT.BOLD));
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#release()
- */
- public void release() {
- // nothing to release
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
deleted file mode 100644
index e46cdb8..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class TestStructuredTextEditor extends TestCase {
- private final String PROJECT_NAME = "TestStructuredTextEditor";
- private final String FILE_NAME = "testStructuredTextEditor.xml";
-
- private static StructuredTextEditor fEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- public TestStructuredTextEditor() {
- super("TestStructredTextEditor");
- }
-
- protected void setUp() throws Exception {
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
-
- if (fIsSetup && fEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorInput input = new FileEditorInput(fFile);
- /*
- * This should take care of testing init, createPartControl,
- * beginBackgroundOperation, endBackgroundOperation methods
- */
- IEditorPart part = page.openEditor(input, "org.eclipse.wst.sse.ui.StructuredTextEditor", true);
- if (part instanceof StructuredTextEditor)
- fEditor = (StructuredTextEditor) part;
- else
- assertTrue("Unable to open structured text editor", false);
- }
- }
-
- protected void tearDown() throws Exception {
- if (fEditor != null) {
- /*
- * This should take care of testing close and dispose methods
- */
- fEditor.close(false);
- assertTrue("Unable to close editor", true);
- fEditor = null;
- }
- }
-
- private void createProject(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- protected IFile getOrCreateFile(String filePath) {
- IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankJspFile != null && !blankJspFile.exists()) {
- try {
- blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankJspFile;
- }
-
- public void testDoSaving() {
- fEditor.doRevertToSaved();
- assertTrue("Unable to revert to saved", true);
- fEditor.doSave(new NullProgressMonitor());
- assertTrue("Unable to save", true);
- }
-
- public void testEditorContextMenuAboutToShow() {
- IMenuManager menu = new MenuManager();
- fEditor.editorContextMenuAboutToShow(menu);
- assertTrue("Unable to prepare for context menu about to show", true);
- menu.dispose();
- menu = null;
- }
-
- public void testGetAdapter() {
- Object adapter = fEditor.getAdapter(IShowInTargetList.class);
- assertTrue("Get adapter for show in target failed", adapter instanceof IShowInTargetList);
- }
-
- public void testGetSetEditorPart() {
- fEditor.setEditorPart(null);
- assertTrue("Unable to set editor part", true);
- IEditorPart part = fEditor.getEditorPart();
- assertTrue("Did not get expected editor part", part instanceof StructuredTextEditor);
- }
-
- public void testInitializeDocumentProvider() {
- fEditor.initializeDocumentProvider(null);
- assertTrue("Unable to initialize document provider", true);
- }
-
- public void testGetOrientation() {
- int or = fEditor.getOrientation();
- assertEquals(SWT.LEFT_TO_RIGHT, or);
- }
-
- public void testGetSelectionProvider() {
- ISelectionProvider provider = fEditor.getSelectionProvider();
- assertNotNull("Editor's selection provider was null", provider);
- }
-
- public void testGetTextViewer() {
- StructuredTextViewer viewer = fEditor.getTextViewer();
- assertNotNull("Editor's text viewer was null", viewer);
- }
-
- public void testRememberRestoreSelection() {
- fEditor.rememberSelection();
- assertTrue("Unable to remember editor selection", true);
- fEditor.restoreSelection();
- assertTrue("Unable to restore editor selection", true);
- }
-
- public void testSafelySanityCheck() {
- fEditor.safelySanityCheckState(fEditor.getEditorInput());
- assertTrue("Unable to safely sanity check editor state", true);
- }
-
- public void testShowBusy() {
- fEditor.showBusy(false);
- assertTrue("Unable to show editor is busy", true);
- }
-
- public void testUpdate() {
- fEditor.update();
- assertTrue("Unable to update editor", true);
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index c5981a5..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.wst.sse.ui.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-public class VerifyEditorPlugin extends TestCase {
-
- List colorList = new ArrayList();
-
- public void testPluginExists() {
- Plugin plugin = null;
- try {
- plugin = SSEUIPlugin.getDefault();
-
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("sse editor plugin could not be instantiated", plugin);
-
- }
-
- /**
- * The purpose of this test is just to test if we can directly create lots
- * of RBG colors, even if display set to "256" (on Linux). And, BTW, it
- * does not fail even with 256 colors set, at least on Linux, in dev. env.
- * Varying all three RGB numbers, though, it is easy to run out of memory!
- *
- */
- public void testColorHandles() {
- Display display = Display.getCurrent();
- if (display == null)
- display = Display.getDefault();
- assertNotNull("display could not be instantiated", display);
- for (int i = 0; i < 256; i++) {
- for (int j = 0; j < 256; j++) {
- // 256 cubed runs out of memory
- // for (int k = 0; k < 256; k++) {
- colorList.add(new Color(display, new RGB(i, j, 50)));
- // }
-
- }
-
- }
- // if we get this far without error, all is ok.
- assertTrue(true);
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java
deleted file mode 100644
index 6a3c1f7..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlinkPresenter;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.tests.Logger;
-
-public class TestViewerConfiguration extends TestCase {
-
- private StructuredTextViewerConfiguration fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfiguration() {
- super("TestViewerConfiguration");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfiguration();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- public void testGetAnnotationHover() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
- assertNotNull("AnnotationHover is null", hover);
- }
-
- /**
- * Not necessary
- */
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IStructuredPartitions.DEFAULT_PARTITION);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length > 0);
- }
-
- /**
- * Not necessary
- */
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue(configuredContentTypes.length == 1);
- }
-
- public void testGetConfiguredDocumentPartitioning() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String partitioning = fConfig.getConfiguredDocumentPartitioning(fViewer);
- assertEquals(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING, partitioning);
- }
-
- public void testGetConfiguredTextHoverStateMasks() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- int[] masks = fConfig.getConfiguredTextHoverStateMasks(fViewer, IStructuredPartitions.DEFAULT_PARTITION);
- assertEquals(2, masks.length);
- }
-
- public void testGetContentAssistant() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNull("there is a content formatter", cf);
- }
-
- /**
- * Not necessary
- */
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if (strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 0);
- }
-
- public void testGetHyperlinkPresenter() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IHyperlinkPresenter presenter = fConfig.getHyperlinkPresenter(fViewer);
- assertNotNull("hyperlink presenter shouldn't be null", presenter);
- }
-
- public void testGetInformationControlCreator() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IInformationControlCreator infoControlCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("info control creator was null", infoControlCreator);
- }
-
- public void testGetInformationPresenter() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter was null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if (!fDisplayExists)
- return;
-
- // there should be no linestyleproviders for default
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- assertNull("line style providers is not null", providers);
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetOverviewRulerAnnotationHover() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IAnnotationHover annotationHover = fConfig.getOverviewRulerAnnotationHover(fViewer);
- assertNotNull("annotation hover was null", annotationHover);
- }
-
- public void testGetPresentationReconciler() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IPresentationReconciler presentationReconciler = fConfig.getPresentationReconciler(fViewer);
- // our default presentation reconciler is no longer null
- assertNotNull("presentation reconciler was null", presentationReconciler);
- }
-
- public void testGetReconciler() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler was null", r);
- }
-
- public void testGetUndoManager() {
-
- // probably no display
- if (!fDisplayExists)
- return;
-
- IUndoManager undoManager = fConfig.getUndoManager(fViewer);
- assertNotNull("undo manager was null", undoManager);
- }
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/test.xml b/tests/org.eclipse.wst.sse.ui.tests/test.xml
deleted file mode 100644
index ce65ee0..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.sse.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.sse.ui.tests.SSEUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java b/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java
deleted file mode 100644
index 41e8647..0000000
--- a/tests/org.eclipse.wst.sse.ui.tests/text.tests/org/eclipse/text/tests/Accessor.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package org.eclipse.text.tests;
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.Assert;
-
-
-/**
- * Helper class for accessing classes and members which cannot
- * be accessed using standard Java access control like private
- * or package visible elements.
- *
- * @since 3.1
- */
-public class Accessor {
-
- /** The class to access. */
- private Class fClass;
- /** The instance to access. */
- private Object fInstance;
-
- /**
- * Creates an accessor for the given <code>instance</code> and
- * <code>class</code>. Only non-inherited members that particular
- * <code>class</code> can be accessed.
- *
- * @param instance the instance
- * @param clazz the class
- */
- public Accessor(Object instance, Class clazz) {
- org.eclipse.core.runtime.Assert.isNotNull(instance);
- Assert.isNotNull(clazz);
- fInstance= instance;
- fClass= clazz;
- }
-
- /**
- * Creates an accessor for the given <code>instance</code> and
- * <code>class</code>. Only non-inherited members that particular
- * <code>class</code> can be accessed.
- *
- * @param instance the instance
- * @param className the name of the class
- * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
- */
- public Accessor(Object instance, String className, ClassLoader classLoader) {
- Assert.isNotNull(instance);
- Assert.isNotNull(className);
- Assert.isNotNull(classLoader);
- fInstance= instance;
- try {
- fClass= Class.forName(className, true, classLoader);
- } catch (ClassNotFoundException e) {
- fail();
- } catch (ExceptionInInitializerError e) {
- fail();
- }
- }
-
- /**
- * Creates an accessor for the given class.
- * <p>
- * In order to get the type information from the given
- * arguments they must all be instanceof Object. Use
- * {@link #Accessor(String, ClassLoader, Class[], Object[])} if this
- * is not the case.</p>
- *
- * @param className the name of the class
- * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
- * @param constructorArgs the constructor arguments which must all be instance of Object
- */
- public Accessor(String className, ClassLoader classLoader, Object[] constructorArgs) {
- this(className, classLoader, getTypes(constructorArgs), constructorArgs);
- }
-
- /**
- * Creates an accessor for the given class.
- *
- * @param className the name of the class
- * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
- * @param constructorTypes the types of the constructor arguments
- * @param constructorArgs the constructor arguments
- */
- public Accessor(String className, ClassLoader classLoader, Class[] constructorTypes, Object[] constructorArgs) {
- try {
- fClass= Class.forName(className, true, classLoader);
- } catch (ClassNotFoundException e) {
- fail();
- } catch (ExceptionInInitializerError e) {
- fail();
- }
- Constructor constructor= null;
- try {
- constructor= fClass.getDeclaredConstructor(constructorTypes);
- } catch (SecurityException e2) {
- fail();
- } catch (NoSuchMethodException e2) {
- fail();
- }
- Assert.isNotNull(constructor);
- constructor.setAccessible(true);
- try {
- fInstance= constructor.newInstance(constructorArgs);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (InvocationTargetException e) {
- fail();
- } catch (InstantiationException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- }
-
- /**
- * Creates an accessor for the given class.
- * <p>
- * This constructor is used to access static stuff.
- * </p>
- *
- * @param className the name of the class
- * @param classLoader the class loader to use i.e. <code>getClass().getClassLoader()</code>
- */
- public Accessor(String className, ClassLoader classLoader) {
- try {
- fClass= Class.forName(className, true, classLoader);
- } catch (ClassNotFoundException e) {
- fail();
- } catch (ExceptionInInitializerError e) {
- fail();
- }
- }
-
- /**
- * Invokes the method with the given method name and arguments.
- * <p>
- * In order to get the type information from the given
- * arguments all those arguments must be instance of Object. Use
- * {@link #invoke(String, Class[], Object[])} if this
- * is not the case.</p>
- *
- * @param methodName the method name
- * @param arguments the method arguments which must all be instance of Object
- * @return the method return value
- */
- public Object invoke(String methodName, Object[] arguments) {
- return invoke(methodName, getTypes(arguments), arguments);
- }
-
- /**
- * Invokes the method with the given method name and arguments.
- *
- * @param methodName the method name
- * @param types the argument types
- * @param arguments the method arguments
- * @return the method return value
- */
- public Object invoke(String methodName, Class[] types, Object[] arguments) {
- Method method= null;
- try {
- method= fClass.getDeclaredMethod(methodName, types);
- } catch (SecurityException e) {
- fail();
- } catch (NoSuchMethodException ex) {
- fail();
- }
- Assert.isNotNull(method);
- method.setAccessible(true);
- try {
- return method.invoke(fInstance, arguments);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (InvocationTargetException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- return null;
- }
-
- /**
- * Assigns the given value to the field with the given name.
- *
- * @param fieldName the field name
- * @param value the value to assign to the field
- */
- public void set(String fieldName, Object value) {
- Field field= getField(fieldName);
- try {
- field.set(fInstance, value);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- }
-
- /**
- * Assigns the given value to the field with the given name.
- *
- * @param fieldName the field name
- * @param value the value to assign to the field
- */
- public void set(String fieldName, boolean value) {
- Field field= getField(fieldName);
- try {
- field.setBoolean(fInstance, value);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- }
-
- /**
- * Assigns the given value to the field with the given name.
- *
- * @param fieldName the field name
- * @param value the value to assign to the field
- */
- public void set(String fieldName, int value) {
- Field field= getField(fieldName);
- try {
- field.setInt(fInstance, value);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- }
-
- /**
- * Returns the value of the field with the given name.
- *
- * @param fieldName the field name
- * @return the value of the field
- */
- public Object get(String fieldName) {
- Field field= getField(fieldName);
- try {
- return field.get(fInstance);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- // Unreachable code
- return null;
- }
-
- /**
- * Returns the value of the field with the given name.
- *
- * @param fieldName the field name
- * @return the value of the field
- */
- public boolean getBoolean(String fieldName) {
- Field field= getField(fieldName);
- try {
- return field.getBoolean(fInstance);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- // Unreachable code
- return false;
- }
-
- /**
- * Returns the value of the field with the given name.
- *
- * @param fieldName the field name
- * @return the value of the field
- */
- public int getInt(String fieldName) {
- Field field= getField(fieldName);
- try {
- return field.getInt(fInstance);
- } catch (IllegalArgumentException e) {
- fail();
- } catch (IllegalAccessException e) {
- fail();
- }
- // Unreachable code
- return 0;
- }
-
- private Field getField(String fieldName) {
- Field field= null;
- try {
- field= fClass.getDeclaredField(fieldName);
- } catch (SecurityException e) {
- fail();
- } catch (NoSuchFieldException e) {
- fail();
- }
- field.setAccessible(true);
- return field;
- }
-
- private static Class[] getTypes(Object[] objects) {
- if (objects == null)
- return null;
-
- int length= objects.length;
- Class[] classes= new Class[length];
- for (int i= 0; i < length; i++) {
- Assert.isNotNull(objects[i]);
- classes[i]= objects[i].getClass();
- }
- return classes;
- }
-
- private void fail() {
- Assert.isTrue(false);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.classpath b/tests/org.eclipse.wst.xml.catalog.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore b/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.project b/tests/org.eclipse.wst.xml.catalog.tests/.project
deleted file mode 100644
index c417514..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.core</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6c7d10e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Mar 25 17:34:01 EST 2005
-eclipse.preferences.version=1
-encoding//data/PublicationCatalogue/Catalogue.xsd=UTF8
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d5642cc..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.catalog.tests; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xml.catalog.tests.internal.TestPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.catalog.tests.internal
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.xml.core,
- org.apache.xerces,
- org.eclipse.xsd,
- org.eclipse.wst.common.uriresolver
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: catalogtests.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/about.html b/tests/org.eclipse.wst.xml.catalog.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/build.properties b/tests/org.eclipse.wst.xml.catalog.tests/build.properties
deleted file mode 100644
index 39ddc13..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.catalogtests.jar = src/
-output.catalogtests.jar = bin/
-bin.includes = data/,\
- plugin.xml,\
- test.xml,\
- META-INF/,\
- catalogtests.jar,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd
deleted file mode 100644
index 0737ba6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT Invoice (Header,Item+)>
-<!ELEMENT Header (Date,BillTo)>
-<!ATTLIST Header
- invoiceNumber CDATA #REQUIRED
->
-<!ELEMENT Item (description*)>
-<!ATTLIST Item
- price CDATA #REQUIRED
- discount (promotion | regular) "regular"
->
-<!ELEMENT Date ((Month,Day,Year)|(Day,Month,Year))>
-<!ELEMENT BillTo (Address)>
-<!ATTLIST BillTo
- custNumber ID #REQUIRED
- name CDATA #IMPLIED
- phone CDATA #IMPLIED
->
-<!ELEMENT description (#PCDATA)>
-<!ELEMENT Address (street1,street2?,city,(state|province),zip,country?)>
-<!ELEMENT street1 (#PCDATA)>
-<!ELEMENT street2 (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT province (#PCDATA)>
-<!ELEMENT zip (#PCDATA)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT Month (#PCDATA)>
-<!ELEMENT Day (#PCDATA)>
-<!ELEMENT Year (#PCDATA)>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
deleted file mode 100644
index 6afe397..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId_test" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
deleted file mode 100644
index c2f725b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<personnel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation='personal.xsd'>
-
- <person id="Big.Boss" >
- <name><family>Boss</family> <given>Big</given></name>
- <email>chief@foo.com</email>
- <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
- </person>
-
- <person id="one.worker">
- <name><family>Worker</family> <given>One</given></name>
- <email>one@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="two.worker">
- <name><family>Worker</family> <given>Two</given></name>
- <email>two@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="three.worker">
- <name><family>Worker</family> <given>Three</given></name>
- <email>three@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="four.worker">
- <name><family>Worker</family> <given>Four</given></name>
- <email>four@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="five.worker">
- <name><family>Worker</family> <given>Five</given></name>
- <email>five@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
deleted file mode 100644
index c64e48a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml encoding="UTF-8"?>
-<!ELEMENT personnel (person)+>
-
-<!ELEMENT person (name,email*,url*,link?)>
-<!ATTLIST person id ID #REQUIRED>
-<!ATTLIST person note CDATA #IMPLIED>
-<!ATTLIST person contr (true|false) 'false'>
-<!ATTLIST person salary CDATA #IMPLIED>
-
-<!ELEMENT name ((family,given)|(given,family))>
-
-<!ELEMENT family (#PCDATA)>
-
-<!ELEMENT given (#PCDATA)>
-
-<!ELEMENT email (#PCDATA)>
-
-<!ELEMENT url EMPTY>
-<!ATTLIST url href CDATA 'http://'>
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link manager IDREF #IMPLIED>
-<!ATTLIST link subordinates IDREFS #IMPLIED>
-
-<!NOTATION gif PUBLIC '-//APP/Photoshop/4.0' 'photoshop.exe'>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
deleted file mode 100644
index 9c3e438..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE personnel SYSTEM "http://personal/personal.dtd">
-<personnel>
-
- <person id="Big.Boss">
- <name><family>Boss</family> <given>Big</given></name>
- <email>chief@foo.com</email>
- <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
- </person>
-
- <person id="one.worker">
- <name><family>Worker</family> <given>One</given></name>
- <email>one@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="two.worker">
- <name><family>Worker</family> <given>Two</given></name>
- <email>two@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="three.worker">
- <name><family>Worker</family> <given>Three</given></name>
- <email>three@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="four.worker">
- <name><family>Worker</family> <given>Four</given></name>
- <email>four@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="five.worker">
- <name><family>Worker</family> <given>Five</given></name>
- <email>five@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
deleted file mode 100644
index 05e3183..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
-
- <xs:element name="personnel">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="person" minOccurs='1' maxOccurs='unbounded'/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:unique name="unique1">
- <xs:selector xpath="person"/>
- <xs:field xpath="name/given"/>
- <xs:field xpath="name/family"/>
- </xs:unique>
- <xs:key name='empid'>
- <xs:selector xpath="person"/>
- <xs:field xpath="@id"/>
- </xs:key>
- <xs:keyref name="keyref1" refer='empid'>
- <xs:selector xpath="person"/>
- <xs:field xpath="link/@manager"/>
- </xs:keyref>
-
- </xs:element>
-
- <xs:element name="person">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="name"/>
- <xs:element ref="email" minOccurs='0' maxOccurs='unbounded'/>
- <xs:element ref="url" minOccurs='0' maxOccurs='unbounded'/>
- <xs:element ref="link" minOccurs='1' maxOccurs='1'/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:ID" use='required'/>
- <xs:attribute name="note" type="xs:string"/>
- <xs:attribute name="contr" default="false">
- <xs:simpleType>
- <xs:restriction base = "xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="salary" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="name">
- <xs:complexType>
- <xs:all>
- <xs:element ref="family"/>
- <xs:element ref="given"/>
- </xs:all>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="family" type='xs:string'/>
-
- <xs:element name="given" type='xs:string'/>
-
- <xs:element name="email" type='xs:string'/>
-
- <xs:element name="url">
- <xs:complexType>
- <xs:attribute name="href" type="xs:string" default="http://"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="link">
- <xs:complexType>
- <xs:attribute name="manager" type="xs:IDREF"/>
- <xs:attribute name="subordinates" type="xs:IDREFS"/>
- </xs:complexType>
- </xs:element>
-
- <xs:notation name='gif' public='-//APP/Photoshop/4.0' system='photoshop.exe'/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml
deleted file mode 100644
index e66621d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test Catalogue.xsd ">
- <c:Book>
- <title>Professional XML Schema</title>
- <date>2001</date>
- <isbn>1-861005-47-4</isbn>
- <publisher>Wrox Press</publisher>
- </c:Book>
- <c:Magazine>
- <title>WebSphere Developer's Journal</title>
- <date>2001</date>
- </c:Magazine>
- <c:Book>
- <title>Java and XSLT</title>
- <date>2001</date>
- <isbn>0-596-00143-6</isbn>
- <publisher>O'Reilly</publisher>
- </c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
deleted file mode 100644
index 1668642..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.eclipse.org/webtools/Catalogue/test"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:c="http://www.eclipse.org/webtools/Catalogue/test"
- xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test Catalogue.xsd ">
- <group name="test">
- <sequence>
- <element name="test1"></element>
- </sequence>
- </group>
- <complexType name="PublicationType">
- <sequence>
- <element name="title" type="string"></element>
- <element name="author" type="string" minOccurs="0"
- maxOccurs="unbounded">
- </element>
- <element name="date" type="gYear"></element>
- </sequence>
- </complexType>
-
- <complexType name="BookType">
- <complexContent>
- <extension base="c:PublicationType">
- <sequence>
- <element name="isbn" type="string" />
- <element name="publisher" type="string" />
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MagazineType">
- <complexContent>
- <restriction base="c:PublicationType">
- <sequence>
- <element name="title" type="string" />
- <element name="author" type="string" minOccurs="0"
- maxOccurs="0" />
- <element name="date" type="gYear"></element>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
- <element name="Publication" type="c:PublicationType"
- abstract="true">
- </element>
-
- <element name="Book" type="c:BookType"
- substitutionGroup="c:Publication">
- </element>
-
- <element name="Magazine" type="c:MagazineType"
- substitutionGroup="c:Publication">
- </element>
-
- <element name="Catalogue">
- <complexType>
- <sequence>
- <element ref="c:Publication" maxOccurs="unbounded"></element>
- </sequence>
- </complexType>
- </element>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
deleted file mode 100644
index 12bd7e6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<po:purchaseOrder orderDate="2001-01-01" xmlns:po="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com PurchaseOrder.xsd">
- <shipTo country="US">
- <name>Alice Smith</name>
- <street>125 Maple Street</street>
- <city>Mill Valley</city>
- <state>CA</state>
- <zip>90952</zip>
- </shipTo>
- <billTo country="US">
- <name>Robert Smith</name>
- <street>8 Oak Avenue</street>
- <city>Old Town</city>
- <state>PA</state>
- <zip>95819</zip>
- </billTo>
- <po:comment>Hurry, my lawn is going wild!</po:comment>
- <items>
- <item partNum="872-AA">
- <productName>Lawnmower</productName>
- <quantity>1</quantity>
- <USPrice>148.95</USPrice>
- <po:comment>Confirm this is electric</po:comment>
- </item>
- <item partNum="926-AA">
- <productName>Baby Monitor</productName>
- <quantity>1</quantity>
- <USPrice>39.98</USPrice>
- <shipDate>2001-07-21</shipDate>
- </item>
- </items>
-</po:purchaseOrder>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
deleted file mode 100644
index d0fb094..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.ibm.com"
- xmlns:po="http://www.ibm.com">
- <annotation>
- <documentation xml:lang="en">
- Purchase order schema example from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All rights reserved
- Copyright 2001, World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatiqueet en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <element name="purchaseOrder" type="po:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="po:USAddress"/>
- <element name="billTo" type="po:USAddress"/>
- <element ref="po:comment" minOccurs="0"/>
- <element name="items" type="po:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="USAddress">
- <sequence>
- <element name="name" type="string"/>
- <element name="street" type="string"/>
- <element name="city" type="string"/>
- <element name="state" type="po:USState"/>
- <element name="zip" type="decimal"/>
- </sequence>
- <attribute name="country" type="NMTOKEN" fixed="US"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="po:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="po:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
- <simpleType name="USState">
- <restriction base="string">
- <enumeration value="CA"></enumeration>
- <enumeration value="PA"></enumeration>
- <enumeration value="AR"></enumeration>
- </restriction>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
deleted file mode 100644
index 26ea442..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- Addresses for International Purchase order schema
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <complexType name="Address">
- <sequence>
- <element name="name" type="string"/>
- <element name="street" type="string"/>
- <element name="city" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name="USAddress">
- <complexContent>
- <extension base="ipo:Address">
- <sequence>
- <element name="state" type="ipo:USState"/>
- <element name="zip" type="positiveInteger"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="UKAddress">
- <complexContent>
- <extension base="ipo:Address">
- <sequence>
- <element name="postcode" type="ipo:UKPostcode"/>
- </sequence>
- <attribute name="exportCode" type="positiveInteger" fixed="1"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- other Address derivations for more countries -->
-
- <simpleType name="USState">
- <restriction base="string">
- <enumeration value="AK"/>
- <enumeration value="AL"/>
- <enumeration value="AR"/>
- <!-- and so on ... -->
- </restriction>
- </simpleType>
-
- <!-- simple type definition for Postcode -->
- <simpleType name="Postcode">
- <restriction base="string">
- </restriction>
- </simpleType>
-
- <!-- simple type definition for UKPostcode -->
- <simpleType name="UKPostcode">
- <restriction base="ipo:Postcode">
- <pattern value="[A-Z]{2}\d\s\d[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-
-</schema>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
deleted file mode 100644
index d483ade..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<ipo:purchaseOrder
- orderDate="2001-01-01" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ipo="http://www.example.com/IPO" xsi:schemaLocation="http://www.example.com/IPO ipo.xsd ">
-
- <shipTo exportCode="1" xsi:type="ipo:UKAddress">
- <name>Helen Zoe</name>
- <street>47 Eden Street</street>
- <city>Cambridge</city>
- <postcode>CB1 1JR</postcode>
- </shipTo>
-
- <billTo xsi:type="ipo:USAddress">
- <name>Robert Smith</name>
- <street>8 Oak Avenue</street>
- <city>Old Town</city>
- <state>AR</state>
- <zip>95819</zip>
- </billTo>
-
- <items>
- <item partNum="833-AA">
- <productName>Lapis necklace</productName>
- <quantity>1</quantity>
- <USPrice>99.95</USPrice>
- <ipo:comment>Want this for the holidays!</ipo:comment>
- <shipDate>1999-12-05</shipDate>
- </item>
- </items>
-</ipo:purchaseOrder>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
deleted file mode 100644
index 7a63d01..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- International Purchase order schema for Example.com
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <!-- include address constructs -->
- <include
- schemaLocation="address.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="ipo:Address"/>
- <element name="billTo" type="ipo:Address"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="items" type="ipo:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="ipo:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
deleted file mode 100644
index 436d49d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- International Purchase order schema for Example.com
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <!-- include address constructs -->
- <include
- schemaLocation="address_.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="ipo:Address"/>
- <element name="billTo" type="ipo:Address"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="items" type="ipo:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="ipo:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
deleted file mode 100644
index 98ed6f1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
- xmlns:ex="http://www.example.com/Report"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.example.com/Report report.xsd">
- <ex:regions>
- <ex:zip code="39487">
- <ex:part number="293-AX" quantity="3"/>
- <ex:part number="293-LD" quantity="3"/>
- </ex:zip>
- <ex:zip code="29387">
- <ex:part number="897-JD" quantity="30"/>
- </ex:zip>
- <ex:zip code="19285">
- <ex:part number="123-CK" quantity="19"/>
- <ex:part number="175-FQ" quantity="8"/>
- </ex:zip>
- </ex:regions>
-
- <ex:parts>
- <ex:part number="293-AX"/>
- <ex:part number="897-JD"/>
- <ex:part number="123-CK"/>
- <ex:part number="293-LD"/>
- <ex:part number="175-FQ"/>
- </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
deleted file mode 100644
index 0ee7ca4..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
- <annotation>
- <documentation>
- The Report Schema from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All Rights Reserved.
- Copyright 2001, World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>
-
- <element name="purchaseReport">
- <complexType>
- <sequence>
- <element name="regions" type="r:RegionsType"/>
-
- <element name="parts" type="r:PartsType"/>
- </sequence>
- <attribute name="period" type="duration"/>
- <attribute name="periodEnding" type="date"/>
- </complexType>
-
- <unique name="dummy1">
- <selector xpath="r:regions/r:zip"/>
- <field xpath="@code"/>
- </unique>
-
- <key name="pNumKey">
- <selector xpath="r:parts/r:part"/>
- <field xpath="@number"/>
- </key>
- <keyref name="dummy2" refer="r:pNumKey">
- <selector xpath="r:regions/r:zip/r:part"/>
- <field xpath="@number"/>
- </keyref>
- </element>
-
- <complexType name="RegionsType">
- <sequence>
- <element name="zip" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <complexContent>
- <restriction base="anyType">
- <attribute name="number" type="xipo:SKU"/>
- <attribute name="quantity" type="positiveInteger"/>
- </restriction>
- </complexContent>
- </complexType>
- </element>
- </sequence>
- <attribute name="code" type="positiveInteger"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name="PartsType">
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <simpleContent>
- <extension base="string">
- <attribute name="number" type="xipo:SKU"/>
- </extension>
- </simpleContent>
- </complexType>
- </element>
- </sequence>
- </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
deleted file mode 100644
index 7d34ce1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
- xmlns:ex="http://www.example.com/Report"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.example.com/Report">
- <ex:regions>
- <ex:zip code="39487">
- <ex:part number="293-AX" quantity="3"/>
- <ex:part number="293-LD" quantity="3"/>
- </ex:zip>
- <ex:zip code="29387">
- <ex:part number="897-JD" quantity="30"/>
- </ex:zip>
- <ex:zip code="19285">
- <ex:part number="123-CK" quantity="19"/>
- <ex:part number="175-FQ" quantity="8"/>
- </ex:zip>
- </ex:regions>
-
- <ex:parts>
- <ex:part number="293-AX"/>
- <ex:part number="897-JD"/>
- <ex:part number="123-CK"/>
- <ex:part number="293-LD"/>
- <ex:part number="175-FQ"/>
- </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
deleted file mode 100644
index cb284be..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
- <annotation>
- <documentation>
- The Report Schema from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All Rights Reserved.
- Copyright 2001, World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <import namespace="http://www.example.com/IPO" schemaLocation="ipo__.xsd"/>
-
- <element name="purchaseReport">
- <complexType>
- <sequence>
- <element name="regions" type="r:RegionsType"/>
-
- <element name="parts" type="r:PartsType"/>
- </sequence>
- <attribute name="period" type="duration"/>
- <attribute name="periodEnding" type="date"/>
- </complexType>
-
- <unique name="dummy1">
- <selector xpath="r:regions/r:zip"/>
- <field xpath="@code"/>
- </unique>
-
- <key name="pNumKey">
- <selector xpath="r:parts/r:part"/>
- <field xpath="@number"/>
- </key>
- <keyref name="dummy2" refer="r:pNumKey">
- <selector xpath="r:regions/r:zip/r:part"/>
- <field xpath="@number"/>
- </keyref>
- </element>
-
- <complexType name="RegionsType">
- <sequence>
- <element name="zip" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <complexContent>
- <restriction base="anyType">
- <attribute name="number" type="xipo:SKU"/>
- <attribute name="quantity" type="positiveInteger"/>
- </restriction>
- </complexContent>
- </complexType>
- </element>
- </sequence>
- <attribute name="code" type="positiveInteger"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name="PartsType">
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <simpleContent>
- <extension base="string">
- <attribute name="number" type="xipo:SKU"/>
- </extension>
- </simpleContent>
- </complexType>
- </element>
- </sequence>
- </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
deleted file mode 100644
index b00c82c..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:er="http://oasis.names.tc.entity.xmlns.xml.catalog"
- targetNamespace="http://oasis.names.tc.entity.xmlns.xml.catalog"
- elementFormDefault="qualified">
-
- <!-- $Id: catalog.xsd,v 1.1 2005/06/24 04:17:50 csalter Exp $ -->
-
- <xs:simpleType name="pubIdChars">
- <!-- A string of the characters defined as pubIdChar in production 13
- of the Second Edition of the XML 1.0 Recommendation. Does not include
- the whitespace characters because they're normalized by XML parsing. -->
- <xs:restriction base="xs:string">
- <xs:pattern value="[a\-zA\-Z0\-9\-'()+,./:=?;!*#@$_%]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name='publicIdentifier'>
- <xs:restriction base="er:pubIdChars"/>
- </xs:simpleType>
-
- <xs:simpleType name='partialPublicIdentifier'>
- <xs:restriction base='er:pubIdChars'/>
- </xs:simpleType>
-
- <xs:simpleType name='systemOrPublic'>
- <xs:restriction base='xs:string'>
- <xs:enumeration value='system'/>
- <xs:enumeration value='public'/>
- </xs:restriction>
- </xs:simpleType>
-
- <!-- The global attribute xml:base is not explicitly declared; -->
- <!-- it is allowed by the anyAttribute declarations. -->
-
- <xs:complexType name='catalog'>
- <xs:choice minOccurs='1' maxOccurs='unbounded'>
- <xs:element ref='er:public'/>
- <xs:element ref='er:system'/>
- <xs:element ref='er:uri'/>
- <xs:element ref='er:rewriteSystem'/>
- <xs:element ref='er:rewriteURI'/>
- <xs:element ref='er:delegatePublic'/>
- <xs:element ref='er:delegateSystem'/>
- <xs:element ref='er:delegateURI'/>
- <xs:element ref='er:nextCatalog'/>
- <xs:element ref='er:group'/>
- <xs:any namespace='##other' processContents='skip'/>
- </xs:choice>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:attribute name='prefer' type='er:systemOrPublic'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:complexType name='public'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicId" type="er:publicIdentifier"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='system'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemId" type="xs:string"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='uri'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="name" type="xs:anyURI"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='rewriteSystem'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='rewriteURI'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegatePublic'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicIdStartString"
- type="er:partialPublicIdentifier"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegateSystem'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegateURI'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='nextCatalog'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='group'>
- <xs:choice minOccurs='1' maxOccurs='unbounded'>
- <xs:element ref='er:public'/>
- <xs:element ref='er:system'/>
- <xs:element ref='er:uri'/>
- <xs:element ref='er:rewriteSystem'/>
- <xs:element ref='er:rewriteURI'/>
- <xs:element ref='er:delegatePublic'/>
- <xs:element ref='er:delegateSystem'/>
- <xs:element ref='er:delegateURI'/>
- <xs:element ref='er:nextCatalog'/>
- <xs:any namespace='##other' processContents='skip'/>
- </xs:choice>
- <xs:attribute name='prefer' type='er:systemOrPublic'/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="catalog" type="er:catalog"/>
- <xs:element name="public" type="er:public"/>
- <xs:element name="system" type="er:system"/>
- <xs:element name="uri" type="er:uri"/>
- <xs:element name="rewriteSystem" type="er:rewriteSystem"/>
- <xs:element name="rewriteURI" type="er:rewriteURI"/>
- <xs:element name="delegatePublic" type="er:delegatePublic"/>
- <xs:element name="delegateSystem" type="er:delegateSystem"/>
- <xs:element name="delegateURI" type="er:delegateURI"/>
- <xs:element name="nextCatalog" type="er:nextCatalog"/>
- <xs:element name="group" type="er:group"/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
deleted file mode 100644
index 124bc14..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="./Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system systemId="Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="yes" property="value1"/>
- <uri name="http://www.test.com/Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="no" property="value2"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
deleted file mode 100644
index 8839591..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="http://www.eclipse.org/webtools/Catalogue_001" uri="./PublicationCatalogue/Catalogue.xsd" />
- <system systemId="Catalogue.xsd" uri="./PublicationCatalogue/Catalogue.xsd" />
- <uri name="http://www.eclipse.org/webtools/Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd" />
- <group id="group1" prefer="system">
- <public publicId="http://www.eclipse.org/webtools/Catalogue_002" uri="./PublicationCatalogue/Catalogue.xsd" />
- </group>
- </catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
deleted file mode 100644
index 2866132..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="http://www.eclipse.org/webtools/Catalogue" uri="./PublicationCatalogue/Catalogue.xsd"/>
- <system systemId="Catalogue.xsd" uri="./PublicationCatalogue/Catalogue.xsd"/>
- <group id="group1" prefer="system">
- <uri name="http://Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd"/>
- </group>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog b/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
deleted file mode 100644
index a884551..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<XMLCatalogSettings>
- <UserEntries>
- <UserEntry TYPE="PUBLIC" ID="InvoiceId"
-URI="platform:/resource/XMLExamples/Invoice2/Invoice.dtd"/>
- </UserEntries>
-</XMLCatalogSettings>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
deleted file mode 100644
index 7c794c5..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <rewriteSystem systemIdStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
- <rewriteURI uriStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml
deleted file mode 100644
index 124bc14..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="./Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system systemId="Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="yes" property="value1"/>
- <uri name="http://www.test.com/Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="no" property="value2"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
deleted file mode 100644
index d283dee..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="ISO 8879:1986//ENTITIES Publishing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-pub.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk1.ent"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbpoolx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-box.ent"/>
- <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/docbookx.dtd"/>
- <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk3.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsn.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-num.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbcentx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk4.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbnotnx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-dia.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk2.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbgenent.mod"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbhierx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsa.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amso.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyrl.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES General Technical//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-tech.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsc.ent"/>
- <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="xml-dtd-4.2-1.0-17.2/soextblx.dtd"/>
- <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/calstblx.dtd"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat1.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsb.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat2.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsr.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyr2.ent"/>
- <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
- <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbpoolx.mod"/>
- <public publicId="-//OASIS//DTD DocBook XML V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/docbookx.dtd"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbcentx.mod"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbnotnx.mod"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbgenent.mod"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbhierx.mod"/>
- <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/calstblx.dtd"/>
- <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
- <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
deleted file mode 100644
index a67cd07..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
- <uri name="http://apache.org/xml/xcatalog/example" uri="./example/example.xsd"/>
- <system systemId="myexample.xsd" uri="./example/example-nonamespace.xsd"/>
-
- <delegatePublic publicIdStartString="-//A//"
- catalog="example-catalog2.xml"/>
-
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
deleted file mode 100644
index 18bb1ef..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
- <public publicId="-//A//XML CATALOG IDENTIFIER//EN"
- uri="./example/example.ent"/>
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
deleted file mode 100644
index 94aaae9..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE root [
- <!ENTITY text PUBLIC "-//A//XML CATALOG IDENTIFIER//EN"
- "urn:publicid:-:A:XML+CATALOG+IDENTIFIER:EN">
-]>
-<root>&text;</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
deleted file mode 100644
index ef2998d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
deleted file mode 100644
index 39175f1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="myexample.xsd">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
deleted file mode 100644
index f97cb3b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns="http://apache.org/xml/xcatalog/example">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
deleted file mode 100644
index cd08755..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
deleted file mode 100644
index 41a29fe..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://apache.org/xml/xcatalog/example"
- targetNamespace="http://apache.org/xml/xcatalog/example">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
deleted file mode 100644
index bf127b1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <!-- we can not map PublicId or URI of the included/redefined schemas -->
- <uri name="http://www.example.com/IPO"
- uri="./PurchaseOrder/international/ipo_.xsd" />
- <system systemId="address_.xsd"
- uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
deleted file mode 100644
index 734ecba..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <!-- we can not map PublicId or URI of the included/redefined schemas -->
- <uri name="http://www.example.com/IPO"
- uri="./PurchaseOrder/international/ipo.xsd" />
-
-
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
deleted file mode 100644
index c66a1b9..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <system systemId="ipo__.xsd"
- uri="./PurchaseOrder/international/ipo_.xsd" />
- <system systemId="address_.xsd"
- uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar b/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
deleted file mode 100644
index 9d1e4da..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
deleted file mode 100644
index 98b04a1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" xml:base=".">
- <public publicId="myquote" uri="quote2.xml"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
deleted file mode 100644
index 1fcba52..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
- <!-- I belong to:
- org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
- -->
-
-<para>
- A stitch in time saves nine
-</para>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
deleted file mode 100644
index 10cd14e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<para>
- No news is good news
-</para>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
deleted file mode 100644
index e692b0e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:output method="text"/>
-
- <!-- name of the output parameter to write -->
- <xsl:param name="outprop">value</xsl:param>
-
- <xsl:strip-space elements="*"/>
-
- <xsl:template match="/">
- <xsl:value-of select="$outprop"/>: <xsl:apply-templates select="/fragment/para"/>
- </xsl:template>
-
- <!-- This will only be matched in doc2.xml -->
- <xsl:template match="Ref">
- <xsl:apply-templates select="document(@file)/fragment/para"/>
- </xsl:template>
-
- <!-- This will only be matched in doc1.xml -->
- <xsl:template match="text()">
- <xsl:value-of select="normalize-space(.)"/>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
deleted file mode 100644
index 11c730d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE fragment [
- <!ENTITY quote PUBLIC "myquote" "quote1.xml">
-]>
-
-<fragment>
- <para>
- "e;
- </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
deleted file mode 100644
index dd41d0b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<fragment>
- <para>
- <Ref file="xmlcatalog1.xml"/>
- </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
deleted file mode 100644
index e9d7fc5..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: A stitch in time saves nine
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
deleted file mode 100644
index 987a5db..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
+++ /dev/null
@@ -1,2 +0,0 @@
-<<<< testvalue: A stitch in time saves nine
-<<<< testvalue: No news is good news
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
deleted file mode 100644
index 1de28a7..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: No news is good news
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
deleted file mode 100644
index e99645a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/XSL/Transform">
- <!-- xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" /-->
-
- <xsd:element name="stylesheet" type="wrapper" />
- <xsd:element name="transform" type="wrapper" />
-
- <xsd:complexType name="wrapper">
- <xsd:group ref="topLevelElements" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="extension-element-prefixes" type="xsd:string" use="optional" />
- <xsd:attribute name="exclude-result-prefixes" type="xsd:string" use="optional" />
- <xsd:attribute name="id" type="xsd:ID" use="optional" />
- <xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
-
- <xsd:element name="import">
- <xsd:complexType>
- <xsd:attribute name="href" type="xsd:anyURI" use="required" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="include">
- <xsd:complexType>
- <xsd:attribute name="href" type="xsd:anyURI" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="strip-space">
- <xsd:complexType>
- <xsd:attribute name="elements" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="preserve-space">
- <xsd:complexType>
- <xsd:attribute name="elements" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="output">
- <xsd:complexType>
- <xsd:attribute name="method" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="xml" />
- <xsd:enumeration value="html" />
- <xsd:enumeration value="text" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="encoding" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="omit-xml-declaration" use="optional" type="YesNoType" />
- <xsd:attribute name="standalone" use="optional" type="YesNoType" />
- <xsd:attribute name="doctype-public" type="xsd:string" use="optional" />
- <xsd:attribute name="doctype-system" type="xsd:string" use="optional" />
- <xsd:attribute name="cdata-section-elements" type="xsd:NMTOKENS" use="optional" />
- <xsd:attribute name="indent" use="optional" type="YesNoType" />
- <xsd:attribute name="media-type" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="key">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attribute name="match" type="pattern" use="required" />
- <xsd:attribute name="use" type="expression" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="decimal-format">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute default="." name="decimal-separator" type="xsd:string" />
- <xsd:attribute default="," name="grouping-separator" type="xsd:string" />
- <xsd:attribute default="Infinity" name="infinity" type="xsd:string" />
- <xsd:attribute default="-" name="minus-sign" type="xsd:string" />
- <xsd:attribute default="NaN" name="NaN" type="xsd:string" />
- <xsd:attribute default="%" name="percent" type="xsd:string" />
- <xsd:attribute default="‰" name="per-mille" type="xsd:string" />
- <xsd:attribute default="0" name="zero-digit" type="xsd:string" />
- <xsd:attribute default="#" name="digit" type="xsd:string" />
- <xsd:attribute default=";" name="pattern-separator" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="namespace-alias">
- <xsd:complexType>
- <xsd:attribute name="stylesheet-prefix" type="xsd:string" use="required" />
- <xsd:attribute name="result-prefix" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="template">
- <xsd:complexType mixed="true">
- <xsd:sequence>
- <xsd:element ref="param" minOccurs="0" maxOccurs="unbounded" />
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:any namespace="##other" processContents="skip" />
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="match" type="pattern" use="optional" />
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="priority" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="value-of">
- <xsd:complexType>
- <xsd:attributeGroup ref="select-required" />
- <xsd:attributeGroup ref="disable-output-escaping" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="copy-of">
- <xsd:complexType>
- <xsd:attributeGroup ref="select-required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="number">
- <xsd:complexType>
- <xsd:attribute default="single" name="level">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="single" />
- <xsd:enumeration value="multiple" />
- <xsd:enumeration value="any" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="count" type="pattern" use="optional"/>
- <xsd:attribute name="from" type="pattern" use="optional"/>
- <xsd:attribute name="value" type="expression" use="optional"/>
- <xsd:attribute default="1" name="format" type="xsd:string" />
- <xsd:attribute name="lang" type="xsd:string" use="optional" />
- <xsd:attribute name="letter-value" type="xsd:string" use="optional" />
- <xsd:attribute name="grouping-separator" type="xsd:string" use="optional" />
- <xsd:attribute name="grouping-size" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="apply-templates">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="sort" />
- <xsd:element ref="with-param" />
- </xsd:choice>
- <xsd:attribute default="node()" name="select" type="expression" />
- <xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="apply-imports">
- <xsd:complexType />
- </xsd:element>
-
- <xsd:element name="for-each">
- <xsd:complexType mixed="true">
- <xsd:sequence>
- <xsd:element ref="sort" minOccurs="0" maxOccurs="unbounded" />
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:any namespace="##other" processContents="skip" />
- </xsd:choice>
- </xsd:sequence>
- <xsd:attributeGroup ref="select-required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="sort">
- <xsd:complexType>
- <xsd:attribute default="." name="select" type="expression" />
- <xsd:attribute name="lang" type="xsd:string" use="optional" />
- <xsd:attribute default="text" name="data-type" type="xsd:string" />
- <xsd:attribute default="ascending" name="order" type="xsd:string" />
- <xsd:attribute name="case-order" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="if">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded"></xsd:group>
- <xsd:attribute name="test" type="expression" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="choose">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="when" minOccurs="1" maxOccurs="unbounded" />
- <xsd:element ref="otherwise" minOccurs="0" />
- </xsd:sequence>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="when">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="test" type="expression" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="otherwise">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="attribute-set">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="attribute" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="call-template">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="with-param" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="with-param" type="NamedAndSelectable" />
-
- <xsd:element name="variable" type="NamedAndSelectable" />
-
- <xsd:element name="param" type="NamedAndSelectable" />
-
- <xsd:element name="text">
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attributeGroup ref="disable-output-escaping" />
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="processing-instruction">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="element">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions"></xsd:group>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="namespace" type="xsd:string" use="optional" />
- <xsd:attributeGroup ref="use-attribute-sets" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="attribute">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="namespace" type="xsd:string" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="comment">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="copy">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions"/>
- <!-- xsd:attribute ref="xml:space" /-->
- <xsd:attributeGroup ref="use-attribute-sets" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="message">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <xsd:attribute default="no" name="terminate" type="YesNoType" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="fallback">
- <xsd:complexType mixed="true">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:group ref="instructions"></xsd:group>
- </xsd:choice>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:group name="instructions">
- <xsd:choice>
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:element ref="processing-instruction" />
- <xsd:element ref="comment" />
- <xsd:element ref="element" />
- <xsd:element ref="attribute" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:group name="char-instructions">
- <xsd:choice>
- <xsd:element ref="apply-templates" />
- <xsd:element ref="call-template" />
- <xsd:element ref="apply-imports" />
- <xsd:element ref="for-each" />
- <xsd:element ref="value-of" />
- <xsd:element ref="copy-of" />
- <xsd:element ref="number" />
- <xsd:element ref="choose" />
- <xsd:element ref="if" />
- <xsd:element ref="text" />
- <xsd:element ref="copy" />
- <xsd:element ref="variable" />
- <xsd:element ref="message" />
- <xsd:element ref="fallback" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:group name="topLevelElements">
- <xsd:choice>
- <xsd:element ref="import" />
- <xsd:element ref="include" />
- <xsd:element ref="strip-space" />
- <xsd:element ref="preserve-space" />
- <xsd:element ref="key" />
- <xsd:element ref="decimal-format" />
- <xsd:element ref="attribute-set" />
- <xsd:element ref="namespace-alias" />
- <xsd:element ref="param" />
- <xsd:element ref="variable" />
- <xsd:element ref="output" />
- <xsd:element ref="template" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:simpleType name="YesNoType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="yes" />
- <xsd:enumeration value="no" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="NamedAndSelectable" mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attributeGroup ref="select-optional" />
- </xsd:complexType>
-
-
- <xsd:simpleType name="expression">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="pattern">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:attributeGroup name="select-optional">
- <xsd:attribute name="select" type="expression" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="select-required">
- <xsd:attribute name="select" type="expression" use="required" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="disable-output-escaping">
- <xsd:attribute name="disable-output-escaping" type="YesNoType" default="no" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="use-attribute-sets">
- <xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional"/>
- </xsd:attributeGroup>
-
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties b/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties
deleted file mode 100644
index 5605854..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.catalog.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = XML Catalog Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml b/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
deleted file mode 100644
index ca8ffe8..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution>
- <system id="testSystemId"
- systemId="http://personal/personal.dtd"
- uri="data/Personal/personal.dtd">
- </system>
- <public id="testPublicId1"
- publicId="InvoiceId_test"
- uri="data/Invoice/Invoice.dtd"
- webURL="http://org.eclipse.wst.xml.example/Invoice.dtd">
- </public>
- <uri id="testUriId1"
- name="http://apache.org/xml/xcatalog/example"
- uri="data/example/example.xsd"/>
- <uri id="testURIId2"
- name="http://www.w3.org/2001/XMLSchema"
- uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd">
- </uri>
- <uri id="testURIId3"
- name="http://oasis.names.tc.entity.xmlns.xml.catalog"
- uri="jar:platform:/plugin/org.eclipse.wst.xml.catalog.tests/data/schemas.jar!/data/catalog.xsd">
- </uri>
- <nextCatalog id="testNestedCatalog"
- catalog="data/catalog1.xml"/>
- </catalogContribution>
- </extension>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
deleted file mode 100644
index e2b63d1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogContributorRegistryReader;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.osgi.framework.Bundle;
-
-public abstract class AbstractCatalogTest extends TestCase
-{
- private CatalogSet catalogSet = new CatalogSet();
-
- protected ICatalog systemCatalog;
-
- protected ICatalog userCatalog;
-
- protected ICatalog defaultCatalog;
-
-
- public AbstractCatalogTest(String name)
- {
- super(name);
-
- }
-
- protected static List getCatalogEntries(ICatalog catalog, int entryType)
- {
- List result = new ArrayList();
- ICatalogEntry[] entries = catalog.getCatalogEntries();
- for (int i = 0; i < entries.length; i++)
- {
- ICatalogEntry entry = entries[i];
- if (entry.getEntryType() == entryType)
- {
- result.add(entry);
- }
- }
- return result;
- }
-
- protected ICatalog getCatalog(String id, String uriString) throws Exception
- {
- return catalogSet.lookupOrCreateCatalog(id, uriString);
- }
-
-
- public void initCatalogs()
- {
- defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog catalog = nextCatalogs[i];
- ICatalog referencedCatalog = catalog.getReferencedCatalog();
- if (referencedCatalog != null)
- {
- if (XMLCorePlugin.SYSTEM_CATALOG_ID
- .equals(referencedCatalog.getId()))
- {
- systemCatalog = referencedCatalog;
- } else if (XMLCorePlugin.USER_CATALOG_ID
- .equals(referencedCatalog.getId()))
- {
- userCatalog = referencedCatalog;
- }
- }
- }
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- initCatalogs();
- }
-
- protected static String makeAbsolute(String baseLocation, String location)
- {
- URL local = null;
- location = location.replace('\\', '/');
- try
- {
- URL baseURL = new URL(baseLocation);
- local = new URL(baseURL, location);
- } catch (MalformedURLException e)
- {
- }
-
- if (local != null)
- {
- return local.toString();
- } else
- {
- return location;
- }
- }
-
- protected static URL resolvePluginLocation(String pluginId){
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null)
- {
- URL bundleEntry = bundle.getEntry("/");
- try
- {
- return FileLocator.resolve(bundleEntry);
- } catch (IOException e)
- {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- // see CatalogContributorRegistryReader.resolvePath(String path)
- protected String resolvePath(String pluginId, String path)
- {
-
- return CatalogContributorRegistryReader.resolvePath(
- CatalogContributorRegistryReader.getPlatformURL(pluginId), path);
- }
-
-
- protected String getFileLocation(String path) {
- String result = null;
- try {
- result = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(path), null)).toString();
- } catch (IOException e) {}
- return URIHelper.ensureFileURIProtocolFormat(result);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
deleted file mode 100644
index d658c7a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.wst.xml.catalog.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(CatalogReaderTest.class);
- suite.addTestSuite(CatalogResolverTest.class);
- suite.addTestSuite(CatalogWriterTest.class);
- suite.addTestSuite(CatalogContributorRegistryReaderTest.class);
- suite.addTestSuite(CatalogTest.class);
- //$JUnit-END$
- return suite;
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
deleted file mode 100644
index 0b001c1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-
-public class CatalogContributorRegistryReaderTest extends AbstractCatalogTest
-{
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- public CatalogContributorRegistryReaderTest(String name)
- {
- super(name);
- }
-
- public final void testReadRegistry() throws Exception
- {
- assertNotNull(defaultCatalog);
- assertEquals(XMLCorePlugin.DEFAULT_CATALOG_ID, defaultCatalog.getId());
- assertEquals(2, defaultCatalog.getNextCatalogs().length);
-
- String pluginId = TestPlugin.getDefault().getBundle().getSymbolicName();
-
- // test system entries
- assertNotNull(systemCatalog);
- List entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testSystemId".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/Personal/personal.dtd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://personal/personal.dtd", entry.getKey());
- }
- }
-
- // test public entries
- entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testPublicId1".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- // test user defined attributes
- assertEquals("http://org.eclipse.wst.xml.example/Invoice.dtd", entry.getAttributeValue("webURL"));
-
- }
-
- else if("testMappingInfo".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://www.w3.org/2001/XMLSchema1", entry.getKey());
- }
-
- }
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_URI);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testURIId1".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/example/example.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://apache.org/xml/xcatalog/example", entry.getKey());
- }
- else if("testURIId2".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://www.w3.org/2001/XMLSchema", entry.getKey());
- }
- else if("testURIId3".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "jar:platform:/plugin/org.eclipse.wst.xml.catalog.tests/data/schemas.jar!/data/catalog.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://oasis.names.tc.entity.xmlns.xml.catalog", entry.getKey());
- }
- }
-
- // test tested catalog
- INextCatalog[] nextCatalogEntries = systemCatalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogEntries.length; i++)
- {
- INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[i];
- if("testNestedCatalog".equals(nextCatalogEntry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/catalog1.xml");
- assertEquals(resolvedURI, nextCatalogEntry.getCatalogLocation());
- ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
- assertNotNull(nextCatalog);
- assertEquals(3, nextCatalog.getCatalogEntries().length);
- // test public entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry) entries.get(0);
- //URI uri = URIHelper.getURIForFilePath(resolvedURI);
- //resolvedURI = URIHelper.makeAbsolute(uri.toURL(), "./Invoice/Invoice.dtd");
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- // test system entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- // test uri entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
deleted file mode 100644
index 4699b8e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-public class CatalogReaderTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogReaderTest(String name) {
- super(name);
- }
-
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadCatalog()throws Exception {
-
- //read catalog
- String catalogFile = "/data/catalog1.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog1", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(3, catalog.getCatalogEntries().length);
-
- // test public entries
- List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
- //String resolvedURI = URIHelper.makeAbsolute(base, "./Invoice/Invoice.dtd");
-
-
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- assertEquals("yes", entry.getAttributeValue("chached"));
- assertEquals("value1", entry.getAttributeValue("property"));
-
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- assertEquals("no", entry.getAttributeValue("chached"));
- assertEquals("value2", entry.getAttributeValue("property"));
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
-// String catalogRefId = nextCatalogEntry.getCatalogRefId();
-// assertEquals("nextCatalog1", catalogRefId);
- //resolvedURI = URIHelper.makeAbsolute(base, "catalog2.xml");
- assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
-
- ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
-
- assertNotNull(nextCatalog);
- assertEquals(4, nextCatalog.getCatalogEntries().length);
-
- // test public entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(2, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- //resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalogue/Catalogue.xsd");
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue_001", entry.getKey());
-
- // test public entry from a group
- entry = (ICatalogEntry)entries.get(1);
- //resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalogue/Catalogue.xsd");
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue_002", entry.getKey());
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("Catalogue.xsd", entry.getKey());
- // test uri entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals("http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd", entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue.xsd", entry.getKey());
-
-
- }
-
- public void testCompatabilityReader() throws Exception {
- // read catalog
- String catalogFile = "/data/compatabilityTest.xmlcatalog";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("compatabilityCatalog", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
- List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
- assertEquals("platform:/resource/XMLExamples/Invoice2/Invoice.dtd", entry.getURI());
- assertEquals("InvoiceId", entry.getKey());
- }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
deleted file mode 100644
index 80f4535..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-
-
-public class CatalogResolverTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogResolverTest(String name) {
- super(name);
- }
-
- public final void testResolveResolver() throws Exception {
-
-
- // from plugin.xml file
- String pluginBase = resolvePluginLocation(TestPlugin.getDefault().getBundle().getSymbolicName()).toString();
-
- String resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
- String resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveSystem("http://personal/personal.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Personal/personal.dtd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveURI("http://apache.org/xml/xcatalog/example");
- resolvedURI = makeAbsolute(pluginBase, "data/example/example.xsd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveURI("http://www.w3.org/2001/XMLSchema");
- resolvedURI = resolvePath("", "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- resolvedURI = makeAbsolute(pluginBase, resolvedURI);
- assertEquals(resolvedURI, resolvedActual);
-
- // from catalog1.xml
- resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, resolvedActual);
-
- resolvedActual = defaultCatalog.resolveSystem("Invoice.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolveURI("http://www.test.com/Invoice.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
-
- // from catalog2.xml
- resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_001", null);
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_002", null);
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolveSystem("Catalogue.xsd");
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
deleted file mode 100644
index 16afc3e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
-
-
-public class CatalogTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogTest(String name) {
- super(name);
- }
-
- public void testCatalog() throws Exception
- {
- Catalog workingUserCatalog = new Catalog(null, "working", null);
- assertNotNull(userCatalog);
- workingUserCatalog.addEntriesFromCatalog(userCatalog);
-
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("testKey");
- catalogEntry.setURI("http://testuri");
- workingUserCatalog.addCatalogElement(catalogEntry);
-
- userCatalog.addEntriesFromCatalog(workingUserCatalog);
- String userCatalogLocation = userCatalog.getLocation();
-
- userCatalog.save();
- userCatalog.clear();
-
- userCatalog = getCatalog(XMLCorePlugin.USER_CATALOG_ID, userCatalogLocation);
-
- List entries = getCatalogEntries(userCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-
- assertEquals("http://testuri", entry.getURI());
- assertEquals("testKey", entry.getKey());
-
-
- }
-
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
deleted file mode 100644
index 785ee55..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class CatalogWriterTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogWriterTest(String name) {
- super(name);
- }
-
- public final void testWrite() throws Exception {
-
- // read catalog
- String catalogFile = "/data/catalog1.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
- catalogFile);
- assertNotNull(catalogUrl);
- URL resolvedURL = FileLocator.resolve(catalogUrl);
-
- Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
- .toString());
- assertNotNull(testCatalog);
- testCatalog.setBase(resolvedURL.toString());
- // CatalogReader.read(testCatalog, resolvedURL.getFile());
- assertNotNull(testCatalog);
-
- // write catalog
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- String resultCatalogFile = path.append("/catalog1.xml").toFile().toURI().toString();
- testCatalog.setLocation(resultCatalogFile);
-
-
-
- // write catalog
- testCatalog.save();
-
- // read catalog file from the saved location and test its content
- Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
- assertNotNull(catalog);
-
-
-
- // test saved catalog - catalog1.xml
- assertEquals(3, catalog.getCatalogEntries().length);
-
- // test public entries
- List entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry) entries.get(0);
-
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- assertEquals("yes", entry.getAttributeValue("chached"));
- assertEquals("value1", entry.getAttributeValue("property"));
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- assertEquals("no", entry.getAttributeValue("chached"));
- assertEquals("value2", entry.getAttributeValue("property"));
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
- }
-
- public final void testBug235445() throws Exception {
- // read catalog
- String catalogFile = "/data/deletemecatalog.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
- catalogFile);
- assertNotNull(catalogUrl);
- URL resolvedURL = FileLocator.resolve(catalogUrl);
-
- Catalog testCatalog = (Catalog) getCatalog("deletemecatalog", resolvedURL
- .toString());
- assertNotNull(testCatalog);
- testCatalog.setBase(resolvedURL.toString());
- // CatalogReader.read(testCatalog, resolvedURL.getFile());
- assertNotNull(testCatalog);
-
- // write catalog
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- final File catalogIOFile = path.append("/deletemecatalog.xml").toFile();
- String resultCatalogFile = catalogIOFile.toURI().toString();
- testCatalog.setLocation(resultCatalogFile);
-
- // write catalog
- testCatalog.save();
-
- IWorkspaceRunnable deleteOp = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- try {
- catalogIOFile.delete();
- } catch (Exception e) {
- assertTrue("exception thrown when trying to delete catalog", false);
- }
- }
- };
-
- ResourcesPlugin.getWorkspace().run(deleteOp, null);
- assertFalse("catalog file was not deleted", catalogIOFile.exists());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
deleted file mode 100644
index 72acda6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestPlugin extends Plugin {
- //The shared instance.
- private static TestPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = TestPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wst.xml.catalog.test.TestPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
-
- public static String resolvePluginLocation(String path) throws IOException {
- URL url = getDefault().getBundle().getEntry(path);
- url = FileLocator.resolve(url);
- return url.getFile();
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/test.xml b/tests/org.eclipse.wst.xml.catalog.tests/test.xml
deleted file mode 100644
index 4b384c1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xml.catalog.tests"/>
-
- <!-- End Configurable Properties -->
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
- <property name="bvtworkspace" value="${basedir}"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.catalog.tests.*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <!-- Start with clean data workspace -->
- <delete dir="${workspace-folder}" quiet="true"/>
-
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.xml.catalog.tests.internal.AllTests"/>
- </ant>
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <delete dir="${workspace-folder}" quiet="true"/>
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.xml.catalog.tests*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.classpath b/tests/org.eclipse.wst.xml.core.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.cvsignore b/tests/org.eclipse.wst.xml.core.tests/.cvsignore
deleted file mode 100644
index 45bf546..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodelxmltests.jar
-javaCompiler.ssemodelxmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.core.tests/.project b/tests/org.eclipse.wst.xml.core.tests/.project
deleted file mode 100644
index 89ffba5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.core.tests</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 7a3abf7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.0.204.qualifier
-Bundle-ClassPath: ssemodelxmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.document.test;x-internal:=true,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.core.tests.contentmodel,
- org.eclipse.wst.xml.core.tests.document,
- org.eclipse.wst.xml.core.tests.dom,
- org.eclipse.wst.xml.core.tests.format,
- org.eclipse.wst.xml.core.tests.format.testfiles.xml,
- org.eclipse.wst.xml.core.tests.model,
- org.eclipse.wst.xml.core.tests.text,
- org.eclipse.wst.xml.core.tests.text.testfiles.xml,
- org.eclipse.wst.xml.core.tests.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.text,
- org.eclipse.wst.sse.core,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.core.tests/about.html b/tests/org.eclipse.wst.xml.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.core.tests/build.properties b/tests/org.eclipse.wst.xml.core.tests/build.properties
deleted file mode 100644
index 9e5f70e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.ssemodelxmltests.jar = src/
-output.ssemodelxmltests.jar = bin/
-bin.includes = plugin.xml,\
- ssemodelxmltests.jar,\
- test.xml,\
- testfiles.zip,\
- projecttestfiles/,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = build.properties
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.core.tests/plugin.properties
deleted file mode 100644
index c0f1799..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = SSE Model XML Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.xml b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
deleted file mode 100644
index 03f1a8c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.core.runtime.contentTypes">
- <!-- associate .fragx files with the XML content type -->
- <file-association
- content-type="org.eclipse.core.runtime.xml"
- file-extensions="fragx" />
- </extension>
-
- <extension
- id="Test"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.eclipse.wst.xml.core.tests.contentmodel.CMVisitorTest" />
- </application>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip
deleted file mode 100644
index 8c28d7c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
deleted file mode 100644
index 683ad6c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
deleted file mode 100644
index 482de34..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Balazs Banfai: Bug 154737 getUserData/setUserData support for Node
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=154737
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.core.internal.document.test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.UserDataHandler;
-
-
-public class NodeImplTestCase extends TestCase {
- /**
- * Casts to implementation classes because the interface methods being
- * there isn't the interesting part, just whether our behavior with those
- * methods is correct.
- */
-
- NodeImpl element;
- AttrImpl attribute;
- NodeImpl destinationNode;
- Document document;
-
- Element elementToImport;
-
- private static final String KEY="key";
- private static final String VALUE="value";
- private static final String KEY2="key2";
- private static final String VALUE2="value2";
- private static final boolean DEBUG = false;
-
-
- /**
- * Sets up the test fixture.
- * (Called before every test case method.)
- */
- protected void setUp() {
-
- DOMModelImpl model = new DOMModelImpl();
- document = model.getDocument();
- element = (NodeImpl)document.createElement("testelement");
- attribute = (AttrImpl)document.createAttribute("attribute");
- }
-
- /*
- * Test for null;
- */
- public void testGetUserData0() {
- assertEquals(null, element.getUserData(KEY));
- assertEquals(null, element.getUserData(null));
- }
-
- /*
- * Test for one key/value
- */
- public void testGetUserData1() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(null, attribute.getUserData(KEY));
- }
-
- /*
- * Test for multiple nodes
- */
- public void testGetUserData2() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- attribute.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE2,attribute.getUserData(KEY2));
- }
-
- /*
- * Test for multiple keys
- */
- public void testGetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(VALUE2,element.getUserData(KEY2));
- }
-
- /*
- * Test for null key
- */
- public void testSetUserData1() {
- assertEquals(null, element.setUserData(null, VALUE, null));
- }
-
- /*
- * Test for null data with no previous value
- */
- public void testSetUserData2() {
- assertEquals(null, element.setUserData(KEY, null, null));
- }
-
- /*
- * Test for overwriting
- */
- public void testSetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY, VALUE2, null);
- assertEquals(VALUE2, element.getUserData(KEY));
- }
-
- /*
- * Test for deleting
- */
- public void testSetUserData4() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE, element.getUserData(KEY));
- element.setUserData(KEY, null, null);
- assertEquals(null, element.getUserData(KEY));
- }
-
- /*
- * Test for notifying the UserDataHandler=null
- */
- public void testNotifyUserDataHandler0() {
-
- attribute.setUserData(KEY, VALUE, null);
- destinationNode=(NodeImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when cloning an attribute
- */
- public void testNotifyUserDataHandler1() {
-
- attribute.setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
- assertEquals(UserDataHandler.NODE_CLONED, operation);
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, attribute);
-
- if(DEBUG)
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst.getLocalName());
-
- }
- });
- //event occurs before the destinationNode returns....
- destinationNode=(AttrImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when importing
- */
- public void testNotifyUserDataHandler2() {
- elementToImport = document.createElement("ElementToImport");
- ((NodeImpl)elementToImport).setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
-
- //see if NODE.IMPORTED notification occurs with the right
- //parameters
- if (operation==UserDataHandler.NODE_IMPORTED) {
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, elementToImport);
- assertEquals(dst, null);
- if(DEBUG)
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst);
- }
- }
- });
- document.importNode(elementToImport, true);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
deleted file mode 100644
index d360697..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.xml.core.tests"; //$NON-NLS-1$
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
deleted file mode 100644
index 2f030b0..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.document.test.NodeImplTestCase;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestAttributesOrder;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestCatalogRetrivalAndModelCreation;
-import org.eclipse.wst.xml.core.tests.document.GetDocumentRegionsTest;
-import org.eclipse.wst.xml.core.tests.document.TestStructuredDocument;
-import org.eclipse.wst.xml.core.tests.document.TestXMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.document.TransitionTests;
-import org.eclipse.wst.xml.core.tests.dom.NameValidatorTests;
-import org.eclipse.wst.xml.core.tests.format.TestPartitionFormatterXML;
-import org.eclipse.wst.xml.core.tests.model.TestModelManager;
-import org.eclipse.wst.xml.core.tests.model.TestModelsFromFiles;
-import org.eclipse.wst.xml.core.tests.model.TestStructuredModel;
-import org.eclipse.wst.xml.core.tests.model.TestXMLModelLoader;
-import org.eclipse.wst.xml.core.tests.text.TestStructuredPartitionerXML;
-
-
-
-public class SSEModelXMLTestSuite extends TestSuite {
- public static Test suite() {
- return new SSEModelXMLTestSuite();
- }
-
- public SSEModelXMLTestSuite() {
- super("XML Core Test Suite");
- addTest(new TestSuite(TestModelsFromFiles.class));
- addTest(new TestSuite(TestXMLModelLoader.class));
- addTest(new TestSuite(TestXMLDocumentLoader.class));
- addTest(new TestSuite(TestStructuredDocument.class));
-
- addTest(new TestSuite(TestModelManager.class));
- addTest(new TestSuite(TestStructuredModel.class));
- addTest(new TestSuite(TestStructuredPartitionerXML.class));
- addTest(new TestSuite(NameValidatorTests.class));
- addTest(new TestSuite(TransitionTests.class));
- addTest(new TestSuite(XMLCorePreferencesTest.class));
- addTest(new TestSuite(TestCatalogRetrivalAndModelCreation.class));
-
- addTest(new TestSuite(GetDocumentRegionsTest.class));
- addTest(new TestSuite(NodeImplTestCase.class));
-
- addTest(new TestSuite(TestPartitionFormatterXML.class));
-
- addTest(new TestSuite(TestAttributesOrder.class));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
deleted file mode 100644
index 32f1dfa..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSEModelXMLTestsPlugin extends Plugin {
- //The shared instance.
- private static SSEModelXMLTestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public SSEModelXMLTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SSEModelXMLTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.xml.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
deleted file mode 100644
index 323201a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class XMLCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, XMLCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, XMLCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- pluginSetPreferenceString(node, XMLCorePreferenceNames.INDENTATION_CHAR);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
- String originalValue = node.get(prefKey, "bogus");
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- node.put(prefKey, expectedValue);
- String foundValue = node.get(prefKey, "");
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalValue))
- node.remove(prefKey);
- else
- node.put(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForXML.ContentTypeID_XML);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForXML.ContentTypeID_XML);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- XMLDocumentLoader loader = new XMLDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
deleted file mode 100644
index 41bff4c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMPrinter extends CMVisitor
-{
- protected StringBuffer fStringBuffer = new StringBuffer();
- protected Vector visitedElements = new Vector();
-
- /****** formatting ******/
- protected String indent = ""; //$NON-NLS-1$
-
- protected void incrementIndent()
- {
- indent = indent + " "; //$NON-NLS-1$
- }
-
- protected void decrementIndent()
- {
- indent = indent.substring(0, indent.length()-2);
- }
-
-
- public void printCMNode(String filename, CMNode cmnode)
- {
- visitCMNode(cmnode);
- try
- {
- FileOutputStream fileStream = new FileOutputStream(filename);
- OutputStreamWriter writer = new OutputStreamWriter(fileStream);
- writer.write(fStringBuffer.toString());
- writer.flush();
- fileStream.close();
- }
- catch (IOException e) {
- Logger.logException("PMPrinter Debug: ", e);
- }
- }
-
- public void visitCMAnyElement(CMAnyElement anyElement)
- {
- fStringBuffer.append(indent + "<CMAnyElement"); //$NON-NLS-1$
- printAttributes(fStringBuffer, anyElement);
- fStringBuffer.append(">/n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, anyElement);
- decrementIndent();
- fStringBuffer.append(indent + "</CMAnyElement>/n"); //$NON-NLS-1$
- }
-
- public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
- {
- fStringBuffer.append(indent + "<CMAttributeDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ad);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ad);
- decrementIndent();
- visitCMNode(ad.getAttrType());
- fStringBuffer.append(indent + "</CMAttributeDeclaration>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDataType(CMDataType dataType)
- {
- fStringBuffer.append(indent + "<CMDataType"); //$NON-NLS-1$
- printAttributes(fStringBuffer, dataType);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- fStringBuffer.append(indent + "<ImpliedValue kind=\"" + dataType.getImpliedValueKind() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
- fStringBuffer.append(dataType.getImpliedValue() + "</ImpliedValue>\n"); //$NON-NLS-1$
- printEnumeration(fStringBuffer, dataType.getEnumeratedValues());
- decrementIndent();
- fStringBuffer.append(indent + "</CMDataType>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDocument(CMDocument document)
- {
- fStringBuffer.append(indent + "<CMDocument"); //$NON-NLS-1$
- printAttributes(fStringBuffer, document);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- // printEntities(sb, document.getEntities());
- printProperties(fStringBuffer, document);
-
- CMNamedNodeMap map = document.getElements();
- int size = map.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(map.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMDocument>\n"); //$NON-NLS-1$
- }
-
- public void visitCMGroup(CMGroup group)
- {
- fStringBuffer.append(indent + "<CMGroup"); //$NON-NLS-1$
- printAttributes(fStringBuffer, group);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- CMNodeList nodeList = group.getChildNodes();
- int size = nodeList.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeList.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMGroup>\n"); //$NON-NLS-1$
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration ed)
- {
- if (!visitedElements.contains(ed))
- {
- visitedElements.add(ed);
- fStringBuffer.append(indent + "<CMElementDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ed);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ed);
-
- CMNamedNodeMap nodeMap = ed.getAttributes();
- int size = nodeMap.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeMap.item(i));
- }
-
- visitCMNode(ed.getContent());
-
- CMDataType dataType = ed.getDataType();
- if (dataType != null)
- visitCMNode(dataType);
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMElementDeclaration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printEnumeration(StringBuffer sb, String[] values)
- {
- if ((values != null) && (values.length > 0))
- {
- sb.append(indent + "<Enumeration>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<values.length; i++)
- {
- sb.append(indent + "<Value>" + values[i] + "</Values>\n"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- decrementIndent();
- sb.append(indent + "</Enumeration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printAttributes(StringBuffer sb, CMNode cmnode)
- {
- if (cmnode != null)
- {
- sb.append(" nodeName=\"" + cmnode.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" nodeType=\"" + cmnode.getNodeType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode instanceof CMContent)
- {
- sb.append(" minOccur=\"" + ((CMContent)cmnode).getMinOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" maxOccur=\"" + ((CMContent)cmnode).getMaxOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAnyElement)
- {
- sb.append(" namespaceURI=\"" + ((CMAnyElement)cmnode).getNamespaceURI() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAttributeDeclaration)
- {
- sb.append(" uasage=\"" + ((CMAttributeDeclaration)cmnode).getUsage() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" defaultValue=\"" + ((CMAttributeDeclaration)cmnode).getDefaultValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMDataType)
- {
- sb.append(" instanceValue=\"" + ((CMDataType)cmnode).generateInstanceValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMEntityDeclaration)
- {
- String value = ((CMEntityDeclaration)cmnode).getValue();
- if (value.indexOf("\"") == -1) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- else sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMGroup)
- {
- sb.append(" operator=\"" + ((CMGroup)cmnode).getOperator() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMElementDeclaration)
- {
- sb.append(" contentType=\"" + ((CMElementDeclaration)cmnode).getContentType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
-
-
- public void printEntities(StringBuffer sb, CMNamedNodeMap entities)
- {
- if ((entities != null) && (entities.getLength()>0))
- {
- sb.append(indent + "<Entities>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (Iterator i = entities.iterator(); i.hasNext();)
- {
- CMEntityDeclaration entity = (CMEntityDeclaration)i.next();
- sb.append(indent + "<Entity"); //$NON-NLS-1$
- printAttributes(sb, entity);
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Entities>\n"); //$NON-NLS-1$
- }
- }
-
- public void printProperties(StringBuffer sb, CMNode cmnode)
- {
- List properties = getProperties(cmnode);
- sb.append(indent + "<Properties>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<properties.size(); i++)
- {
- String property = (String)properties.get(i);
- sb.append(indent + "<Property name=\"" + property + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode.supports(property))
- {
- sb.append(" supports=\"true\""); //$NON-NLS-1$
- }
- else
- {
- sb.append(" supports=\"false\""); //$NON-NLS-1$
- }
- Object value = cmnode.getProperty(property);
- if (value instanceof String) sb.append(" value=\"" + (String)value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value instanceof Boolean) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value != null) sb.append(" value=\"" + value.getClass() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else sb.append(" value=\"null\""); //$NON-NLS-1$
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Properties>\n"); //$NON-NLS-1$
- }
-
- public List getProperties(CMNode cmnode)
- {
- List properties = new Vector();
-
- if (cmnode != null)
- {
- properties.add("CMDocument"); //$NON-NLS-1$
- properties.add("documentation"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/isNameSpaceAware"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nsPrefixQualification"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nillable"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/mofNotifier"); //$NON-NLS-1$
- properties.add("spec"); //$NON-NLS-1$
-
- if (cmnode instanceof CMElementDeclaration)
- {
- properties.add("http://org.eclipse.wst/cm/properties/definitionInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/definition"); //$NON-NLS-1$
- properties.add("XSITypes"); //$NON-NLS-1$
- properties.add("DerivedElementDeclaration"); //$NON-NLS-1$
- // properties.add("SubstitutionGroup"); Currrently broken for nexted xsd files
- properties.add("Abstract"); //$NON-NLS-1$
- }
- if (cmnode instanceof CMDocument)
- {
- properties.add("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/importedNamespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/namespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/elementFormDefault"); //$NON-NLS-1$
- properties.add("annotationMap"); //$NON-NLS-1$
- }
- }
- return properties;
- }
-
-}
-
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
deleted file mode 100644
index 98e669d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMUtility
-{
- /**
- * return true if the child or any of its ancestor group nodes are repeatable
- */
- public static boolean isNodeOrAncestorGroupRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- CanRepeatVisitor visitor = new CanRepeatVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- /**
- * return true if the child is repeatable
- */
- public static boolean isNodeRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- IsRepeatableVisitor visitor = new IsRepeatableVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- public static boolean isRepeatable(CMNode child)
- {
- boolean result = false;
- if (child instanceof CMContent)
- {
- CMContent content = (CMContent)child;
- result = content.getMaxOccur() > 1 || content.getMaxOccur() == -1;
- }
- return result;
- }
-
-
- protected static class CanRepeatVisitor extends CMVisitor
- {
- public boolean result;
- protected boolean isWithinRepeatableGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public CanRepeatVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- boolean oldIsWithinRepeatableGroup = isWithinRepeatableGroup;
-
- isWithinRepeatableGroup = isRepeatable(group);
-
- super.visitCMGroup(group);
-
- isWithinRepeatableGroup = oldIsWithinRepeatableGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- result = isWithinRepeatableGroup;
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-
-
- protected static class IsRepeatableVisitor extends CMVisitor
- {
- public boolean result = false;
- protected CMGroup currentGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public IsRepeatableVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- CMGroup previousGroup = currentGroup;
- currentGroup = group;
- super.visitCMGroup(group);
- currentGroup = previousGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- if (currentGroup != null)
- {
- result = ((currentGroup.getOperator() == CMGroup.CHOICE) &&
- (isRepeatable(currentGroup)));
- }
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
deleted file mode 100644
index f52cc18..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementPathRecordingResult;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.StringElementContentComparator;
-
-public class CMValidatorTest
-{
- public static void main(String arg[])
- {
- if (arg.length > 1)
- {
- try
- {
- //CMDocumentFactoryRegistry.getInstance().registerCMDocumentBuilderWithClassName("org.eclipse.wst.xml.core.internal.contentmodel.mofimpl.CMDocumentBuilderImpl");
-
- String grammarFileName = arg[0];
- String elementName = arg[1];
-
- CMDocument cmDocument = ContentModelManager.getInstance().createCMDocument(grammarFileName, null);
-
- CMNamedNodeMap elementMap = cmDocument.getElements();
- CMElementDeclaration element = (CMElementDeclaration)elementMap.getNamedItem(elementName);
- if (element != null)
- { /*
- println("found element [" + elementName + "] contentType = " + element.getContentType());
- GraphNode graphNode = createGraph(element);
- printGraph(graphNode);
- */
- println("-------------- begin validate ---------------"); //$NON-NLS-1$
-
- StringElementContentComparator comparator = new StringElementContentComparator();
- CMValidator validator = new CMValidator();
- ElementPathRecordingResult result = new ElementPathRecordingResult();
- validator.getOriginArray(element, CMValidator.createStringList(arg, 2), comparator, result);
- if (result.isValid)
- {
- CMNode[] nodeMapping = result.getOriginArray();
- println("Validation Success!"); //$NON-NLS-1$
- print(" "); //$NON-NLS-1$
- for (int i = 0; i < nodeMapping.length; i++)
- {
- String name = nodeMapping[i] != null ? nodeMapping[i].getNodeName() : "null"; //$NON-NLS-1$
- print("[" + name + "]"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- println(""); //$NON-NLS-1$
- }
- else
- {
- println("Validation Failed! "); //$NON-NLS-1$
- if (result.errorMessage != null)
- {
- println(" " + result.errorMessage); //$NON-NLS-1$
- }
- }
- println("-------------- end validate ---------------"); //$NON-NLS-1$
- }
- else
- {
- println("element [" + elementName + "] can not be found"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- catch (Exception e)
- {
- println("CMValidator error"); //$NON-NLS-1$
- e.printStackTrace();
- }
- }
- else
- {
- println("2 args required... only " + arg.length + " provided"); //$NON-NLS-1$ //$NON-NLS-2$
- println("usage java org.eclipse.wst.newxml.util.XMLUtil grammarFileName rootElementName pattern"); //$NON-NLS-1$
- }
- }
-
- public static void print(String string)
- {
- }
-
- public static void println(String string)
- {
- }
-
- public static void printlnIndented(int indent, String string)
- {
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
deleted file mode 100644
index 579b990..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class CMVisitorTest implements IPlatformRunnable {
- public Object run(Object a) {
- String args[] = (String[]) a;
- if (args.length > 0) {
- test(args[0]);
- }
- else {
- System.out.println("xml file name argument required"); //$NON-NLS-1$
- }
- return null;
- }
-
- protected void test(String fileName) {
-
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- XMLAssociationProvider provider = new XMLAssociationProvider(new CMDocumentCache()) {
- };
-
- ModelQuery mq = new ModelQueryImpl(provider);
-
- Thread.currentThread().setContextClassLoader(CMVisitorTest.class.getClassLoader());
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document document = builder.parse(fileName);
-
- /*
- * ClassLoader prevClassLoader =
- * Thread.currentThread().getContextClassLoader();
- * Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- * Class theClass =
- * Class.forName("org.apache.xerces.parsers.DOMParser"); DOMParser
- * parser = (DOMParser)theClass.newInstance();
- * Thread.currentThread().setContextClassLoader(prevClassLoader);
- * parser.parse(new InputSource(fileName)); Document document =
- * parser.getDocument();
- */
- visitNode(document, mq, 0);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- Thread.currentThread().setContextClassLoader(originalClassLoader);
- }
- }
-
- protected void visitNode(Node node, ModelQuery mq, int indent) {
- CMNode cmnode = mq.getCMNode(node);
- printlnIndented(indent, "node :" + node.getNodeName() + " cmnode : " + (cmnode != null ? cmnode.getNodeName() : "null")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- NamedNodeMap map = node.getAttributes();
- if (map != null) {
- indent += 2;
- int mapLength = map.getLength();
- for (int i = 0; i < mapLength; i++) {
- visitNode(map.item(i), mq, indent);
- }
- indent -= 2;
- }
- indent += 4;
- NodeList list = node.getChildNodes();
- int listLength = list.getLength();
- for (int i = 0; i < listLength; i++) {
- visitNode(list.item(i), mq, indent);
- }
- indent -= 4;
- }
-
- public static void printlnIndented(int indent, String string) {
- for (int i = 0; i < indent; i++) {
- System.out.print(" "); //$NON-NLS-1$
- }
- System.out.println(string);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
deleted file mode 100644
index 21698de..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Carver - STAR - Added content Assist check in testIgnoresAttributesOrder
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- * Tests to ensure that the attributes order is not important when trying to
- * determine the content model.
- *
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=198807
- */
-public class TestAttributesOrder extends TestCase
-{
- private boolean isSetup = false;
-
- /**
- * The target project name.
- */
- private final String fProjectName = "AttributesOrder"; //$NON-NLS-N$
-
- /**
- * The name of the zip file containing the project to import.
- */
- private final String fZipFileName = "attributesordertestfiles.zip"; //$NON-NLS-1$
-
- public TestAttributesOrder()
- {
- super("TestAttributesOrder");
- }
-
- /**
- * Test used to make sure that the attributes order is not important when
- * determining the content model for a given XML document.
- */
- public void testIgnoresAttributesOrder() throws IOException, CoreException
- {
- // Tests the scenario that used to succeed, where the namespace prefix is
- // declared before the schemaLocation.
-
- IFile file = getFile("PreviouslySucceedingTest.xml"); //$NON-NLS-1$
- ensureDocumentHasGrammar(file);
-
- // Tests the failing scenario, where the schemaLocation comes first.
-
- file = getFile("PreviouslyFailingTest.xml"); //$NON-NLS-1$
- ensureDocumentHasGrammar(file);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- if (!this.isSetup)
- {
- doSetup();
- this.isSetup = true;
- }
- }
-
- /**
- * Sets up the required project in the workspace.
- *
- * @throws Exception
- */
- private void doSetup() throws Exception
- {
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- URL platformLocationURL = platformLocation.getURL();
- String file = platformLocationURL.getFile();
- unzipUtil.unzipAndImport(zipFile, file);
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * Reusable test to make sure the XML model for the given file has a grammar.
- *
- * @param file
- * the file containing the XML document.
- */
- private void ensureDocumentHasGrammar(IFile file) throws IOException, CoreException
- {
- IStructuredModel model = null;
- try
- {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForRead(file);
- assertNotNull("failure loading model", model); //$NON-NLS-1$
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- assertNotNull("failure getting document", document); //$NON-NLS-1$
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
- assertNotNull("ModelQuery is missing", modelQuery); //$NON-NLS-1$
- IDOMElement documentElement = (IDOMElement) document.getDocumentElement();
- assertNotNull("missing document element", documentElement); //$NON-NLS-1$
- CMElementDeclaration cmElementDeclaration = modelQuery.getCMElementDeclaration(documentElement);
- assertNotNull("No element declaration for" + documentElement.getNodeName() + " ("+documentElement.getNamespaceURI()+")", cmElementDeclaration); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- assertNotNull("No content assist available for" + documentElement.getNodeName() + " (" + documentElement.getNamespaceURI() + ")",modelQuery.getAvailableContent(documentElement, cmElementDeclaration, ModelQuery.INCLUDE_CHILD_NODES));
- }
- finally
- {
- if (model != null)
- {
- model.releaseFromRead();
- }
- }
- }
-
- /**
- * Utility to retrieve the IFile for the given file name. The file is expected
- * to be in the workspace in the project named by {@link #fProjectName}.
- *
- * @param fileName
- * the name of the file to retrieve.
- * @return an IFile.
- */
- private IFile getFile(String fileName)
- {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- Path path = new Path(fProjectName + "/" + fileName); //$NON-NLS-1$
- return root.getFile(path);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
deleted file mode 100644
index 8099d71..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-
-public class TestCatalogRetrivalAndModelCreation extends TestCase {
-
- /**
- * Test that a known error case returns null.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testKnownNotExist() throws MalformedURLException, IOException {
- String JUNK_STRING = "doesNotExistTest";
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(JUNK_STRING, null);
- assertNull("expected no match for " + JUNK_STRING, resolved);
- }
-
- public void removedtestWAPFORUM() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.1//EN");
- }
-
- public void testXHTML10() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Strict//EN");
- }
-
- public void testXHTML10T() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Transitional//EN");
- }
-
- public void testXHTML10F() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Frameset//EN");
- }
-
- public void testXHTML10B() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML Basic 1.0//EN");
- }
-
- public void testXHTML11() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.1//EN");
- }
-
- /**
- * We expect the XMLCatalogResolver and XMLCatalogIdResolver
- * to resolve to the same URI given a public id in our catalog.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testXHTML11_xmlresolver() throws MalformedURLException, IOException {
- String EXPECTED_PUBLICID = "-//W3C//DTD XHTML 1.1//EN";
-
- // bug 117424, here ewe make up a base location to satisfy the resolver API
- // that expects a non-null base location
- String baseLocation = "http://www.example.org/testXHTML11.xml";
- XMLCatalogIdResolver resolver = new XMLCatalogIdResolver(baseLocation, null);
- String resolvedXML_Id = resolver.resolve(baseLocation, EXPECTED_PUBLICID, null);
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolvedXL_Cat = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertEquals(resolvedXL_Cat, resolvedXML_Id);
- }
-
- public void testCMXHTML11() throws MalformedURLException, IOException {
- doCMTest("-//W3C//DTD XHTML 1.1//EN");
- }
- public void removedtestXHTML10M() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD XHTML Mobile 1.0//EN");
- }
-
- public void removedtestWAP13() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.3//EN");
- }
-
- public void test2001Schema() throws MalformedURLException, IOException {
- doURITest("http://www.w3.org/2001/XMLSchema");
- }
-
- /**
- * Tests if dtd NOT in our catalog can have a content model
- * created.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testExternalDTD() throws MalformedURLException, IOException {
- doCM_directURITest("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd");
- }
-// Bug 123547 - temporarily comment these tests out.
-// public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
-// doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
-// }
-//
-// public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
-// doURI_CMTest("http://www.w3.org/2001/XMLSchema");
-// }
-
- public void testInvoiceRemote() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd", 18);
- }
-
- public void testInvoiceRemoteIndirect() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd", 18);
- }
-
- private void doTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertNotNull("expected to find " + EXPECTED_PUBLICID, resolved);
- }
-
- private void doCMTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_PUBLICID, contentModel);
- }
-
- private void doCM_directURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- }
-
- private void doCM_directURITest_checkElementCount(String EXPECTED_URI, int count) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- int actualCount = contentModel.getElements().getLength();
- assertEquals("count of element declarations found for content model create from " + EXPECTED_URI, contentModel.getElements().getLength(), actualCount);
- }
-
- private void doURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- }
- void doURI_CMTest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index 8a2089e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
- private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file);
- IPath fullPath = file.getFullPath();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(fullPath, LocationKind.IFILE, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(fullPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document: " + (document != null ? document.getClass() : null), expectedDocumentClass.isInstance(document));
- assertTrue("document does not implement IDocumentExtension3", document instanceof IDocumentExtension3);
- IDocumentPartitioner actualPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("wrong partitioner in document: " + actualPartitioner, expectedPartioner.isInstance(actualPartitioner));
- bufferManager.disconnect(fullPath, LocationKind.IFILE, null);
-
-// doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-
- }
-
- /**
- * @param file
- * @param expectedDocumentClass
- * @param expectedPartioner
- * @throws CoreException
- * @throws IOException
- */
-// private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-// DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-// IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-// Assert.assertNotNull(document);
-// }
-
- private void doTestCreateCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
- IPath locationPath = new Path(filePath);
- IFile nonExistingFile = fTestProject.getFile(locationPath);
- locationPath = nonExistingFile.getFullPath();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- // can not "connect" to non-existant location
- //bufferManager.connect(locationPath, null);
- IDocument document = bufferManager.createEmptyDocument(locationPath);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, null);
-
- }
-
-
-
- public void testFile103() throws CoreException, IOException {
- doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile124() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws CoreException {
- doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- /*
- public void testFile1() throws CoreException, IOException {
- doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
- }
-
-
-
- public void testFile70() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-
- public void testFile71() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-*/
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
deleted file mode 100644
index f0c1d44..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class GetDocumentRegionsTest extends TestCase {
-
- private boolean fAlreadySetup = false;
- private IStructuredDocument fDoc = null;
- private String fText = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- if(!fAlreadySetup) {
- IStructuredModel sModel = createModel(ContentTypeIdForXML.ContentTypeID_XML);
- fDoc = sModel.getStructuredDocument();
- fText = "<html><head></head><body> text </body></html>";
- fDoc.set(fText);
- fAlreadySetup = true;
- }
- }
-
- public void testGetAllRegions() {
-
- // all regions
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions();
- checkRegions(regions, 7, "<html>", "</html>");
- }
-
- public void testExcludeEnds() {
-
- // leave off the end regions
- // <html>[<head><body> text </body>]</html>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(6,fText.length() - (6+7));
- checkRegions(regions, 5, "<head>", "</body>");
- }
-
- public void testIncludeEnds() {
-
- // include end regions
- // <ht[ml><head></head><body> text </body></ht]ml>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(3,fText.length()- (3+3));
- assertEquals(7, regions.length);
- }
-
- public void testFirstTwo() {
- // first 2 regions
- // <h[tml><h]ead></head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(2,6);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testRightSeam() {
- // right seam
- // [<html><head>]</head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,12);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testLeftSeam() {
- // left seam
- // </body>[</html>]
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length()-7, 7);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetLast() {
- // last region only
- // </body></html>|
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length(), 0);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetFirst() {
- // first region only
- // |<html><head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,0);
- checkRegions(regions, 1, "<html>", "<html>");
- }
-
- private void checkRegions(IStructuredDocumentRegion[] regions, int expectedLength, String firstText, String lastText) {
-
- //for (int i = 0; i < regions.length; i++)
- // System.out.println(regions[i].getText());
-
- assertEquals(expectedLength, regions.length);
-
- String text = regions[0].getText();
- assertEquals(text, firstText);
-
- text = regions[regions.length-1].getText();
- assertEquals(text, lastText);
- }
-
- private IStructuredModel createModel(String contentTypeID) {
- // create an empty model with its default factories
- IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
- return model;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
deleted file mode 100644
index e8476df..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ /dev/null
@@ -1,502 +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.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.jface.text.Position;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredDocument extends TestCase {
-
- class TestListener implements IStructuredDocumentListener {
-
- boolean newModelCalled = false;
- boolean noChangeCalled = false;
- boolean nodesReplacedCalled = false;
- boolean regionChangedCalled = false;
- boolean regionsReplacedCalled = false;
-
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- newModelCalled = true;
- }
-
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- noChangeCalled = true;
- }
-
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- nodesReplacedCalled = true;
- }
-
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- regionChangedCalled = true;
- }
-
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- regionsReplacedCalled = true;
- }
- }
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredDocument() {
- super("TestStructuredDocument");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-
-
-
- public void testDocumentChangingListener() throws BadLocationException, IOException, CoreException {
- // TODO: may need to fake events to really tests this
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
-
- TestListener listener = new TestListener();
-
- sDoc.addDocumentChangingListener(listener);
- String text = sDoc.get();
- sDoc.replace(0, text.length(), text);
-
- sDoc.removeDocumentChangingListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReadOnly() throws IOException, CoreException {
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.get();
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.makeReadOnly(0, 10);
- assertTrue(sDoc.containsReadOnly(9, 1));
- assertTrue(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetRegionAtCharacterOffset() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegion r = sDoc.getRegionAtCharacterOffset(0);
- assertNotNull("couldn't get region at offset: 0", r);
-
- r = sDoc.getRegionAtCharacterOffset(sDoc.getLength());
- assertNotNull("couldn't get region at offset: " + sDoc.getLength(), r);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
-
- }
- }
-
- public void testGetRegionList() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegionList regions = sDoc.getRegionList();
- assertNotNull("couldn't get region list", regions);
- assertEquals(17, regions.getLength());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.getText();
- String expectedText = "<?xml version=\"1.0\"?>\r\n<list>\r\n\t<item1 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tone\r\n\t</item1>\r\n\t<item2 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\" >\r\n\t\ttwo\r\n\t</item2>\r\n\t<item3 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tthree\r\n\t</item3>\r\n</list>";
- assertEquals(expectedText, text);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocument newDoc = sDoc.newInstance();
- assertNotSame("document instances should be different", sDoc, newDoc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplace() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.replace(0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplaceWithModificationStamp() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- if (sDoc instanceof IDocumentExtension4) {
- IDocumentExtension4 ext4 = (IDocumentExtension4)sDoc;
- long modificationStamp = ext4.getModificationStamp() + 1;
-
- ext4.replace(0, sDoc.getLength(), "replaced", modificationStamp);
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- assertTrue("replace text modification stamp failed", modificationStamp ==((IDocumentExtension4)sDoc).getModificationStamp());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplaceText() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testOverrideReadOnlyReplaceText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.makeReadOnly(0, 1);
-
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
- assertNotSame("text should not have been replacable (read only)", "replaced", sDoc.getText());
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp (read only) failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
-
- modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp() + 1;
- }
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced", true);
- assertEquals("text should have been forced replaced", "replaced", sDoc.getText());
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSet() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.set("set text");
-
- assertEquals("set text failed", "set text", sDoc.getText());
- if (modificationStamp > -1)
- assertTrue("set text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetWithModificationStamp() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- if (sDoc instanceof IDocumentExtension4) {
- IDocumentExtension4 ext4 = (IDocumentExtension4)sDoc;
- long modificationStamp = ext4.getModificationStamp() + 1;
- ext4.set("set text", modificationStamp);
-
- assertEquals("set text failed", "set text", sDoc.getText());
- assertTrue("set text modification stamp failed", modificationStamp ==((IDocumentExtension4)sDoc).getModificationStamp());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.setText(this, "set text");
-
- assertEquals("set text failed", "set text", sDoc.getText());
- if (modificationStamp > -1)
- assertTrue("set text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = null;
- sDoc = model.getStructuredDocument();
- EncodingMemento memento = sDoc.getEncodingMemento();
- assertNotNull("couldn't get encoding memento", memento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /*
- * Verify that the first delimiter is \r\n regardless of
- * preferences or platform
- */
- public void testGetDetectedLineDelimiter() throws IOException, CoreException, BadLocationException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String delim = sDoc.getLineDelimiter();
- assertEquals("wrong preferred line delmiter", "\r\n", delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- EncodingMemento memento = new EncodingMemento();
- sDoc.setEncodingMemento(memento);
- EncodingMemento gottenMemento = sDoc.getEncodingMemento();
- assertEquals("mementos don't match", memento, gottenMemento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- void setDetectedLineDelimiter() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.setPreferredLineDelimiter("\n");
- String delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\n", delim);
-
- sDoc.setPreferredLineDelimiter("\r\n");
- delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\r\n", delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testStringMatches() {
- // TODO: will need a test when this API is created
- // IStructuredModel model = getTestModel();
- // IStructuredDocument sDoc = model.getStructuredDocument();
- }
-
- public void testCreatePosition() throws BadPositionCategoryException, BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- Position p = new Position(0, 10);
- String[] categories = sDoc.getPositionCategories();
- for (int i = 0; i < categories.length; i++) {
- sDoc.addPosition(categories[i], p);
- }
- int found = 0;
- for (int i = 0; i < categories.length; i++) {
- Position[] positions = sDoc.getPositions(categories[i]);
- for (int j = 0; j < positions.length; j++) {
- if (positions[j] == p) {
- found++;
- }
- }
- }
- assertEquals("wrong number of positions", categories.length, found);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
deleted file mode 100644
index e57a089..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestXMLDocumentLoader extends TestCase {
-
- private boolean isSetup = false;
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
-
- public void testCreateNewEmptyStructuredDocument() {
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- document = xmlDocumentLoader.createNewStructuredDocument();
- assertNotNull("failed to create Empty document", document);
- }
-
- public void testCreateNewStructuredDocumentFromFile() {
- // from a file
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(file);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from IFile", document);
- }
-
- public void testCreateNewStructuredDocumentFromInputStream() {
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream", document);
- }
-
- public void testCreateNewDocumentFromReaderWithEncodingRule() {
-
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation().getURL().getPath().toString() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream with EncodingRule", document);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
deleted file mode 100644
index 555e1b7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-/**
- * @author nsd
- *
- */
-public class TransitionTests extends UnzippedProjectTester {
-
- /**
- *
- */
- public TransitionTests() {
- super();
- }
-
-
- public void testSoftRevert() throws CoreException, IOException {
- String filePath = "testfiles/xml/EmptyFile.xml"; //$NON-NLS-1$
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file); //$NON-NLS-1$
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", document instanceof BasicStructuredDocument); //$NON-NLS-1$
- assertTrue("wrong partitioner in document.", ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING) instanceof StructuredTextPartitionerForXML); //$NON-NLS-1$
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document);
- try {
- try {
- document.replace(0, 0, "__"); //$NON-NLS-1$
- document.replace(2, 0, "<a"); //$NON-NLS-1$
- document.replace(4, 0, ">"); //$NON-NLS-1$
- document.replace(5, 0, " "); //$NON-NLS-1$
- }
- catch (BadLocationException e) {
- assertNull(e);
- }
- document.set(""); //$NON-NLS-1$
- }
- finally {
- model.releaseFromEdit();
-
- bufferManager.disconnect(locationPath, null);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index d47ca29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-
-/*
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class UnzippedProjectTester extends TestCase {
-
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = SSEModelXMLTestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- private static final boolean DEBUG = false;
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
- IWorkspace workspace = getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
deleted file mode 100644
index 0e28c67..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
-public class NameValidatorTests extends TestCase {
-
- private int nTrials = 100;
-
- public NameValidatorTests(String name) {
- super(name);
- }
-
- private void doTest(int testNumber, String testString, Boolean expectedValidity) {
-// System.out.println();
- boolean isValid = NameValidator.isValid(testString);
- assertEquals("testNumber: " + testNumber, expectedValidity.booleanValue(), isValid);
-// System.out.println();
- }
-
- public void testIsValid() {
- Object[][] testees = new Object[][]{
- {"initial",Boolean.TRUE}, //0
- {"foo",Boolean.TRUE}, //1
- {"4",Boolean.FALSE}, //2
- {"9999", Boolean.FALSE}, //3
- {"f9999", Boolean.TRUE}, //4
- {"", Boolean.FALSE}, //5
- {"got space", Boolean.FALSE}, //6
- {" spacebefore", Boolean.FALSE}, //7
- {"spaceafter ", Boolean.FALSE}, //8
- {"ns:namespace", Boolean.TRUE}, //9
- {":funnyns", Boolean.TRUE}, //10
- /* ISSUE: is "endns:" really valid name */
- {"endns:", Boolean.TRUE}, //11
- {"us_underscore", Boolean.TRUE}, //12
- {"_underscore", Boolean.TRUE}, //13
- {"underscore_", Boolean.TRUE}, //14
- {"averylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersize", Boolean.TRUE}, //15
- {"<bracket", Boolean.FALSE}, //16
- {"bracket<", Boolean.FALSE}, //17
- {"bracket", Boolean.TRUE}, //18
- {"per.iod", Boolean.TRUE}, //19
- };
- for (int i = 0; i < testees.length; i++) {
- for (int j = 0; j < nTrials; j++) {
- doTest(i, (String)testees[i][0], (Boolean) testees[i][1]);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
deleted file mode 100644
index 1dd1a18..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Eclipse Foundation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen Møller - jesper@selskabet.org
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.tests.util.StringCompareUtil;
-
-/**
- * @deprecated Use TestPartitionFormatterXML instead
- *
- */
-public class TestFormatProcessorXML extends TestCase {
-
- private static final boolean SPLIT_MULTI_ATTRS = false;
-
- private static final String INDENT = "\t";
-
- private static final boolean CLEAR_ALL_BLANK_LINES = false;
-
- private static final int MAX_LINE_WIDTH = 72;
-
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
-
- public TestFormatProcessorXML(String name) {
- super(name);
- }
-
- private FormatProcessorXML formatProcessor;
-
- protected void setUp() throws Exception {
- formatProcessor = new FormatProcessorXML();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- if (resetPreferences)
- resetPreferencesToDefault();
-
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = false;
- formatProcessor.formatModel(beforeModel);
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = true;
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- private void resetPreferencesToDefault() {
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- formatPreferences.setLineWidth(MAX_LINE_WIDTH);
- formatPreferences.setClearAllBlankLines(CLEAR_ALL_BLANK_LINES);
- formatPreferences.setIndent(INDENT);
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(SPLIT_MULTI_ATTRS);
- }
-
- public void testSimpleXml() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/simple-standalone.xml", "testfiles/xml/simple-standalone-fmt.xml");
- }
-
- public void testPreserveFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-standalone.xml", "testfiles/xml/xml-space-preserve-standalone-fmt.xml");
- }
-
- public void testPreserveFormatDTD() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-dtd.xml", "testfiles/xml/xml-space-preserve-dtd-fmt.xml");
- }
-
- public void testOneLineFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG115716
- formatAndAssertEquals("testfiles/xml/oneline.xml", "testfiles/xml/oneline-fmt.xml");
- }
-
- public void testOneLineTextNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG166441
- formatAndAssertEquals("testfiles/xml/onelineTextNode.xml", "testfiles/xml/onelineTextNode-fmt.xml");
- }
-
- public void testEmptyContentNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG174243
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatAndAssertEquals("testfiles/xml/usetagswithemptycontent.xml", "testfiles/xml/usetagswithemptycontent-fmt.xml", false);
- }
-
- public void testXSLFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG108074
- formatAndAssertEquals("testfiles/xml/xslattributetext.xsl", "testfiles/xml/xslattributetext-fmt.xsl");
- }
-
- public void testEntityFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG102076
- formatAndAssertEquals("testfiles/xml/entities.xml", "testfiles/xml/entities-fmt.xml");
- }
-
- public void testPreservePCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG84688
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(true);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-yes-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(false);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-no-fmt.xml", false);
- }
-
- public void testPreserveCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG161330
- formatAndAssertEquals("testfiles/xml/usecdata.xml", "testfiles/xml/usecdata-fmt.xml");
- formatAndAssertEquals("testfiles/xml/usecdata2.xml", "testfiles/xml/usecdata2-fmt.xml");
- }
-
- public void testSplitAttributesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-noalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-noalign-fmt.xml", false);
-
- }
-
- public void testAlignEndBracketFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml", false);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
deleted file mode 100644
index 2dd5b26..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.formatter.DefaultXMLPartitionFormatter;
-import org.eclipse.wst.xml.core.internal.formatter.XMLFormattingPreferences;
-import org.eclipse.wst.xml.core.tests.util.StringCompareUtil;
-
-public class TestPartitionFormatterXML extends TestCase {
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
- private DefaultXMLPartitionFormatter partitionFormatter;
-
- protected void setUp() throws Exception {
- partitionFormatter = new DefaultXMLPartitionFormatter();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, null);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, XMLFormattingPreferences prefs) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- IStructuredDocument document = beforeModel.getStructuredDocument();
-
- String normalizedContents = document.get();
- normalizedContents = StringUtils.replace(normalizedContents, "\r\n", "\n");
- normalizedContents = StringUtils.replace(normalizedContents, "\r", "\n");
- document.set(normalizedContents);
-
- if (prefs == null)
- prefs = new XMLFormattingPreferences();
- TextEdit edit = partitionFormatter.format(beforeModel, 0, document.getLength(), prefs);
- try {
- edit.apply(document);
- }
- catch (MalformedTreeException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (BadLocationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
-
- /* Make some adjustments to ignore cross platform line delimiter issues */
- expectedContents = StringUtils.replace(expectedContents, "\r\n", "\n");
- expectedContents = StringUtils.replace(expectedContents, "\r", "\n");
- actualContents = StringUtils.replace(actualContents, "\r\n", "\n");
- actualContents = StringUtils.replace(actualContents, "\r", "\n");
-
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testSimpleXml() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/simple-standalone.xml", "testfiles/xml/simple-standalone-newfmt.xml", prefs);
- }
-
- public void testWhitespaceFormatXSD() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 194698
- formatAndAssertEquals("testfiles/xml/xml-whitespace-xsd.xml", "testfiles/xml/xml-whitespace-xsd-actual.xml");
- }
-
- public void testPreserveFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-standalone.xml", "testfiles/xml/xml-space-preserve-standalone-newfmt.xml", prefs);
- }
-
- public void testPreserveFormatDTD() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-dtd.xml", "testfiles/xml/xml-space-preserve-dtd-newfmt.xml", prefs);
- }
-
- public void testOneLineFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG115716
- formatAndAssertEquals("testfiles/xml/oneline.xml", "testfiles/xml/oneline-fmt.xml");
- }
-
- public void testOneLineTextNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG166441
- formatAndAssertEquals("testfiles/xml/onelineTextNode.xml", "testfiles/xml/onelineTextNode-newfmt.xml");
- }
-
- public void testEmptyContentNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG174243
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setIndentMultipleAttributes(true);
- formatAndAssertEquals("testfiles/xml/usetagswithemptycontent.xml", "testfiles/xml/usetagswithemptycontent-fmt.xml", prefs);
- }
-
- public void testXSLFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG108074
- formatAndAssertEquals("testfiles/xml/xslattributetext.xsl", "testfiles/xml/xslattributetext-fmt.xsl");
- }
-
- public void testEntityFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG102076
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/entities.xml", "testfiles/xml/entities-newfmt.xml", prefs);
- }
-
- public void testPreservePCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG84688
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setPCDataWhitespaceStrategy(XMLFormattingPreferences.PRESERVE);
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-yes-fmt.xml", prefs);
-
- // results are different than old formatter
- prefs.setPCDataWhitespaceStrategy(XMLFormattingPreferences.COLLAPSE);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-no-newfmt.xml", prefs);
- }
-
- public void testPreserveCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG161330
- formatAndAssertEquals("testfiles/xml/usecdata.xml", "testfiles/xml/usecdata-fmt.xml");
- // the below test will expose a bug in the new formatter so commenting
- // out for now
- // formatAndAssertEquals("testfiles/xml/usecdata2.xml",
- // "testfiles/xml/usecdata2-fmt.xml");
- }
-
- public void testSplitAttributesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- // the below tests are slighty different from old formatter test
- prefs.setIndentMultipleAttributes(true);
- prefs.setAlignFinalBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes2.xml", "testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml", prefs);
-
- prefs.setIndentMultipleAttributes(false);
- prefs.setAlignFinalBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes2.xml", "testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml", prefs);
-
- }
-
- public void testAlignEndBracketFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG113584
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setIndentMultipleAttributes(false);
- prefs.setAlignFinalBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml", prefs);
-
- // results are different than old formatter
- prefs.setIndentMultipleAttributes(true);
- prefs.setAlignFinalBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml", prefs);
- }
-
- public void testSpaceBeforeEmptyCloseTag() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 195264
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setSpaceBeforeEmptyCloseTag(false);
- formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-none-newfmt.xml", prefs);
-
- prefs.setSpaceBeforeEmptyCloseTag(true);
- formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-newfmt.xml", prefs);
- }
-
- public void testProcessingInstruction() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG198297
- formatAndAssertEquals("testfiles/xml/processinginstruction.xml", "testfiles/xml/processinginstruction-fmt.xml");
- }
-
- public void testComments() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 226821
- formatAndAssertEquals("testfiles/xml/xml-comment.xml", "testfiles/xml/xml-comment-newfmt.xml");
- }
-
- public void testKeepEmptyLines() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 228495
- // Test that formatting keeps empty lines
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(false);
- formatAndAssertEquals("testfiles/xml/xml-keep-blank-lines.xml", "testfiles/xml/xml-keep-blank-lines-fmt.xml", prefs);
- }
-
- public void testClearBlankLines() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 228495
- // Test that formatting clears empty lines
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-keep-blank-lines.xml", "testfiles/xml/xml-clear-blank-lines-fmt.xml", prefs);
- }
-
- public void testFormatWithFracturedXMLContent() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 229135
- // Test that text content that is split into multiple document regions does not stop the formatter
- formatAndAssertEquals("testfiles/xml/xml-229135.xml", "testfiles/xml/xml-229135-fmt.xml");
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
deleted file mode 100644
index 9c2e657..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
- This document contains no child
- &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml
deleted file mode 100644
index 0ec803c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
- This document contains no child &EII;s.
- It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
deleted file mode 100644
index 15bdedc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
-This document contains no child &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
deleted file mode 100644
index 6d1390e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
deleted file mode 100644
index 9e897c3..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml
deleted file mode 100644
index fbe6b2a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- ></totally>
- <like fer="sure" no="way">yes way i have text right here
- wheeeeeeeeeeeeeeeeeeeeeeee</like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
deleted file mode 100644
index d757592..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like
- fer="sure"
- no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
deleted file mode 100644
index c7be96e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like
- fer="sure"
- no="way"
- >
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals"
- />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml
deleted file mode 100644
index 0b0d26f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- ></totally>
- <like
- fer="sure"
- no="way"
- >yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee</like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
deleted file mode 100644
index 0de9b4d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
-<totally rad="dude" intense="man" crazy="and insane" scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
-<like fer="sure" no="way">yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee</like>
-<seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml
deleted file mode 100644
index f0ca39d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
- <like fer="sure" no="way">yes way i have text right here</like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml
deleted file mode 100644
index 422676f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
- <like
- fer="sure"
- no="way">yes way i have text right here</like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml
deleted file mode 100644
index e12dece..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
-<totally rad="dude" intense="man" crazy="and insane" scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
-<like fer="sure" no="way">yes way i have text right here</like>
-<seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
deleted file mode 100644
index 72aa19d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one>
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
deleted file mode 100644
index 1723240..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one><two></two><three><four></four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
deleted file mode 100644
index 2709548..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one attr="1" attr2="2">
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml
deleted file mode 100644
index 240df07..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one attr="1" attr2="2">
- <two></two>
- <three>
- <four>
- </four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
deleted file mode 100644
index b513f6a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one attr="1" attr2="2"> <two></two><three><four> </four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml
deleted file mode 100644
index 6628ffb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<testdoc><?testing test="yay"?>
-</testdoc>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml
deleted file mode 100644
index 6628ffb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<testdoc><?testing test="yay"?>
-</testdoc>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
deleted file mode 100644
index c5bb621..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
- which should be easy to pass.
- <data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' '
- a4=" " a5=' ' a6=" " attr2="short-value"
- attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken"
- attr3="short-value">
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b</b>
- <b>b</b><!-- Comment here don't twiddle with spaces in them -->
- <b>b</b>
- <b>b</b>
- <b>b</b>
- </a>
- <?target why am I here
- ?>
- </data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml
deleted file mode 100644
index 25d016d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test of the formatter which should be easy to
- pass.
- <data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' '
- a4=" " a5=' ' a6=" " attr2="short-value"
- attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken"
- attr3="short-value">
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b </b>
- <b> b</b> <!-- Comment here don't twiddle with spaces in them -->
- <b> b </b>
- <b> b </b>
- <b>b</b>
- </a><?target why am I here
- ?>
- </data-stuff>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
deleted file mode 100644
index 823ef32..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
-which should be easy to pass.
-<data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' ' a4=" " a5=' ' a6=" " attr2="short-value" attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken" attr3="short-value"
- >
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b </b>
- <b> b</b> <!-- Comment here don't twiddle with spaces in them --> <b> b </b>
- <b>
- b
- </b>
- <b>b</b>
- </a><?target why am I here
- ?>
-</data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
deleted file mode 100644
index 67217a5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT topmost (empty,emptywithattribute)>
-<!ELEMENT empty EMPTY>
-<!ELEMENT emptywithattribute EMPTY>
-<!ATTLIST emptywithattribute
- myattribute1 CDATA #IMPLIED
- myattribute2 CDATA #IMPLIED>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
deleted file mode 100644
index dfe43e1..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manytags>
- <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
deleted file mode 100644
index ebc176a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manytags> <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
deleted file mode 100644
index 9a4a3a2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
- nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
deleted file mode 100644
index bab4ec9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
deleted file mode 100644
index 5ac2eef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute
- myattribute1=""
- myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
deleted file mode 100644
index 7299cd5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute myattribute1="" myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
deleted file mode 100644
index df5e029..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book>
- <title>This & That</title>
- <author>Some person</author>
- <reviews>
- <review id="0"> "A wonderful and gripping epic story." </review>
- <review id="1">"I liked it."</review>
- </reviews>
- <preview> Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</preview>
- <releaseDate>
- <pattern>%yyyy-%mm-%dd</pattern>
- <date>2009-04-13</date>
- </releaseDate>
-</book>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
deleted file mode 100644
index 9026b07..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book>
- <title>This & That</title>
-<author>Some person</author>
-<reviews>
- <review id="0"> "A wonderful and gripping epic story." </review>
-<review id="1">"I liked it."</review>
-</reviews>
- <preview> Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</preview>
- <releaseDate>
-<pattern>%yyyy-%mm-%dd</pattern>
-<date>2009-04-13</date>
- </releaseDate>
-</book>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml
deleted file mode 100644
index 3a817a1..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <!-- Comment node -->
- <nocontent></nocontent>
- <mixedcontent>
- Textnode with some trailing whitespace - should be collapsed and some
- of the text should be wrapped
- <mixed>All text</mixed>
- </mixedcontent>
- <nocontent>
- </nocontent>
- <somemorenocontent>
- <indentmore>
- <evenmore>
- </evenmore>
- </indentmore>
- </somemorenocontent>
-</root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml
deleted file mode 100644
index bffab55..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node>
- <inner>
- <another>
- <else> <!-- Don't wrap -->
- </else>
- <!--
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas
- elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus.
- Nulla eu diam ac nulla placerat tincidunt. In vitae tellus.
- Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia.
- Praesent in ante. Maecenas tincidunt mauris s
- -->
- Sometext stuff in the document
- <something>
- <else xml:space="preserve"><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s--></else>
- </something>
- </another>
- </inner>
-</node>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml
deleted file mode 100644
index 9afec7f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node>
- <inner>
- <another>
- <else> <!-- Don't wrap -->
- </else><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s-->
- Sometext stuff in the document
- <something>
- <else xml:space="preserve"><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s--></else>
- </something>
- </another>
- </inner>
-</node>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml
deleted file mode 100644
index e29afd7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace />
- <nocontentwithoutspace />
- <nocontent withattr="stuff" />
- <nocontent />
- <manylinedcontent with="attributes" />
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml
deleted file mode 100644
index 48e61d7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace/>
- <nocontentwithoutspace/>
- <nocontent withattr="stuff"/>
- <nocontent/>
- <manylinedcontent with="attributes"/>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml
deleted file mode 100644
index d6fafea..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace />
- <nocontentwithoutspace/>
- <nocontent withattr="stuff"/>
- <nocontent />
- <manylinedcontent
-
- with="attributes"
- />
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml
deleted file mode 100644
index 11d5af9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!-- Comment node -->
-
- <nocontent></nocontent>
-
- <mixedcontent>
- Textnode with some trailing whitespace - should be
-
- collapsed and some of the text should be wrapped
-
- <mixed>All text</mixed>
-
- </mixedcontent>
-
-
-
-
- <nocontent>
- </nocontent>
-
- <somemorenocontent>
- <indentmore>
- <evenmore>
-
- </evenmore>
- </indentmore>
- </somemorenocontent>
-</root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml
deleted file mode 100644
index 39cad2d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <root>
-
- <!-- Comment node -->
-
- <nocontent></nocontent>
-
-<mixedcontent>
-Textnode with some trailing whitespace - should be
-
-collapsed and some of the text should be wrapped
-
- <mixed>All text</mixed>
-
-</mixedcontent>
-
-
-
-
- <nocontent> </nocontent>
-
- <somemorenocontent>
- <indentmore> <evenmore>
-
- </evenmore>
- </indentmore>
- </somemorenocontent>
- </root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
deleted file mode 100644
index 60683f9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata>
- i have
-
-
-
- spaces
- </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml
deleted file mode 100644
index a56aff8..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have spaces </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
deleted file mode 100644
index 5109c8f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
deleted file mode 100644
index fd086dc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT pcdatalicious (ihavepcdata*,idont*,neitherdoi*)>
-<!ELEMENT ihavepcdata (#PCDATA)>
-<!ELEMENT idont EMPTY>
-<!ELEMENT neitherdoi ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
deleted file mode 100644
index 2874f87..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont/>
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
deleted file mode 100644
index f30c047..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
-<preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
deleted file mode 100644
index 271e6f2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
- <preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml
deleted file mode 100644
index 1fc9496..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing> this is not a target, strip spaces as you please </nothing>
- <preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can and should be reformatted.
- </preserve>
- <preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man is an island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2>
- <nothing> this is not a target, strip spaces as you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
deleted file mode 100644
index 28a2b72..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve >
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
-This particular text can
-
-and should be reformatted.</preserve>
-
-<preserve >
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default >
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
deleted file mode 100644
index 551193e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default
- xml:space="default">
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml
deleted file mode 100644
index d6fcf7d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing> this is not a target, strip spaces as you please </nothing>
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default
- xml:space="default">
- No man is an island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing> this is not a target, strip spaces as you please </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
deleted file mode 100644
index 7b18757..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default xml:space="default">
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
deleted file mode 100644
index ce567bf..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml encoding="US-ASCII"?>
-
-<!ELEMENT main (#PCDATA | nothing | preserve | preserve2)* >
-
-<!ELEMENT preserve (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve xml:space (default|preserve) 'preserve'>
-
-<!ELEMENT preserve2 (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve2 xml:space NMTOKEN #FIXED "preserve">
-
-<!ELEMENT space-default (#PCDATA| nothing | preserve)*>
-<!ATTLIST space-default xml:space (default|preserve) 'default'>
-
-<!ELEMENT nothing (#PCDATA) >
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml
deleted file mode 100644
index ee3e5fc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="xml-whitespace.xsd">
- <artist> Some Singer </artist>
- <year>1992</year>
- <title>Lorem ipsum dolor</title>
- <lyrics>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Nunc in nisi. Integer quis quam non eros accumsan elementum.
- Sed risus orci, lobortis at, pulvinar at, varius ac, neque.
- Morbi pede nulla, tincidunt ac, semper vel, ultricies vitae, lacus.
- Nunc nunc. </lyrics>
- <length>2</length>
- <album>Lorem ipsum dolor</album>
- <location> Raleigh, NC, USA </location>
-</song>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml
deleted file mode 100644
index 78ebd1b..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="xml-whitespace.xsd">
- <artist> Some Singer
- </artist>
- <year> 1992 </year>
- <title> Lorem ipsum dolor </title>
- <lyrics>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Nunc in nisi. Integer quis quam non eros accumsan elementum.
- Sed risus orci, lobortis at, pulvinar at, varius ac, neque.
- Morbi pede nulla, tincidunt ac, semper vel, ultricies vitae, lacus.
- Nunc nunc. </lyrics>
- <length>2</length>
- <album> Lorem ipsum dolor </album>
- <location> Raleigh, NC, USA </location>
-</song>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd
deleted file mode 100644
index cff977f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="song" type="xsdSong" />
- <!-- Define a simple type to test that the hierarchy overriding whitespace rule is observed -->
- <xsd:simpleType name="CollapsedString">
- <xsd:restriction base="xsd:string">
- <xsd:whiteSpace value="collapse" />
- </xsd:restriction>
- </xsd:simpleType>
- <!-- Define a simple type to test that the whitespace rule is inherited from the ancestor -->
- <xsd:simpleType name="Normalized">
- <xsd:restriction base="xsd:normalizedString"></xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="xsdSong">
- <xsd:sequence>
- <!-- Whitespace should be replaced -->
- <xsd:element name="artist" type="xsd:normalizedString" />
- <xsd:element name="year" type="xsd:nonNegativeInteger" />
- <!-- Whitespace should collapse -->
- <xsd:element name="title" type="xsd:token" />
- <!-- Whitespace should be preserved -->
- <xsd:element name="lyrics" type="xsd:string" />
- <!-- Whitespace should collapse -->
- <xsd:element name="length" type="xsd:duration" />
- <xsd:element name="album" type="CollapsedString" />
- <xsd:element name="location" type="Normalized" />
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
deleted file mode 100644
index b75426e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
- <html>
- <body>
- <h2>Space Checking</h2>
- <p>
- <xsl:attribute name="align">center</xsl:attribute>
- Check:
- <xsl:for-each select="text/item">
- <xsl:value-of select="something" />
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
deleted file mode 100644
index e87e387..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/">
-<html>
- <body>
- <h2>Space Checking</h2>
- <p><xsl:attribute name="align">center</xsl:attribute>Check:<xsl:for-each select="text/item"><xsl:value-of select="something"/>
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
deleted file mode 100644
index 995f5ae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-
-public class TestFragFile extends TestCase {
-
- public void testFrag() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n" + "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new ByteArrayInputStream(testString1.getBytes("utf8"));
-
- model = modelManager.getModelForRead("test.frag", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
- public void testFragX() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString = "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new StringBufferInputStream(testString);
-
- model = modelManager.getModelForRead("test.fragx", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
deleted file mode 100644
index f090d0f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestModelManager extends TestCase {
-
- private boolean isSetup = false;
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestModelManager() {
- super("TestModelManager");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * must release after use!
- *
- * @return
- */
- private IStructuredModel getStructuredModelForEdit() {
- // from a file
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return model;
- }
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-
- private IModelManager getMM() {
- return StructuredModelManager.getModelManager();
- }
-
- public void testCopyModel() {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- try {
- IStructuredModel modelCopy = getMM().copyModelForEdit(model.getId(), "newId");
- assertNotNull("copied model was null", modelCopy);
- }
- catch (ResourceInUse e) {
- e.printStackTrace();
- }
-
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewInstance() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredModel newInstance = getMM().createNewInstance(model);
- assertTrue("failed to create new instance of: " + model, model != newInstance);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewStructuredDocumentFor() throws IOException, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- // ensure model already exists
- model = getStructuredModelForEdit();
- boolean resourceExists = false;
- try {
- getMM().createNewStructuredDocumentFor(file);
- }
- catch(ResourceAlreadyExists ex) {
- resourceExists = true;
- }
- assertTrue("should have gotten ResourceAlreadyExits exception", resourceExists);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateStructuredDocumentFor() throws IOException, ResourceAlreadyExists, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- IStructuredDocument sDoc = getMM().createStructuredDocumentFor(file);
- assertNotNull("failed to create structured document", sDoc);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetExistingModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- IStructuredModel existingModel = null;
- try {
- model = getStructuredModelForEdit();
- existingModel = StructuredModelManager.getModelManager().getExistingModelForEdit(f);
- assertNotNull("failed to get existing model", existingModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (existingModel != null)
- existingModel.releaseFromEdit();
-
- }
- }
-
- public void testGetExistingModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getExistingModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testGetModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- assertNotNull("failed to get model", model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testIsShared() {
- IStructuredModel model = null;
- IStructuredModel model2 = null;
- try {
- model = getStructuredModelForEdit();
- model2 = getStructuredModelForEdit();
- // TODO: will change when API added to MM
- boolean isShared = getMM().isShared(model.getId());
- assertTrue("model should be shared", isShared);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (model2 != null)
- model2.releaseFromEdit();
- }
- }
-
- public void testReinitialize() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- getMM().reinitialize(model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testReleaseModel() throws IOException {
- // TODO: will need to implement when MM has this function
- }
-
- public void testSaveModel() throws UnsupportedEncodingException, CoreException, IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- // TODO: will need to change when MM has this function
- model.save();
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testSaveModelIfNotShared() {
- // TODO: will need to implement when MM has this function
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index 7e5a48d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.IOException;
-import java.io.StringBufferInputStream;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.tests.document.UnzippedProjectTester;
-
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
- private static final String NONEXISTENT_FILENAME1 = "testfiles/xml/testnonexistent1.xml";
- private static final String NONEXISTENT_FILENAME2 = "testfiles/xml/testnonexistent2.xml";
- private static final String NONEXISTENT_FILENAME3 = "testfiles/xml/testnonexistent3.xml";
- private static final String EXISTENT_FILENAME1 = "testfiles/xml/testNormalCase.xml";
- private final static boolean DEBUG = false;
-
- public void testNonExistentFileWithBuffer() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateBuffer(NONEXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(NONEXISTENT_FILENAME2, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLIDs() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateIDs(NONEXISTENT_FILENAME3, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(EXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- private void addContentsAndCreateFile(IFile file) throws CoreException {
- StringBufferInputStream stringStream = new StringBufferInputStream("testing testing testing");
- file.create(stringStream, false, null);
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestCreate(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- // count as success if gets to heer without exception
- assertTrue(true);
- String fileLocation = model.getBaseLocation();
- String id = model.getId();
- if (DEBUG) {
- System.out.println("fileLocation: " + fileLocation);
- System.out.println("id: " + id);
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- private void doTestCreateBuffer(String filePath, Class class1, Class class2) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
-
- ITextFileBuffer fileBufferBeforeExists = getTextBuffer(file);
-
- addContentsAndCreateFile(file);
-
- ITextFileBuffer fileBufferAfterExists = getTextBuffer(file);
-
- boolean buffersIdentical = fileBufferBeforeExists == fileBufferAfterExists;
- assertTrue(buffersIdentical);
- if (DEBUG) {
- System.out.println(fileBufferBeforeExists.getLocation());
- System.out.println(fileBufferAfterExists.getLocation());
- }
-
-
-
- }
-
- private void doTestCreateIDs(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-
- try {
- assertNotNull(model);
- if (DEBUG) {
- System.out.println("ID: " + model.getId());
- System.out.println("BaseLocation" + model.getBaseLocation());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private ITextFileBuffer getTextBuffer(IFile file) throws CoreException {
- ITextFileBufferManager fileBufferManager = FileBuffers.getTextFileBufferManager();
- IPath fileIPath = file.getFullPath();
- IPath normalizedPath = FileBuffers.normalizeLocation(fileIPath);
- fileBufferManager.connect(normalizedPath, null);
- ITextFileBuffer buffer = fileBufferManager.getTextFileBuffer(normalizedPath);
- return buffer;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
deleted file mode 100644
index a66d915..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredModel extends TestCase {
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- // is it a problem to unzip the same project in
- // different tests?
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredModel() {
- super("TestStructuredModel");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testAboutToChangeModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.aboutToChangeModel();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testAddRemoveModelStateListener() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IModelStateListener listener = new IModelStateListener() {
-
- public void modelAboutToBeChanged(IStructuredModel model) {
- //
- }
-
- public void modelChanged(IStructuredModel model) {
- //
- }
-
- public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
- //
- }
-
- public void modelResourceDeleted(IStructuredModel model) {
- //
- }
-
- public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
- //
- }
-
- public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
- //
- }
-
- public void modelReinitialized(IStructuredModel structuredModel) {
- //
- }
- };
-
- model.aboutToChangeModel();
-
- model.removeModelStateListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- /**
- * Test expectes an exception since only a changedModel sent, without
- * beginning 'aboutToChangeModel'
- *
- * @throws CoreException
- * @throws IOException
- *
- */
- public void testChangedModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- try {
- model.changedModel();
- }
- catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetContentType() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String ct = model.getContentTypeIdentifier();
- assertTrue("model has wrong content type:" + ct + " != " + ContentTypeIdForXML.ContentTypeID_XML, ct.equals(ContentTypeIdForXML.ContentTypeID_XML));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetBaseLocation() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String location = model.getBaseLocation();
- assertTrue("wrong base location", location.equals("/" + fProjectName + "/files/simple.xml"));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testGetFactoryRegistry() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getFactoryRegistry();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegion() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getIndexedRegion(0);
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegions() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // not implemented yet...
- // model.getIndexedRegions();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testGetStructuredDocument() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument doc = model.getStructuredDocument();
- assertNotNull("document is null", doc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsDirty() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be dirty", model.isDirty());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsModelStateChanging() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be changing", model.isModelStateChanging());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsNew() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // this API seems strange
- // assertFalse("new model check failed", model.isNew());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsReinitializationNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("reinitialization should not be needed", model.isReinitializationNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testIsSaveNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("save should not be needed", model.isSaveNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredModel newInstance = null;
- try {
- newInstance = model.newInstance();
- }
- catch (IOException e) {
- assertTrue("IOException during model new instance", false);
- }
- assertNotNull("new instance is null", newInstance);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
deleted file mode 100644
index f468324..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- *
- *
- */
-public class TestXMLModelLoader extends TestCase {
-
- private boolean isSetup = false;
- private XMLModelLoader fLoader = null;
-
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
-
- public TestXMLModelLoader() {
- super("TestModelLoader");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- fLoader = new XMLModelLoader();
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testCreateEmptyModel() {
- IStructuredModel model = fLoader.createModel();
- assertNotNull("model is null", model);
- }
-
- public void testCreateModelWithDocument() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
-
- // null handlder is normally not valid, including only for this test.
- IStructuredModel modelFromDoc = fLoader.createModel(sDoc, "/test", null);
- assertNotNull("model from doc is null", modelFromDoc);
- }
-
- public void testCreateModelWithModel() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
- // TODO: need an existing full model
- //IStructuredModel modelFromModel = fLoader.createModel(emptyModel);
- //assertNotNull("model from model is null", modelFromModel);
- }
-
- public void testGetAdapterFactories() {
- List factories = fLoader.getAdapterFactories();
- assertTrue("there were no adapter factories for XML", factories.size() > 0);
- }
-
- public void testLoad() {
- // from a file
- IFile f = getFile();
-
- try {
- IStructuredModel model = fLoader.createModel();
- fLoader.load(f, model);
- String text = model.getStructuredDocument().get();
- assertTrue("failed to load", text.length() > 0);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- public void testLoadFromStream() {
- // need to fix this test
- // unless the API is going away...
-// IFile f = getFile();
-//
-// try {
-// IStructuredModel model = fLoader.createModel();
-// fLoader.load(f.getContents(), model, EncodingRule.FORCE_DEFAULT);
-// String text = model.getStructuredDocument().get();
-// assertTrue("failed to load", text.length() > 0);
-// }
-// catch (IOException e) {
-// e.printStackTrace();
-// }
-// catch (CoreException e) {
-// e.printStackTrace();
-// }
- }
-
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
deleted file mode 100644
index 28f66ed..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
deleted file mode 100644
index ada17ef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerXML extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerXML(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- /**
- * must release model (from edit) after
- * @param filename relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- model = modelManager.getModelForEdit(filename, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- public void testDisconnectConnect() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- assertNotNull("partitioner was null for sDoc:" + sDoc, partitioner);
- try {
- stp.disconnect();
- }
- catch(Exception e) {
- assertTrue("problem disconnecting w/:" +sDoc + "/n" + e, false);
- }
- try {
- stp.connect(sDoc);
- }
- catch(Exception e) {
- assertTrue("problem connecting w/:" + sDoc + "/n" + e, false);
- }
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetDefaultPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("paritioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testXML1() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doComputePartitioningTest("testfiles/xml/example01.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- public void testEmpty() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- public void testPerfXML() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doTimedComputePartitioningTest("testfiles/xml/company300k.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", offset, partitions[i].getOffset());
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file, using the
- * default partitioner for that file type. This test allows for verifying the zero-length
- * partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
- long startTime = System.currentTimeMillis();
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- long endTime = System.currentTimeMillis();
- if (DEBUG_PRINT_RESULT) {
-
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- System.out.println("Time to compute " + partitions.length + ": " + (endTime-startTime) + " (msecs)");
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
deleted file mode 100644
index e2ba556..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
+++ /dev/null
@@ -1,8100 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>The Ultimate A Company</title>
- </head>
- <body>
- <p>
- <img src="banner.gif" height="51" width="659" alt="" />
- </p>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <!-- comment added to tests 6 partitions -->
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <p>
- <img src="footer.gif" height="25" width="659" alt="" />
- </p>
- </body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
deleted file mode 100644
index f46ccee..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testcase SYSTEM "testcase.dtd">
-<!-- this document will not validate -->
-<testcase></testcase>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
deleted file mode 100644
index 6d44097..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml encoding="US-ASCII"?>
-<!-- ====================== Entities ==================================-->
-<!ENTITY % EdtPageSubCat "OutlineView | PropertySheet | SourceView">
-<!ENTITY % WebSubCat "Accessability | AnimGIFDesigner | AppServerConfig | CSSEditor | DBWizard | FTPImport | FTPExport | HTTPImport | JavaBeanWizard | LinkStyleConvWizard | LinksView | Miscellaneous | HTMLFileWizard | JSPFileWizard | ServletFileWizard | WebProjWizard | NLS | Samples | WebAppDeployDesc">
-<!ENTITY % HTMLSubCat "PageDesigner | DesignView | %EdtPageSubCat; | Preview">
-<!ENTITY % XMLSubCat "%EdtPageSubCat;">
-<!ENTITY % SubCat "(%WebSubCat; | %HTMLSubCat; | %XMLSubCat;)">
-<!ENTITY % Cat "(webtool | html | xml)">
-
-<!ENTITY % State "(Undefined | UnderConstruction | UnderReview | ReviewCompleted | Approved | Ready | Complete | Obsolete)">
-<!ENTITY % Bucket "(ComponentTest | ProductTest | IntegrationTest | TranslationTest | UnitTest)">
-<!ENTITY % Platform "(All | Win2000 | WinME | WinNT | Win98 | LinuxRedHat | Caldera | SuSe | TurboLinux)">
-
-<!-- ====================== Elements ================================-->
-<!ELEMENT testcase
- ((header, summary, definition, execution*),variation*)>
-<!ELEMENT variation
- (header, summary, definition, execution*)>
-
-<!ELEMENT header (subject, author, coauthor*, creation_date)>
-<!ELEMENT subject (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT coauthor (#PCDATA)>
-<!ELEMENT creation_date (#PCDATA)>
-
-<!-- Example of having more than one attribute list defined for a given element -->
-<!ATTLIST header
- number ID #REQUIRED
- state %State; "UnderConstruction"
->
-<!ATTLIST header
- category %Cat; #REQUIRED
- subCategory %SubCat; #REQUIRED
- subSubCateogory CDATA #IMPLIED
- >
-
-<!ELEMENT summary (testBucket+, platform+, part*, release+)>
-<!ELEMENT testBucket EMPTY>
-<!ATTLIST testBucket
- type %Bucket; #REQUIRED
->
-<!ELEMENT platform EMPTY>
-<!ATTLIST platform
- type %Platform; #REQUIRED
->
-<!ELEMENT part (#PCDATA)>
-<!ELEMENT release (#PCDATA)>
-
-
-<!ELEMENT definition (purpose, prerequisite*, procedure, expected_results)>
-<!ELEMENT purpose (#PCDATA)>
-<!ELEMENT prerequisite EMPTY>
-<!ATTLIST prerequisite
- number IDREF #REQUIRED
->
-<!ELEMENT procedure (#PCDATA)>
-<!ELEMENT expected_results (#PCDATA)>
-
-<!ELEMENT execution ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
deleted file mode 100644
index 5a779d9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.xml.core.tests.Logger;
-import org.w3c.dom.Document;
-
-
-
-/**
- */
-public class CommonXML {
-
- public synchronized static DocumentBuilder getDocumentBuilder() {
- DocumentBuilder result = null;
- try {
- result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
- DocumentBuilder result = null;
- try {
- DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
- instance.setValidating(validating);
- result = instance.newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public static void serialize(Document document, OutputStream ostream) throws IOException {
- Source domSource = new DOMSource(document);
- try {
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- try {
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
- }
- catch (IllegalArgumentException e) {
- // unsupported properties
- }
- serializer.transform(domSource, new StreamResult(ostream));
- }
- catch (TransformerConfigurationException e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerFactoryConfigurationError e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerException e) {
- throw new IOException(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
deleted file mode 100644
index 61d885e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
- /**
- * Constructor for AllTests.
- * @param name
- */
- private static String now = null;
-
-
- public static String now() {
- // just calculate once, so whole run as same timestamp
- if (DateUtil.now == null) {
- DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
- Calendar calendar = Calendar.getInstance();
- Date today = calendar.getTime();
- DateUtil.now = format.format(today);
- }
- return DateUtil.now;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
deleted file mode 100644
index cc3d4cd..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
- public static String XML_CORE_TESTS_PLUGIN_ID = "org.eclipse.wst.xml.core.tests";
-
- static File previousResultsDirectory = null;
- static private String logSubDirectoryPath;
-
- private static boolean notTriedYet = true;
-
- public static class DirFilenameFilter implements FilenameFilter {
- String startOfAcceptableNames;
-
- public DirFilenameFilter(String startOfDirName) {
- startOfAcceptableNames = startOfDirName;
- }
-
- /**
- * @see java.io.FileFilter#accept(File)
- */
- public boolean accept(File pathname, String filename) {
- // we'll just assume if it starts with right key, it is a directory ... for now
- return filename.startsWith(startOfAcceptableNames);
- }
-
- }
-
- public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
- if (previousResultsDirectory == null && notTriedYet) {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- //String installPath = url.getPath();
- // add known file so URL method below can be used
- // (doesn't seem to work for directory?)
- URL totalURL = new URL(url, "plugin.xml");
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File pluginHomeDir = new File(finalPath);
- FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
- File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
- // assume first in list is newest, then start looking with the
- // second item ... just to avoid "null" case checking
- if (allDirs.length > 0) {
- File currentNewest = allDirs[0];
- for (int i = 1; i < allDirs.length; i++) {
- File current = allDirs[i];
- // NOTE: we go by modified date, not by the actual time stamp in name.
- // This should work for all normal cases, but may not if someone does some
- // "funny" copying, or updating from repository.
- if (current.lastModified() > currentNewest.lastModified()) {
- currentNewest = current;
- }
- }
- previousResultsDirectory = currentNewest;
- }
- notTriedYet = false;
- }
- return previousResultsDirectory;
- }
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- //URL finalurl = Platform.asLocalURL(totalURL);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!dir.exists()) {
- // a little safety net, be sure the previous newest directory
- // is initialized, just in case no one else has done so
- if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
- FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- }
- // now its "safe" to make the new one
- dir.mkdirs();
- }
- return file;
- }
-
- /**
- * Just a general utility method
- * @param filename
- * @return String
- */
- public static String getExtension(String filename) {
- String extension = null;
- int dotPostion = filename.lastIndexOf('.');
- if (dotPostion > -1) {
- extension = filename.substring(dotPostion + 1);
- }
- else {
- extension = new String();
- }
- return extension;
- }
-
- /**
- * General purpose utility method to ensure the log
- * directory exists, and returns the name.
- */
- public static String getLogDirectory() {
- if (logSubDirectoryPath == null) {
- String mainDirectory = "/logs";
- File dir = new File(mainDirectory);
- ensureExists(dir);
- String subDirectory = TimestampUtil.timestamp();
- logSubDirectoryPath = mainDirectory + "/" + subDirectory;
- File subdir = new File(logSubDirectoryPath);
- ensureExists(subdir);
- }
- return logSubDirectoryPath;
- }
-
- public static void ensureExists(File dir) {
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public static String getPerformanceOutputLogName() {
- String result = null;
- String directoryName = FileUtil.getLogDirectory();
- String extension = ".out";
- String baseName = "sedTests";
- long now = System.currentTimeMillis();
- String nowStr = String.valueOf(now);
- result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 28105a7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
- }
-
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- //fCreatedProjects.add(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- String inFileName = inFile.getAbsolutePath(); //"c:/example.zip";
- // Specify destination where file will be unzipped
- //String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File sourceZipFile = new File(inFileName);
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
- IProject currentProject = null;
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- //System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- int currentByte;
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fos = new FileOutputStream(destFile);
- BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
- // read and write until last byte is encountered
- while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
- dest.write(data, 0, currentByte);
- }
- dest.flush();
- dest.close();
- is.close();
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- // unlike version in sse.tests, we don't create project
- // for
- // every directory
- // if(projectFolderName == null) {
- // projectFolderName = destFile.getName();
- // fCreatedProjects.add(projectFolderName);
- //
- // currentProject =
- // ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- // }
- }
- }
- zipFile.close();
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- // resynch
- refreshWorkspace();
- //change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- if (!proj.exists()) {
- proj.create(new NullProgressMonitor());
- }
- // need to add java nature, or else project won't "exist()" in the
- // java
- // element sense
- String[] natureIds = {"org.eclipse.jdt.core.javanature"};
- if (!proj.isOpen()) {
- proj.open(null);
- }
- IProjectDescription desc = proj.getDescription();
- desc.setNatureIds(natureIds);
- proj.setDescription(desc, new NullProgressMonitor());
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- //WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- //ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index eb59c82..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
deleted file mode 100644
index 8a471da..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
- private static Date timestamp = null;
- private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
- // private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
- private static String nowShort = null;
-
- public static String timestamp() {
-
- if (TimestampUtil.nowShort == null) {
- TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
- }
- return TimestampUtil.nowShort;
- }
-
- protected static Date ensureTimestamp() {
- // just calculate 'timestamp' once per class loading,
- // so this 'timestamp' remains the same during
- // entire run.
- if (TimestampUtil.timestamp == null) {
- Calendar calendar = Calendar.getInstance();
- TimestampUtil.timestamp = calendar.getTime();
- }
- return TimestampUtil.timestamp;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/test.xml b/tests/org.eclipse.wst.xml.core.tests/test.xml
deleted file mode 100644
index d021aae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip b/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
deleted file mode 100644
index 084f332..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.classpath b/tests/org.eclipse.wst.xml.tests.encoding/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore b/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore
deleted file mode 100644
index 67968bd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-javaCompiler.tests.jar.args
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.project b/tests/org.eclipse.wst.xml.tests.encoding/.project
deleted file mode 100644
index 6ac370c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.tests.encoding</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 77fff23..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.tests.encoding
-Bundle-Version: 1.0.201.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.wst.xml.tests.encoding.TestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.xml.tests.encoding.pref,
- org.eclipse.wst.xml.tests.encoding.properties,
- org.eclipse.wst.xml.tests.encoding.read,
- org.eclipse.wst.xml.tests.encoding.util,
- org.eclipse.wst.xml.tests.encoding.write,
- org.eclipse.wst.xml.tests.encoding.xml
-Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- org.eclipse.wst.xml.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.sse.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/about.html b/tests/org.eclipse.wst.xml.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/build.properties b/tests/org.eclipse.wst.xml.tests.encoding/build.properties
deleted file mode 100644
index 8d554ab..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = tests.jar,\
- testfiles/,\
- testfiles.zip,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt b/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt
deleted file mode 100644
index adfb1d2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt
+++ /dev/null
@@ -1,857 +0,0 @@
-
-Current Locale: en_US
-
-JRE version: J2RE 1.4.2 IBM Windows 32 build cndev-20040128 (JIT enabled: jitc)
--- listing properties --
-java.assistive=ON
-java.runtime.name=Java(TM) 2 Runtime Environment, Stand...
-sun.boot.library.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.vm.version=1.4.2
-java.vm.vendor=IBM Corporation
-java.vendor.url=http://www.ibm.com/
-path.separator=;
-java.vm.name=Classic VM
-file.encoding.pkg=sun.io
-user.country=US
-sun.os.patch.level=Service Pack 1
-java.vm.specification.name=Java Virtual Machine Specification
-user.dir=D:\builds\Daily\eclipse-SDK-I20040304...
-java.runtime.version=1.4.2
-java.fullversion=J2RE 1.4.2 IBM Windows 32 build cndev...
-java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment
-java.endorsed.dirs=D:\builds\Daily\wswb-SDK-I20040226-wi...
-os.arch=x86
-java.io.tmpdir=C:\DOCUME~1\DAVIDW~1.DMW\LOCALS~1\Temp\
-line.separator=
-
-java.vm.specification.vendor=Sun Microsystems Inc.
-user.variant=
-java.awt.fonts=
-os.name=Windows XP
-sun.java2d.fontpath=
-java.library.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.specification.name=Java Platform API Specification
-java.class.version=48.0
-ibm.system.encoding=Cp1252
-java.util.prefs.PreferencesFactory=java.util.prefs.WindowsPreferencesFac...
-invokedviajava=
-os.version=5.1
-user.home=C:\Documents and Settings\davidw.DMW2T23
-user.timezone=
-java.awt.printerjob=sun.awt.windows.WPrinterJob
-java.specification.version=1.4
-file.encoding=Cp1252
-user.name=davidw
-java.class.path=D:\builds\Daily\eclipse-SDK-I20040304...
-java.vm.specification.version=1.0
-sun.arch.data.model=32
-java.home=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.specification.vendor=Sun Microsystems Inc.
-user.language=en
-awt.toolkit=sun.awt.windows.WToolkit
-java.vm.info=J2RE 1.4.2 IBM Windows 32 build cndev...
-java.version=1.4.2
-java.ext.dirs=D:\builds\Daily\wswb-SDK-I20040226-wi...
-sun.boot.class.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.vendor=IBM Corporation
-file.separator=\
-java.vendor.url.bug=
-java.compiler=jitc
-sun.io.unicode.encoding=UnicodeLittle
-Available Locales
-ar
-ar_AE
-ar_BH
-ar_DZ
-ar_EG
-ar_IQ
-ar_JO
-ar_KW
-ar_LB
-ar_LY
-ar_MA
-ar_OM
-ar_QA
-ar_SA
-ar_SD
-ar_SY
-ar_TN
-ar_YE
-be
-be_BY
-bg
-bg_BG
-bn_IN
-ca
-ca_ES
-ca_ES_PREEURO
-cs
-cs_CZ
-da
-da_DK
-da_DK_EURO
-de
-de_AT
-de_AT_PREEURO
-de_CH
-de_DE
-de_DE_PREEURO
-de_LU
-de_LU_PREEURO
-el
-el_GR
-el_GR_PREEURO
-en
-en_AU
-en_BE
-en_BE_PREEURO
-en_CA
-en_GB
-en_GB_EURO
-en_HK
-en_IE
-en_IE_PREEURO
-en_IN
-en_NZ
-en_PH
-en_SG
-en_US
-en_ZA
-es
-es_AR
-es_BO
-es_CL
-es_CO
-es_CR
-es_DO
-es_EC
-es_ES
-es_ES_PREEURO
-es_GT
-es_HN
-es_MX
-es_NI
-es_PA
-es_PE
-es_PR
-es_PY
-es_SV
-es_US
-es_UY
-es_VE
-et
-et_EE
-fi
-fi_FI
-fi_FI_PREEURO
-fr
-fr_BE
-fr_BE_PREEURO
-fr_CA
-fr_CH
-fr_FR
-fr_FR_PREEURO
-fr_LU
-fr_LU_PREEURO
-gu
-gu_IN
-hi
-hi_IN
-hr
-hr_HR
-hu
-hu_HU
-in
-in_ID
-is
-is_IS
-it
-it_CH
-it_IT
-it_IT_PREEURO
-iw
-iw_IL
-ja
-ja_JP
-kk
-kk_KZ
-kn
-kn_IN
-ko
-kok_IN
-ko_KR
-lt
-lt_LT
-lv
-lv_LV
-mk
-mk_MK
-ml_IN
-mr
-mr_IN
-ms
-ms_MY
-nb_NO
-nl
-nl_BE
-nl_BE_PREEURO
-nl_NL
-nl_NL_PREEURO
-no
-no_NO
-no_NO_NY
-or_IN
-pa
-pa_IN
-pl
-pl_PL
-pt
-pt_BR
-pt_PT
-pt_PT_PREEURO
-ro
-ro_RO
-ru
-ru_RU
-sa
-sa_IN
-sh
-sh_YU
-sk
-sk_SK
-sl
-sl_SI
-sq
-sq_AL
-sr
-sr_YU
-sv
-sv_SE
-sv_SE_EURO
-ta
-ta_IN
-te
-te_IN
-th
-th_TH
-th_TH_TH
-tr
-tr_TR
-uk
-uk_UA
-vi
-vi_VN
-zh
-zh_CN
-zh_CN_HK
-zh_HK
-zh_SG
-zh_TW
-file.encoding.pkg: sun.io
-file.encoding: Cp1252
-
-
-Available Charsets
-1. Charsetname: Big5
- displayName: Big5: PC Taiwan Big 5
- aliases: [big5, Big5-HKSCS]
-2. Charsetname: CESU-8
- displayName: CESU-8: Unicode UTF-8 (without surrogates)
- aliases: [CESU8]
-3. Charsetname: COMPOUND_TEXT
- displayName: COMPOUND_TEXT: X11 Compound Text
- aliases: [x-compound-text, x11-compound-text]
-4. Charsetname: EUC-CN
- displayName: EUC-CN: EUC China
- aliases: [euc_cn, euccn, ibm-euccn]
-5. Charsetname: EUC-JP
- displayName: EUC-JP: EUC Japan
- aliases: [euc-jp-linux, x-euc-jp, x-eucjp, euc_jp_linux, eucjp, euc_jp]
-6. Charsetname: EUC-KR
- displayName: EUC-KR: EUC Korea
- aliases: [5601, ksc5601_1987, ksc_5601, ibm-euckr, ksc5601-1987, ibm-970, euc_kr, Cp970, ks_c_5601-1987, euckr]
-7. Charsetname: EUC-TW
- displayName: EUC-TW: EUC Taiwan
- aliases: [euc_tw, cns11643, euctw]
-8. Charsetname: GB18030
- displayName: GB18030: PC China GB18030
- aliases: [windows-54936, ibm-1392, gb18030-2000]
-9. Charsetname: GB2312
- displayName: GB2312
- aliases: [gb2312-80, gb2312-1980]
-10. Charsetname: GBK
- displayName: GBK: PC China GBK
- aliases: [GBK]
-11. Charsetname: hp-roman8
- displayName: hp-roman8: HP Roman 8
- aliases: [Cp1051, ibm-1051, roman8, r8]
-12. Charsetname: IBM-037
- displayName: IBM-037: EBCDIC United States
- aliases: [ibm-37]
-13. Charsetname: IBM-1006
- displayName: IBM-1006: ISO Urdu
- aliases: [ibm1006, Cp1006]
-14. Charsetname: IBM-1025
- displayName: IBM-1025: EBCDIC Cyrillic
- aliases: [ibm1025, Cp1025]
-15. Charsetname: IBM-1026
- displayName: IBM-1026: EBCDIC Latin 5 (Turkey)
- aliases: [Cp1026, ibm1026]
-16. Charsetname: IBM-1027
- displayName: IBM-1027: EBCDIC SBCS Japan
- aliases: [ibm1027, Cp1027]
-17. Charsetname: IBM-1041
- displayName: IBM-1041: PC SBCS-only Japan
- aliases: [Cp1041, ibm1041]
-18. Charsetname: IBM-1043
- displayName: IBM-1043: PC SBCS-only Taiwan
- aliases: [Cp1043, ibm1043]
-19. Charsetname: IBM-1046
- displayName: IBM-1046: EBCDIC Arabic
- aliases: [ibm1046, Cp1046]
-20. Charsetname: IBM-1046S
- displayName: IBM-1046S: EBCDIC Arabic (shaped)
- aliases: [Cp1046S, ibm1046S]
-21. Charsetname: IBM-1047
- displayName: IBM-1047: EBCDIC Open Edition
- aliases: [Cp1047, ibm1047]
-22. Charsetname: IBM-1088
- displayName: IBM-1088: PC SBCS-only Korean KS
- aliases: [Cp1088, ibm1088]
-23. Charsetname: IBM-1097
- displayName: IBM-1097: EBCDIC Farsi
- aliases: [Cp1097, ibm1097]
-24. Charsetname: IBM-1098
- displayName: IBM-1098: ISO Farsi
- aliases: [Cp1098, ibm1098]
-25. Charsetname: IBM-1112
- displayName: IBM-1112: EBCDIC Baltic
- aliases: [Cp1112, ibm1112]
-26. Charsetname: IBM-1114
- displayName: IBM-1114: PC SBCS-only Taiwan
- aliases: [Cp1114, ibm1114]
-27. Charsetname: IBM-1115
- displayName: IBM-1115: PC SBCS-only China
- aliases: [Cp1115, ibm1115]
-28. Charsetname: IBM-1122
- displayName: IBM-1122: EBCDIC Estonia
- aliases: [Cp1122, ibm1122]
-29. Charsetname: IBM-1123
- displayName: IBM-1123: EBCDIC Ukraine
- aliases: [Cp1123, ibm1123]
-30. Charsetname: IBM-1124
- displayName: IBM-1124: PC Ukraine
- aliases: [Cp1124, ibm1124]
-31. Charsetname: IBM-1140
- displayName: IBM-1140: EBCDIC United States (euro)
- aliases: [Cp1140, ibm1140]
-32. Charsetname: IBM-1141
- displayName: IBM-1141: EBCDIC Germany (euro)
- aliases: [Cp1141, ibm1141]
-33. Charsetname: IBM-1142
- displayName: IBM-1142: EBCDIC Denmark, Norway (euro)
- aliases: [Cp1142, ibm1142]
-34. Charsetname: IBM-1143
- displayName: IBM-1143: EBCDIC Finland, Sweden (euro)
- aliases: [ibm1143, Cp1143]
-35. Charsetname: IBM-1144
- displayName: IBM-1144: EBCDIC Italy (euro)
- aliases: [Cp1144, ibm1144]
-36. Charsetname: IBM-1145
- displayName: IBM-1145: EBCDIC Spain (euro)
- aliases: [ibm1145, Cp1145]
-37. Charsetname: IBM-1146
- displayName: IBM-1146: EBCDIC UK, Ireland (euro)
- aliases: [Cp1146, ibm1146]
-38. Charsetname: IBM-1147
- displayName: IBM-1147: EBCDIC France (euro)
- aliases: [Cp1147, ibm1147]
-39. Charsetname: IBM-1148
- displayName: IBM-1148: EBCDIC Multilingual (euro)
- aliases: [Cp1148, ibm1148]
-40. Charsetname: IBM-1149
- displayName: IBM-1149: EBCDIC Iceland
- aliases: [Cp1149, ibm1149]
-41. Charsetname: IBM-1351
- displayName: IBM-1351: PC DBCS-only Japan
- aliases: [Cp1351, ibm1351]
-42. Charsetname: IBM-1362
- displayName: IBM-1362: PC DBCS-only Korea KS extended
- aliases: [Cp1362, ibm1362]
-43. Charsetname: IBM-1363
- displayName: IBM-1363: PC Korea KS extended
- aliases: [Cp1363, ibm1363]
-44. Charsetname: IBM-1363C
- displayName: IBM-1363C: PC Korea KS extended (syntax)
- aliases: [ibm1363C, Cp1363C]
-45. Charsetname: IBM-1364
- displayName: IBM-1364: EBCDIC Korea KS extended
- aliases: [ibm1364, Cp1364]
-46. Charsetname: IBM-1370
- displayName: IBM-1370: PC Taiwan (euro)
- aliases: [Cp1370, ibm1370]
-47. Charsetname: IBM-1371
- displayName: IBM-1371: EBCDIC Taiwan (euro)
- aliases: [Cp1371, ibm1371]
-48. Charsetname: IBM-1380
- displayName: IBM-1380: PC DBCS-only China GB
- aliases: [ibm1380, Cp1380]
-49. Charsetname: IBM-1381
- displayName: IBM-1381: PC China GB
- aliases: [Cp1381, ibm1381]
-50. Charsetname: IBM-1382
- displayName: IBM-1382: EUC DBCS-only China GB
- aliases: [ibm1382, Cp1382]
-51. Charsetname: IBM-1383
- displayName: IBM-1383: EUC China
- aliases: [Cp1383, ibm1383]
-52. Charsetname: IBM-1385
- displayName: IBM-1385: PC DBCS-only China GBK
- aliases: [Cp1385, ibm1385]
-53. Charsetname: IBM-1386
- displayName: IBM-1386: PC China GBK
- aliases: [Cp1386, ibm1386]
-54. Charsetname: IBM-1388
- displayName: IBM-1388: EBCDIC China GBK
- aliases: [ibm1388, Cp1388]
-55. Charsetname: IBM-1390
- displayName: IBM-1390: EBCDIC Japan Katakana (euro)
- aliases: [Cp1390, ibm1390]
-56. Charsetname: IBM-1399
- displayName: IBM-1399: EBCDIC Japan Latin (euro)
- aliases: [Cp1399, ibm1399]
-57. Charsetname: IBM-273
- displayName: IBM-273: EBCDIC Germany
- aliases: [ibm273, Cp273]
-58. Charsetname: IBM-277
- displayName: IBM-277: EBCDIC Denmark, Norway
- aliases: [Cp277, ibm277]
-59. Charsetname: IBM-278
- displayName: IBM-278: EBCDIC Finland, Sweden
- aliases: [ibm278, Cp278]
-60. Charsetname: IBM-280
- displayName: IBM-280: EBCDIC Italy
- aliases: [ibm280, Cp280]
-61. Charsetname: IBM-284
- displayName: IBM-284: EBCDIC Spain, Latin America
- aliases: [Cp284, ibm284]
-62. Charsetname: IBM-285
- displayName: IBM-285: EBCDIC UK, Ireland
- aliases: [Cp285, ibm285]
-63. Charsetname: IBM-290
- displayName: IBM-290: EBCDIC SBCS Japan Katakana
- aliases: [Cp290, ibm290]
-64. Charsetname: IBM-297
- displayName: IBM-297: EBCDIC France
- aliases: [Cp297, ibm297]
-65. Charsetname: IBM-300
- displayName: IBM-300: EBCDIC DBCS-only Japan
- aliases: [Cp300, ibm300]
-66. Charsetname: IBM-301
- displayName: IBM-301: PC DBCS-only Japan
- aliases: [ibm301, Cp301]
-67. Charsetname: IBM-33722
- displayName: IBM-33722: EUC Japan
- aliases: [Cp33722, ibm33722]
-68. Charsetname: IBM-33722C
- displayName: IBM-33722C: EUC Japan syntax
- aliases: [ibm33722C, Cp33722C]
-69. Charsetname: IBM-420
- displayName: IBM-420: EBCDIC Arabic
- aliases: [Cp420, ibm420]
-70. Charsetname: IBM-420S
- displayName: IBM-420S: EBCDIC Arabic shaped
- aliases: [Cp420S, ibm420S]
-71. Charsetname: IBM-424
- displayName: IBM-424: EBCDIC Hebrew
- aliases: [ibm424, Cp424]
-72. Charsetname: IBM-437
- displayName: IBM-437: PC United States
- aliases: [Cp437, cspc8codepage437, ibm437]
-73. Charsetname: IBM-500
- displayName: IBM-500: EBCDIC Latin 1
- aliases: [ibm500, Cp500]
-74. Charsetname: IBM-737
- displayName: IBM-737: MS-DOS Greek
- aliases: [ibm737, Cp737]
-75. Charsetname: IBM-775
- displayName: IBM-775: MS-DOS Baltic Rim
- aliases: [ibm775, Cp775]
-76. Charsetname: IBM-808
- displayName: IBM-808: PC Russian (euro)
- aliases: [ibm808, Cp808]
-77. Charsetname: IBM-833
- displayName: IBM-833: EBCDIC SBCS Korean
- aliases: [ibm833, Cp833]
-78. Charsetname: IBM-834
- displayName: IBM-834: EBCDIC DBCS-only Korean
- aliases: [Cp834, ibm834]
-79. Charsetname: IBM-835
- displayName: IBM-835: EBCDIC DBCS-only Taiwan
- aliases: [Cp835, ibm835]
-80. Charsetname: IBM-836
- displayName: IBM-836: EBCDIC SBCS China
- aliases: [Cp836, ibm836]
-81. Charsetname: IBM-837
- displayName: IBM-837: EBCDIC DBCS-only China
- aliases: [Cp837, ibm837]
-82. Charsetname: IBM-838
- displayName: IBM-838: EBCDIC Thai
- aliases: [Cp838, ibm838]
-83. Charsetname: IBM-850
- displayName: IBM-850: PC Latin 1
- aliases: [cspc850multilingual, Cp850, ibm850]
-84. Charsetname: IBM-852
- displayName: IBM-852: PC Latin 2
- aliases: [Cp852, cspcp852, ibm852]
-85. Charsetname: IBM-855
- displayName: IBM-855: PC Cyrillic
- aliases: [Cp855, ibm855]
-86. Charsetname: IBM-856
- displayName: IBM-856: PC Hebrew (old)
- aliases: [Cp856, ibm856]
-87. Charsetname: IBM-857
- displayName: IBM-857: PC Latin 5
- aliases: [csibm857, ibm857, Cp857]
-88. Charsetname: IBM-858
- displayName: IBM-858: PC Latin 1 (euro)
- aliases: [Cp858, ibm858]
-89. Charsetname: IBM-859
- displayName: IBM-859: PC Latin 9
- aliases: [Cp859, ibm859]
-90. Charsetname: IBM-860
- displayName: IBM-860: PC Portugal
- aliases: [ibm860, Cp860]
-91. Charsetname: IBM-861
- displayName: IBM-861: PC Iceland
- aliases: [Cp861, ibm861]
-92. Charsetname: IBM-862
- displayName: IBM-862: PC Israel
- aliases: [Cp862, ibm862]
-93. Charsetname: IBM-863
- displayName: IBM-863: PC Canadian French
- aliases: [ibm863, Cp863]
-94. Charsetname: IBM-864
- displayName: IBM-864: PC Arabic
- aliases: [ibm864, Cp864]
-95. Charsetname: IBM-864S
- displayName: IBM-864S: PC Arabic (shaped)
- aliases: [ibm864S, Cp864S]
-96. Charsetname: IBM-865
- displayName: IBM-865: PC Nordic
- aliases: [Cp865, ibm865]
-97. Charsetname: IBM-866
- displayName: IBM-866: PC Russia
- aliases: [Cp866, ibm866]
-98. Charsetname: IBM-867
- displayName: IBM-867: PC Israel
- aliases: [Cp867, ibm867]
-99. Charsetname: IBM-868
- displayName: IBM-868: PC Urdu
- aliases: [Cp868, ibm868]
-100. Charsetname: IBM-869
- displayName: IBM-869: PC Greece
- aliases: [Cp869, ibm869]
-101. Charsetname: IBM-870
- displayName: IBM-870: EBCDIC Latin 2
- aliases: [Cp870, ibm870]
-102. Charsetname: IBM-871
- displayName: IBM-871: EBCDIC Iceland
- aliases: [Cp871, ibm871]
-103. Charsetname: IBM-874
- displayName: IBM-874: PC Thai
- aliases: [ibm874, Cp874]
-104. Charsetname: IBM-875
- displayName: IBM-875: EBCDIC Greek
- aliases: [Cp875, ibm875]
-105. Charsetname: IBM-897
- displayName: IBM-897: PC SBCS-only Japan
- aliases: [Cp897, ibm897]
-106. Charsetname: IBM-918
- displayName: IBM-918: EBCDIC Urdu
- aliases: [ibm918, Cp918]
-107. Charsetname: IBM-921
- displayName: IBM-921: PC Baltic
- aliases: [ibm921, Cp921]
-108. Charsetname: IBM-922
- displayName: IBM-922: PC Estonian
- aliases: [Cp922, ibm922]
-109. Charsetname: IBM-924
- displayName: IBM-924: EBCDIC Latin 9
- aliases: [ibm924, Cp924]
-110. Charsetname: IBM-927
- displayName: IBM-927: PC DBCS-only Taiwan
- aliases: [ibm927, Cp927]
-111. Charsetname: IBM-930
- displayName: IBM-930: EBCDIC Japan DBCS
- aliases: [Cp930, ibm930]
-112. Charsetname: IBM-932
- displayName: IBM-932: PC Japan SJIS-78 syntax
- aliases: [Cp932, ibm932]
-113. Charsetname: IBM-933
- displayName: IBM-933: EBCDIC Korea DBCS
- aliases: [Cp933, ibm933]
-114. Charsetname: IBM-935
- displayName: IBM-935: EBCDIC China DBCS
- aliases: [Cp935, ibm935]
-115. Charsetname: IBM-937
- displayName: IBM-937: EBCDIC Taiwan DBCS
- aliases: [Cp937, ibm937]
-116. Charsetname: IBM-939
- displayName: IBM-939: EBCDIC Japan Extended DBCS
- aliases: [Cp939, ibm939]
-117. Charsetname: IBM-942
- displayName: IBM-942: PC Japan SJIS-78
- aliases: [ibm942, Cp942]
-118. Charsetname: IBM-942C
- displayName: IBM-942C: PC Japan SJIS-78 syntax
- aliases: [ibm942C, Cp942C]
-119. Charsetname: IBM-943
- displayName: IBM-943: PC Japan SJIS-90
- aliases: [ibm943, Cp943]
-120. Charsetname: IBM-943C
- displayName: IBM-943C: PC Japan SJIS-90 syntax
- aliases: [Cp943C, ibm943C]
-121. Charsetname: IBM-947
- displayName: IBM-947: PC DBCS-only Taiwan
- aliases: [ibm947, Cp947]
-122. Charsetname: IBM-948
- displayName: IBM-948: PC Taiwan SAA
- aliases: [ibm948, Cp948]
-123. Charsetname: IBM-949
- displayName: IBM-949: PC Korea (KS)
- aliases: [Cp949, ibm949]
-124. Charsetname: IBM-949C
- displayName: IBM-949C: PC Korea (KS)
- aliases: [Cp949C, ibm949C]
-125. Charsetname: IBM-950
- displayName: IBM-950: PC Taiwan
- aliases: [ibm950, Cp950]
-126. Charsetname: IBM-951
- displayName: IBM-951: PC DBCS-only Korean
- aliases: [Cp951, ibm951]
-127. Charsetname: IBM-954
- displayName: IBM-954: EUC Japan (full)
- aliases: [Cp954, ibm954]
-128. Charsetname: IBM-954C
- displayName: IBM-954C: EUC Japan (full) with syntax
- aliases: [Cp954c, ibm-eucjp]
-129. Charsetname: IBM-964
- displayName: IBM-964: EUC Taiwan
- aliases: [Cp964, ibm-euctw]
-130. Charsetname: IBM-971
- displayName: IBM-971: EUC DBCS-only Korean
- aliases: [Cp971, ibm971]
-131. Charsetname: ISCII91
- displayName: ISCII91: ISCII Devenagari 91
- aliases: [iscii]
-132. Charsetname: ISO-2022-CN
- displayName: ISO-2022-CN: ISO 2022 Traditional Chinese
- aliases: [iso2022-cn-cns, iso-2022-cn-cns, iso2022cn-cns, iso2022cn, iso2022-cn]
-133. Charsetname: ISO-2022-CN-GB
- displayName: ISO-2022-CN-GB: ISO 2022 Simplified Chinese
- aliases: [iso2022cn-gb, iso2022-cn-gb]
-134. Charsetname: ISO-2022-JP
- displayName: ISO-2022-JP: ISO 2022 Japan
- aliases: [jis, csiso2022jp2, iso2022-jp, csjisencoding, jis-encoding, iso-2022-jp2, iso2022jp]
-135. Charsetname: ISO-2022-KR
- displayName: ISO-2022-KR: ISO 2022 Korea
- aliases: [iso2022-kr, csiso2022kr, iso2022kr]
-136. Charsetname: ISO-8859-1
- displayName: ISO-8859-1: ISO Latin 1 - Western Europe
- aliases: [csisolatin1, iso-ir-100, iso8859-1, ibm-819, iso8859_1, latin1, 8859-1, ibm819, iso-8859-1:1987, Cp819, l1]
-137. Charsetname: ISO-8859-10
- displayName: ISO-8859-10: ISO Latin 6 - Nordic
- aliases: [iso8859-10, ISO_8859-10:1992, latin6, ibm-919, 8859-10, iso-ir-157, l6, iso8859_10, csisolatin6]
-138. Charsetname: ISO-8859-13
- displayName: ISO-8859-13: ISO Latin 7 - Baltic Rim
- aliases: [iso8859-13, iso8859_13, 8859-13]
-139. Charsetname: ISO-8859-14
- displayName: ISO-8859-14: ISO Latin 8 - Celtic
- aliases: [8859-14, iso8859_14, iso-ir-199, ISO_8859-14:1998, latin8, iso8859-14, isoceltic, l8]
-140. Charsetname: ISO-8859-15
- displayName: ISO-8859-15: ISO Latin 9 - Euro
- aliases: [l9, ibm923, csisolatin9, 8859-9, iso8859-15, ibm-923, latin9, iso8859_15, Cp923, iso8859_15_fdis, latin0]
-141. Charsetname: ISO-8859-16
- displayName: ISO-8859-16: ISO Romanian
- aliases: [iso8859_16, iso8859-16, 8859-16]
-142. Charsetname: ISO-8859-2
- displayName: ISO-8859-2: ISO Latin 2 - Central Europe
- aliases: [ibm912, l2, ibm-912, iso-ir-101, csisolatin2, iso-8859-2:1987, latin2, iso8859_2, Cp912, iso8859-2, 8859-2]
-143. Charsetname: ISO-8859-3
- displayName: ISO-8859-3: ISO Latin 3 - Latin/Esperanto
- aliases: [iso-8859-3:1988, csisolatin3, iso8859_3, 8859-3, iso8859-3, Cp913, iso-ir-109, ibm-913, l3, latin3]
-144. Charsetname: ISO-8859-4
- displayName: ISO-8859-4: ISO Latin 4 - Baltic
- aliases: [iso-ir-110, Cp914, l4, ibm-914, latin4, iso8859_4, iso-8859-4:1988, iso8859-4, 8859-4, csisolatin4]
-145. Charsetname: ISO-8859-5
- displayName: ISO-8859-5: ISO Cyrillic
- aliases: [iso8859_5, 8859-5, ibm915, iso-8859-5:1988, csisolatincyrillic, cyrillic, Cp915, iso-ir-144, iso8859-5, ibm-915]
-146. Charsetname: ISO-8859-6
- displayName: ISO-8859-6: ISO Arabic
- aliases: [iso-ir-127, csisolatinarabic, iso8859-6, ibm1089, ecma-114, asmo-708, arabic, ibm-1089, iso8859_6, 8859-6, Cp1089, iso-8859-6:1987]
-147. Charsetname: ISO-8859-6S
- displayName: ISO-8859-6S: ISO Arabic (shaped)
- aliases: [iso8859-6S, iso8859_6S]
-148. Charsetname: ISO-8859-7
- displayName: ISO-8859-7: ISO Greek
- aliases: [iso-8859-7:1987, Cp813, 8859-7, iso-ir-126, ibm-813, iso8859_7, ecma-118, greek8, ibm813, elot-928, csisolatingreek, iso8859-7, greek]
-149. Charsetname: ISO-8859-8
- displayName: ISO-8859-8: ISO Hebrew
- aliases: [iso-ir-138, iso8859-8, ibm-916, iso8859_8, csisolatinhebrew, hebrew, iso-8859-8:1988, ibm916, Cp916, 8859-8]
-150. Charsetname: ISO-8859-9
- displayName: ISO-8859-9: ISO Latin 5 - Turkey
- aliases: [Cp920, latin5, iso-ir-148, 8859-9, l5, csisolatin5, ibm-920, ibm920, iso8859_9, iso8859-9]
-151. Charsetname: JIS0201
- displayName: JIS0201: Japan JIS 0201 (katakana)
- aliases: []
-152. Charsetname: JIS0208
- displayName: JIS0208: Japan JIS 0208
- aliases: []
-153. Charsetname: JIS0212
- displayName: JIS0212: Japan JIS 0212 (extended)
- aliases: []
-154. Charsetname: Johab
- displayName: Johab: PC Korean Johab
- aliases: []
-155. Charsetname: KOI8-R
- displayName: KOI8-R: Internet Russia
- aliases: [ibm-878, cskoi8r, koi8, koi8_r]
-156. Charsetname: KOI8-RU
- displayName: KOI8-RU: Internet Belarus
- aliases: [ibm-1168, koi8_ru]
-157. Charsetname: KOI8-U
- displayName: KOI8-U: Internet Ukraine
- aliases: [ibm-1167, koi8_u]
-158. Charsetname: KSC5601
- displayName: KSC5601: Korea KSC
- aliases: []
-159. Charsetname: MacArabic
- displayName: MacArabic: Apple Arabic
- aliases: []
-160. Charsetname: MacCentralEurope
- displayName: MacCentralEurope: Apple Central Europe
- aliases: [ibm-1282]
-161. Charsetname: MacCroatian
- displayName: MacCroatian: Apple Croatian
- aliases: [ibm-1284]
-162. Charsetname: MacCyrillic
- displayName: MacCyrillic: Apple Cyrillic
- aliases: [ibm-1283]
-163. Charsetname: MacDingbat
- displayName: MacDingbat: Apple Dingbat
- aliases: []
-164. Charsetname: MacGreek
- displayName: MacGreek: Apple Greek
- aliases: [ibm-1280]
-165. Charsetname: MacHebrew
- displayName: MacHebrew: Apple Hebrew
- aliases: []
-166. Charsetname: MacIceland
- displayName: MacIceland: Apple Iceland
- aliases: [ibm-1286]
-167. Charsetname: MacRoman
- displayName: MacRoman: Apple Roman
- aliases: [ibm-1275]
-168. Charsetname: MacRomania
- displayName: MacRomania: Apple Romania
- aliases: [ibm-1285]
-169. Charsetname: MacSymbol
- displayName: MacSymbol: Apple PostScript Symbol
- aliases: [Adobe-Symbol-Encoding, ibm-1038]
-170. Charsetname: MacThai
- displayName: MacThai: Apple Thai
- aliases: []
-171. Charsetname: MacTurkish
- displayName: MacTurkish: Apple Turkish
- aliases: [ibm-1281]
-172. Charsetname: MacUkraine
- displayName: MacUkraine: Apple Ukraine
- aliases: []
-173. Charsetname: PTCP154
- displayName: PTCP154: Windows Cyrillic Asian
- aliases: [IBM-1169, csPTCP154, Cyrillic-Asian, PT154]
-174. Charsetname: Shift_JIS
- displayName: Shift_JIS: Shift JIS Japan
- aliases: []
-175. Charsetname: TIS-620
- displayName: TIS-620: PC Thailand
- aliases: [tis620.2533, tis620]
-176. Charsetname: US-ASCII
- displayName: US-ASCII: ASCII 7 bit
- aliases: [iso-646.irv:1983, ISO646-US, ASCII, default, ISO-646.irv:1991, direct, ascii7, ANSI_X3.4-1986, iso-ir-6, us, ibm-367, 646, csASCII, ANSI_X3.4-1968, Cp367]
-177. Charsetname: UTF-16
- displayName: UTF-16
- aliases: [Unicode, UTF16, UTF_16, UCS-2]
-178. Charsetname: UTF-16BE
- displayName: UTF-16BE: Unicode UTF-16 Big-endian
- aliases: [X-UTF-16BE, UnicodeBigUnmarked, UTF16BE, UTF_16BE, ISO-10646-UCS-2]
-179. Charsetname: UTF-16LE
- displayName: UTF-16LE: Unicode UTF-16 Little-endian
- aliases: [UTF_16LE, UTF16LE, UnicodeLittleUnmarked, X-UTF-16LE]
-180. Charsetname: UTF-32
- displayName: UTF-32: Unicode UTF-32
- aliases: [ISO-10646-UCS-4, UTF32, UCS-4, UTF_32BE]
-181. Charsetname: UTF-32BE
- displayName: UTF-32BE: Unicode UTF-32 Big-endian
- aliases: [UTF32BE, X-UTF-32BE, UTF_32BE]
-182. Charsetname: UTF-32LE
- displayName: UTF-32LE: Unicode UTF-32 Little-endian
- aliases: [UTF_32LE, UTF32LE, X-UTF-32LE]
-183. Charsetname: UTF-8
- displayName: UTF-8: Unicode UTF-8
- aliases: [UTF_8, UTF8]
-184. Charsetname: UTF-8J
- displayName: UTF-8J: Unicode UTF-8 (Java)
- aliases: [UTF8J]
-185. Charsetname: windows-1250
- displayName: windows-1250: Windows Latin 2
- aliases: [ibm-1250, Cp1250]
-186. Charsetname: windows-1251
- displayName: windows-1251: Windows Cyrillic
- aliases: [ibm-1251, Cp1251]
-187. Charsetname: windows-1252
- displayName: windows-1252: Windows Latin 1
- aliases: [Cp1252, ibm-1252]
-188. Charsetname: windows-1253
- displayName: windows-1253: Windows Greek
- aliases: [Cp1253, ibm-1253]
-189. Charsetname: windows-1254
- displayName: windows-1254: Windows Latin 5 (Turkey)
- aliases: [Cp1254, ibm-1254]
-190. Charsetname: windows-1255
- displayName: windows-1255: Windows Hebrew
- aliases: [Cp1255, ibm-1255]
-191. Charsetname: windows-1256
- displayName: windows-1256: Windows Arabic
- aliases: [Cp1256, ibm-1256]
-192. Charsetname: windows-1256S
- displayName: windows-1256S: Windows Arabic (shaped)
- aliases: [ibm-1256s, Cp1256s]
-193. Charsetname: windows-1257
- displayName: windows-1257: Windows Latin 4 (Balttic)
- aliases: [Cp1257, ibm-1257]
-194. Charsetname: windows-1258
- displayName: windows-1258: Windows Vietnamese
- aliases: [ibm-1129, ibm-1258, Cp1258]
-195. Charsetname: windows-874
- displayName: windows-874: Windows Thai
- aliases: [MS874]
-196. Charsetname: windows-932
- displayName: windows-932: Windows Japan
- aliases: [ms_kanji, cswindows31j, MS932, windows-31j]
-197. Charsetname: windows-936
- displayName: windows-936: Windows China
- aliases: [MS936, 936]
-198. Charsetname: windows-949
- displayName: windows-949: Windows Korea
- aliases: [ibm-1361, Cp1361, ibm1361, MS949, ms1361, ksc5601-1992]
-199. Charsetname: windows-950
- displayName: windows-950: Windows Taiwan
- aliases: [MS950]
-200. Charsetname: X-UnicodeBig
- displayName: X-UnicodeBig: Unicode UTF-16 Big-endian with mark
- aliases: [UnicodeBig]
-201. Charsetname: X-UnicodeLittle
- displayName: X-UnicodeLittle: Unicode UTF-16 Little-endian with mark
- aliases: [UnicodeLittle]
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt b/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt
deleted file mode 100644
index 37922ac..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt
+++ /dev/null
@@ -1,343 +0,0 @@
-
-Current Locale: en_US
-
-JRE version: 1.4.2_03 (1.4.2_03-b02)
--- listing properties --
-java.runtime.name=Java(TM) 2 Runtime Environment, Stand...
-sun.boot.library.path=D:\JDKs\j2sdk1.4.2_03\jre\bin
-java.vm.version=1.4.2_03-b02
-java.vm.vendor=Sun Microsystems Inc.
-java.vendor.url=http://java.sun.com/
-path.separator=;
-java.vm.name=Java HotSpot(TM) Client VM
-file.encoding.pkg=sun.io
-user.country=US
-sun.os.patch.level=Service Pack 1
-java.vm.specification.name=Java Virtual Machine Specification
-user.dir=D:\builds\Daily\eclipse-SDK-I20040304...
-java.runtime.version=1.4.2_03-b02
-java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment
-java.endorsed.dirs=D:\JDKs\j2sdk1.4.2_03\jre\lib\endorsed
-os.arch=x86
-java.io.tmpdir=C:\DOCUME~1\DAVIDW~1.DMW\LOCALS~1\Temp\
-line.separator=
-
-java.vm.specification.vendor=Sun Microsystems Inc.
-user.variant=
-os.name=Windows XP
-sun.java2d.fontpath=
-java.library.path=D:\JDKs\j2sdk1.4.2_03\bin;.;C:\WINDOW...
-java.specification.name=Java Platform API Specification
-java.class.version=48.0
-java.util.prefs.PreferencesFactory=java.util.prefs.WindowsPreferencesFac...
-os.version=5.1
-user.home=C:\Documents and Settings\davidw.DMW2T23
-user.timezone=
-java.awt.printerjob=sun.awt.windows.WPrinterJob
-file.encoding=Cp1252
-java.specification.version=1.4
-user.name=davidw
-java.class.path=D:\builds\Daily\eclipse-SDK-I20040304...
-java.vm.specification.version=1.0
-sun.arch.data.model=32
-java.home=D:\JDKs\j2sdk1.4.2_03\jre
-java.specification.vendor=Sun Microsystems Inc.
-user.language=en
-awt.toolkit=sun.awt.windows.WToolkit
-java.vm.info=mixed mode
-java.version=1.4.2_03
-java.ext.dirs=D:\JDKs\j2sdk1.4.2_03\jre\lib\ext
-sun.boot.class.path=D:\JDKs\j2sdk1.4.2_03\jre\lib\rt.jar;...
-java.vendor=Sun Microsystems Inc.
-file.separator=\
-java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport...
-sun.cpu.endian=little
-sun.io.unicode.encoding=UnicodeLittle
-sun.cpu.isalist=pentium i486 i386
-Available Locales
-ar
-ar_AE
-ar_BH
-ar_DZ
-ar_EG
-ar_IQ
-ar_JO
-ar_KW
-ar_LB
-ar_LY
-ar_MA
-ar_OM
-ar_QA
-ar_SA
-ar_SD
-ar_SY
-ar_TN
-ar_YE
-hi_IN
-iw
-iw_IL
-ja
-ja_JP
-ko
-ko_KR
-th
-th_TH
-th_TH_TH
-zh
-zh_CN
-zh_HK
-zh_TW
-be
-be_BY
-bg
-bg_BG
-ca
-ca_ES
-cs
-cs_CZ
-da
-da_DK
-de
-de_AT
-de_CH
-de_DE
-de_LU
-el
-el_GR
-en_AU
-en_CA
-en_GB
-en_IE
-en_IN
-en_NZ
-en_ZA
-es
-es_AR
-es_BO
-es_CL
-es_CO
-es_CR
-es_DO
-es_EC
-es_ES
-es_GT
-es_HN
-es_MX
-es_NI
-es_PA
-es_PE
-es_PR
-es_PY
-es_SV
-es_UY
-es_VE
-et
-et_EE
-fi
-fi_FI
-fr
-fr_BE
-fr_CA
-fr_CH
-fr_FR
-fr_LU
-hr
-hr_HR
-hu
-hu_HU
-is
-is_IS
-it
-it_CH
-it_IT
-lt
-lt_LT
-lv
-lv_LV
-mk
-mk_MK
-nl
-nl_BE
-nl_NL
-no
-no_NO
-no_NO_NY
-pl
-pl_PL
-pt
-pt_BR
-pt_PT
-ro
-ro_RO
-ru
-ru_RU
-sh
-sh_YU
-sk
-sk_SK
-sl
-sl_SI
-sq
-sq_AL
-sr
-sr_YU
-sv
-sv_SE
-tr
-tr_TR
-uk
-uk_UA
-en
-en_US
-file.encoding.pkg: sun.io
-file.encoding: Cp1252
-
-
-Available Charsets
-1. Charsetname: Big5
- displayName: Big5
- aliases: [csBig5]
-2. Charsetname: Big5-HKSCS
- displayName: Big5-HKSCS
- aliases: [big5-hkscs, Big5_HKSCS, big5hkscs]
-3. Charsetname: EUC-JP
- displayName: EUC-JP
- aliases: [eucjis, x-eucjp, csEUCPkdFmtjapanese, eucjp, Extended_UNIX_Code_Packed_Format_for_Japanese, x-euc-jp, euc_jp]
-4. Charsetname: EUC-KR
- displayName: EUC-KR
- aliases: [ksc5601, 5601, ksc5601_1987, ksc_5601, ksc5601-1987, euc_kr, ks_c_5601-1987, euckr, csEUCKR]
-5. Charsetname: GB18030
- displayName: GB18030
- aliases: [gb18030-2000]
-6. Charsetname: GBK
- displayName: GBK
- aliases: [windows-936, CP936]
-7. Charsetname: ISO-2022-JP
- displayName: ISO-2022-JP
- aliases: [jis, jis_encoding, csjisencoding, csISO2022JP, iso2022jp]
-8. Charsetname: ISO-2022-KR
- displayName: ISO-2022-KR
- aliases: [ISO2022KR, csISO2022KR]
-9. Charsetname: ISO-8859-1
- displayName: ISO-8859-1
- aliases: [iso-ir-100, 8859_1, ISO_8859-1, ISO8859_1, 819, csISOLatin1, IBM-819, ISO_8859-1:1987, latin1, cp819, ISO8859-1, IBM819, ISO_8859_1, l1]
-10. Charsetname: ISO-8859-13
- displayName: ISO-8859-13
- aliases: [iso8859_13]
-11. Charsetname: ISO-8859-15
- displayName: ISO-8859-15
- aliases: [8859_15, csISOlatin9, IBM923, cp923, 923, L9, IBM-923, ISO8859-15, LATIN9, ISO_8859-15, LATIN0, csISOlatin0, ISO8859_15_FDIS, ISO-8859-15]
-12. Charsetname: ISO-8859-2
- displayName: ISO-8859-2
- aliases: [l2, iso-ir-101, ISO_8859-2:1987, ISO_8859-2, latin2, csISOLatin2, iso8859_2]
-13. Charsetname: ISO-8859-3
- displayName: ISO-8859-3
- aliases: []
-14. Charsetname: ISO-8859-4
- displayName: ISO-8859-4
- aliases: [iso-ir-110, l4, latin4, csISOLatin4, iso8859_4, ISO_8859-4:1988, ISO_8859-4]
-15. Charsetname: ISO-8859-5
- displayName: ISO-8859-5
- aliases: [cyrillic, iso8859_5, ISO_8859-5, iso-ir-144, csISOLatinCyrillic]
-16. Charsetname: ISO-8859-6
- displayName: ISO-8859-6
- aliases: []
-17. Charsetname: ISO-8859-7
- displayName: ISO-8859-7
- aliases: [greek8, ECMA-118, sun_eu_greek, ELOT_928, ISO_8859-7:1987, iso-ir-126, ISO_8859-7, iso8859_7, greek, csISOLatinGreek]
-18. Charsetname: ISO-8859-8
- displayName: ISO-8859-8
- aliases: []
-19. Charsetname: ISO-8859-9
- displayName: ISO-8859-9
- aliases: [iso-ir-148, latin5, l5, ISO_8859-9, ISO_8859-9:1989, csISOLatin5, iso8859_9]
-20. Charsetname: JIS_X0201
- displayName: JIS_X0201
- aliases: [JIS_X0201, X0201, JIS0201, csHalfWidthKatakana]
-21. Charsetname: JIS_X0212-1990
- displayName: JIS_X0212-1990
- aliases: [jis_x0212-1990, iso-ir-159, x0212, JIS0212, csISO159JISX02121990]
-22. Charsetname: KOI8-R
- displayName: KOI8-R
- aliases: [koi8, cskoi8r]
-23. Charsetname: Shift_JIS
- displayName: Shift_JIS
- aliases: [shift-jis, x-sjis, ms_kanji, shift_jis, csShiftJIS, sjis, pck]
-24. Charsetname: TIS-620
- displayName: TIS-620
- aliases: []
-25. Charsetname: US-ASCII
- displayName: US-ASCII
- aliases: [ISO646-US, IBM367, ASCII, cp367, ascii7, ANSI_X3.4-1986, iso-ir-6, us, 646, iso_646.irv:1983, csASCII, ANSI_X3.4-1968, ISO_646.irv:1991]
-26. Charsetname: UTF-16
- displayName: UTF-16
- aliases: [UTF_16]
-27. Charsetname: UTF-16BE
- displayName: UTF-16BE
- aliases: [X-UTF-16BE, UTF_16BE, ISO-10646-UCS-2]
-28. Charsetname: UTF-16LE
- displayName: UTF-16LE
- aliases: [UTF_16LE, X-UTF-16LE]
-29. Charsetname: UTF-8
- displayName: UTF-8
- aliases: [UTF8]
-30. Charsetname: windows-1250
- displayName: windows-1250
- aliases: [cp1250]
-31. Charsetname: windows-1251
- displayName: windows-1251
- aliases: [cp1251]
-32. Charsetname: windows-1252
- displayName: windows-1252
- aliases: [cp1252]
-33. Charsetname: windows-1253
- displayName: windows-1253
- aliases: [cp1253]
-34. Charsetname: windows-1254
- displayName: windows-1254
- aliases: [cp1254]
-35. Charsetname: windows-1255
- displayName: windows-1255
- aliases: []
-36. Charsetname: windows-1256
- displayName: windows-1256
- aliases: []
-37. Charsetname: windows-1257
- displayName: windows-1257
- aliases: [cp1257]
-38. Charsetname: windows-1258
- displayName: windows-1258
- aliases: []
-39. Charsetname: windows-31j
- displayName: windows-31j
- aliases: [csWindows31J, windows-932, MS932]
-40. Charsetname: x-EUC-CN
- displayName: x-EUC-CN
- aliases: [gb2312, EUC_CN, euccn, euc-cn, gb2312-80, gb2312-1980]
-41. Charsetname: x-euc-jp-linux
- displayName: x-euc-jp-linux
- aliases: [euc_jp_linux, euc-jp-linux]
-42. Charsetname: x-EUC-TW
- displayName: x-EUC-TW
- aliases: [cns11643, euc_tw, EUC-TW, euctw]
-43. Charsetname: x-ISCII91
- displayName: x-ISCII91
- aliases: [iscii, ST_SEV_358-88, iso-ir-153, csISO153GOST1976874, ISCII91]
-44. Charsetname: x-JIS0208
- displayName: x-JIS0208
- aliases: [JIS_C6626-1983, JIS0208, csISO87JISX0208, x0208, JIS_X0208-1983, iso-ir-87]
-45. Charsetname: x-Johab
- displayName: x-Johab
- aliases: [johab, ms1361, ksc5601-1992, ksc5601_1992]
-46. Charsetname: x-MS950-HKSCS
- displayName: x-MS950-HKSCS
- aliases: [MS950_HKSCS]
-47. Charsetname: x-mswin-936
- displayName: x-mswin-936
- aliases: [ms936, ms_936]
-48. Charsetname: x-windows-949
- displayName: x-windows-949
- aliases: [windows949, ms_949, ms949]
-49. Charsetname: x-windows-950
- displayName: x-windows-950
- aliases: [windows-950, ms950]
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties b/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties
deleted file mode 100644
index 0765ca5..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java
deleted file mode 100644
index fe5cf3e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.MalformedInputException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.internal.encoding.CodedReaderCreator;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-/**
- * This class is intended to be executed only at development time, and it
- * creates the class to JUnit test all the files found in the testfiles
- * directory.
- */
-public class CreateCodedReaderTester extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final String TESTFILES_ZIPFILE_NAME = "testfiles.zip"; //$NON-NLS-1$
- private static final boolean DEBUG = false;
- private static final String TEST_FILE_DIR = "testfiles"; //$NON-NLS-1$
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.xml.tests.encoding"; //$NON-NLS-1$
- static IProject fTestProject;
- private static int nSetups = 0;
- private static final String currentPlatformCharset = getPlatformDefault();
- private boolean RECREATE_FILES = false;
-
- /**
- *
- */
- public CreateCodedReaderTester() {
- super();
- //System.out.println(currentPlatformCharset);
- }
-
- /**
- * @return
- */
- private static String getPlatformDefault() {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- return platformDefault;
- }
-
- public static void main(String[] args) {
- // try {
- // new CreateCodedReaderTester().doCreateAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer testFiles = testProject.getFolder("testfiles");
- // assertTrue(testFiles.exists());
- // IResource[] allFolders = testFiles.members();
- // assertNotNull(allFolders);
- }
-
- private void createTestMethodSource(int count, String filePathAndName, String detectedCharsetName, String javaCharsetName, String expectedException) {
- String javaCharsetNameOrKey = javaCharsetName;
- if (null != javaCharsetNameOrKey && javaCharsetNameOrKey.equals(currentPlatformCharset))
- javaCharsetNameOrKey = "expectPlatformCharset";
- System.out.println("public void testFile" + count + " () throws CoreException, IOException {" + " doTest( \"" + javaCharsetNameOrKey + "\", \"" + detectedCharsetName + "\", \"" + filePathAndName + "\", " + expectedException + "); }");
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- public void testCreateAllFiles() throws CoreException, IOException {
- if (RECREATE_FILES) {
- List allFiles = TestsPlugin.getAllTestFiles(TEST_FILE_DIR);
- URL outputDirURL = TestsPlugin.getInstallLocation();
- File zipoutFile = new File(outputDirURL.getPath(), TESTFILES_ZIPFILE_NAME);
- java.io.FileOutputStream zipOut = new FileOutputStream(zipoutFile);
- ZipOutputStream zipOutputStream = new ZipOutputStream(zipOut);
- int count = 1;
- for (Iterator iter = allFiles.iterator(); iter.hasNext();) {
- File file = (File) iter.next();
- createZipEntry(zipOutputStream, file);
- CodedReaderCreator codedReaderCreator = new CodedReaderCreator();
- codedReaderCreator.set(file.getName(), new FileInputStream(file));
- String detectedCharsetName = null;
- String javaCharsetName = null;
- String expectedException = null;
- try {
- // just used for debug info, but can throw exception
- javaCharsetName = codedReaderCreator.getEncodingMemento().getJavaCharsetName();
- detectedCharsetName = codedReaderCreator.getEncodingMemento().getDetectedCharsetName();
- }
- catch (UnsupportedCharsetExceptionWithDetail e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- catch (MalformedInputException e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- catch (IllegalCharsetNameException e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- String subpath = getSubPathName(file);
- createTestMethodSource(count, subpath, detectedCharsetName, javaCharsetName, expectedException);
- count++;
- }
- zipOutputStream.close();
- zipOut.close();
- assertTrue(true);
- }
- }
-
- private String getSubPathName(File file) {
- String path = file.getPath();
- int lastIndex = path.lastIndexOf(TEST_FILE_DIR);
- String subpath = path.substring(lastIndex);
- subpath = subpath.replace('\\', '/');
- return subpath;
- }
-
- /**
- * @param zipOutputStream
- * @param element
- */
- private void createZipEntry(ZipOutputStream zipOutputStream, File file) throws IOException {
- String subPathName = getSubPathName(file);
- ZipEntry zipEntry = new ZipEntry(subPathName);
- zipOutputStream.putNextEntry(zipEntry);
- InputStream inputStream = new FileInputStream(file);
- int nRead = 0;
- byte[] buffer = new byte[1024 * 8];
- while (nRead != -1) {
- nRead = inputStream.read(buffer);
- if (nRead > 0) {
- zipOutputStream.write(buffer, 0, nRead);
- }
- }
- zipOutputStream.flush();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
deleted file mode 100644
index f77bac9..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.tests.encoding.properties.TestCommonNames;
-import org.eclipse.wst.xml.tests.encoding.properties.TestOverrides;
-import org.eclipse.wst.xml.tests.encoding.read.TestCodedReader;
-import org.eclipse.wst.xml.tests.encoding.read.TestCodedReaderOnGennedFiles;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentDescription;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDescriptionOnGennedFiles;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetectionForXML;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypes;
-import org.eclipse.wst.xml.tests.encoding.write.TestCodedWrite;
-import org.eclipse.wst.xml.tests.encoding.xml.XMLEncodingTests;
-import org.eclipse.wst.xml.tests.encoding.xml.XMLHeadTokenizerTester;
-
-
-public class EncodingTestSuite extends TestSuite {
-
- // FIXME: commented out lang. spec. tests, until all migrated to org.eclipse
- private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class, TestContentTypeDetectionForXML.class};
- //private static Class[] classes = new Class[]{TestOverrides.class, CSSEncodingTester.class, CSSHeadTokenizerTester.class, HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, XMLMalformedInputTests.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentTypeDetection.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
- public EncodingTestSuite() {
- super("Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- * @param name
- */
- public EncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param theClass
- */
- public EncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param name
- */
- public EncodingTestSuite(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new EncodingTestSuite();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
deleted file mode 100644
index 1ad2948..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-class FileUtil {
- private static String currentWorkspace = "dev0725";
- private static boolean printedOnce = false;
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- String installPath = "/builds/Workspaces/" + currentWorkspace + "/org.eclipse.wst.xml.tests.encoding/";
- URL url = new URL("file://" + installPath);
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!printedOnce) {
- System.out.println("Output written to " + dir.getAbsolutePath());
- printedOnce = true;
- }
-
- if (!dir.exists()) {
- dir.mkdirs();
- }
- return file;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java
deleted file mode 100644
index 327f4e6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.tests.encoding;
-
-
-public class GenerateFiles {
-
- public static final String getMainDirectoryBasedOnVMName() {
- String mainDirectory = "testfiles/genedFiles-" + getJavaVersion();
- return mainDirectory;
- }
-
- private static final String getJavaVersion() {
- String name = null; //System.getProperty("java.fullversion");
- if (name == null) {
- name = System.getProperty("java.version") + " (" + System.getProperty("java.runtime.version") + ")";
- }
- return name;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java
deleted file mode 100644
index 4dd0e75..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.content.IContentDescription;
-
-/**
- * The purpose and logic of this class is to create small "XML files" of
- * various, known encodings, write them to files, and in later tests, be sure
- * appropriate encoding can be detected, and read in and intact characters.
- */
-public class GenerateXMLFiles extends GenerateFiles {
- private String LF = "\n";
- private String CR = "\r";
- private String CRLF = CR + LF;
- // different text strings for comparisons
- private String textUS_ASCII_LF = "abcdefghijklmnopqrstuvwxyz\n1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private String textUS_ASCII_CRLF = "abcdefghijklmnopqrstuvwxyz\r\n1234567890\r\nABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private boolean DEBUG = true;
- private boolean DEBUGCRLF = false;
- private boolean DEBUGINFO = true;
-
-
- public GenerateXMLFiles() {
- super();
- }
-
- public static void main(String[] args) {
- //junit.textui.TestRunner.run(GenerateXMLFiles.class);
- GenerateXMLFiles thisApp = new GenerateXMLFiles();
- try {
- //thisApp.generateOriginalFiles();
- thisApp.generateAllFilesForCurrentVM();
- }
- catch (IOException e) {
-
- e.printStackTrace();
- }
- }
-
- private void generateAllFilesForCurrentVM() throws IOException {
- Map allCharsetMap = Charset.availableCharsets();
- Set allKeys = allCharsetMap.keySet();
- Object[] allcharsets = allKeys.toArray();
- String[] allcharsetNames = new String[allcharsets.length];
- for (int i = 0; i < allcharsets.length; i++) {
- allcharsetNames[i] = allcharsets[i].toString();
-
- }
- //createFiles(allcharsetNames, false);
- createFiles(allcharsetNames, true);
-
- }
-
- private void createFiles(String[] charsetnames, boolean useCRLF) throws FileNotFoundException, IOException {
-
- String charsetName = null;
- Writer out = null;
- String mainDirectory = getMainDirectoryBasedOnVMNameAndFileExtension();
- List charsetFilesWritten = new ArrayList();
- for (int i = 0; i < charsetnames.length; i++) {
- try {
-
-
- charsetName = charsetnames[i];
-
- Charset charset = Charset.forName(charsetName);
- CharsetEncoder charsetEncoder = charset.newEncoder();
- charsetEncoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetEncoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- String header = getHeaderStart() + charsetName + getHeaderEnd();
- String fulltext = null;
- if (useCRLF) {
- fulltext = header + textUS_ASCII_CRLF;
- }
- else {
- fulltext = header + textUS_ASCII_LF;
- }
-
- if (!isEbcidic(charsetName, charsetEncoder)) {
- if (charsetEncoder.canEncode(fulltext)) {
- // if (canEncodeCRLF(charsetName, charsetEncoder)
- // &&
- // canEncodeSimpleString(charsetName,
- // charsetEncoder, "<?") &&
- // charsetEncoder.canEncode(fulltext)) {
- String outputfilename = "test-" + charsetName + ".xml";
- File outFile = FileUtil.makeFileFor(mainDirectory, outputfilename, null);
- //System.out.println(outFile.getAbsolutePath());
- OutputStream outputStream = new FileOutputStream(outFile);
- ByteArrayOutputStream bytesout = new ByteArrayOutputStream();
-
- Writer fileWriter = new OutputStreamWriter(outputStream, charsetEncoder);
- // this byte writer is created just to be able to
- // count precise bytes.
- Writer byteWriter = new OutputStreamWriter(bytesout, charsetEncoder);
-
- supplyBOMs(charsetName, outputStream, bytesout);
-
- out = new BufferedWriter(fileWriter);
-
-
- out.write(fulltext);
- byteWriter.write(fulltext);
- out.close();
- byteWriter.flush();
- // if we made is this far, with no exceptions,
- // etc.,
- // then
- // must have been
- // really written.
- String writtenRecord = charsetName;
- charsetFilesWritten.add(writtenRecord);
- if (DEBUG) {
- printDebugInfo(useCRLF, header, outputfilename, bytesout);
- }
- }
- else {
- if (DEBUGINFO) {
- System.out.println(" *** could not convert sample ascii text for " + charsetName);
- }
- }
- }
- }
-
- catch (IOException e) {
- if (DEBUGINFO) {
- System.out.println(" ***** could not generate for " + charsetName);
- String msg = e.getMessage();
- if (msg == null)
- msg = "";
- System.out.println(" due to " + e.getClass().getName() + " " + msg);
- }
- }
- catch (Exception e) {
- if (DEBUGINFO) {
- System.out.println(" ***** could not generate for " + charsetName);
- String msg = e.getMessage();
- if (msg == null)
- msg = "";
- System.out.println(" due to " + e.getClass().getName() + " " + msg);
- }
- }
- finally {
- if (out != null) {
- out.close();
- }
- }
- }
-
-
- // now create file that summarizes what was written
- // suitable to paste as method in test class
- File outFile = FileUtil.makeFileFor(mainDirectory, "testMethods.text", null);
- FileWriter outproperties = new FileWriter(outFile);
- outproperties.write(charsetFilesWritten.size() + CRLF);
- Iterator items = charsetFilesWritten.iterator();
- int n = 0;
- while (items.hasNext()) {
- String itemCreated = (String) items.next();
- String testMethod = createMethod(n++, itemCreated);
- outproperties.write(testMethod + CRLF);
- }
- outproperties.close();
-
- }
-
- /**
- * I thought this used to be automatic, but doesn't seem to be now?!
- */
- private void supplyBOMs(String charsetName, OutputStream outputStream, ByteArrayOutputStream bytesout) throws IOException {
- byte[] nullBytes = new byte[]{0x00, 0x00};
- if (charsetName.equals("UTF-16")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-16LE")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("X-UnicodeLittle")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-16BE")) {
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- if (charsetName.equals("X-UnicodeBig")) {
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- if (charsetName.equals("UTF-32")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-32LE")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-32BE")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- }
-
- /**
- * @param i
- * @param itemCreated
- */
- private String createMethod(int i, String itemCreated) {
- String template = " public void testFile" + i + "() throws CoreException, IOException {\r\n" + " String charsetName = \"" + itemCreated + "\";\r\n" + " doGenTest(charsetName);\r\n" + " }";
- return template;
- }
-
- private void printDebugInfo(boolean useCRLF, String header, String outputfilename, ByteArrayOutputStream bytesout) {
- byte[] bytes = bytesout.toByteArray();
- int nBytes = bytes.length;
- int nChars = 0;
- if (useCRLF) {
- nChars = header.length() + textUS_ASCII_CRLF.length();
- }
- else {
- nChars = header.length() + textUS_ASCII_LF.length();
- }
-
- System.out.println("Wrote " + nChars + " characters and " + nBytes + " bytes to " + outputfilename);
- }
-
- // TODO: never used
- boolean canEncodeSimpleString(String charsetName, CharsetEncoder charsetEncocder, String simpleString) {
- // this method added since some encoders don't report that they can't
- // encode something, but they obviously
- // can't, at least in the normal meaning of the word.
- // This seems to mostly apply to some IBM varieties where, apparently,
- // the input can't be interpreted at all without knowing encoding
- // (that is
- // could not be used for content based encoding).
- boolean result = false;
-
- String newAsciiString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- }
- catch (UnsupportedEncodingException e) {
- // impossible, since checked already
- throw new Error(e);
- }
- result = simpleString.equals(newAsciiString);
- if (!result) {
- if (charsetEncocder.maxBytesPerChar() != 1) {
- // don't check mulitbyte encoders, just assume true (for now).
- result = true;
- if (charsetEncocder.maxBytesPerChar() == 4) {
- //except, let's just exclude four byte streams, for now.
- result = false;
- if (charsetEncocder.averageBytesPerChar() == 2) {
- // except, for some reason UTF has max bytes of 4
- // (average bytes of 2).
- result = false;
- }
- }
- }
- }
-
- return result;
- }
-
- /**
- * A very heuristic method. Should have table, someday.
- */
- private boolean isEbcidic(String charsetName, CharsetEncoder charsetEncocder) {
- boolean result = false;
- String simpleString = "<?";
- String newAsciiString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- }
- catch (UnsupportedEncodingException e) {
- // impossible, since checked already
- throw new Error(e);
- }
- // experimenting/debugging showed the known ebcidic onces always
- // "mis" tranlated to characters L and o.
- result = "Lo".equals(newAsciiString);
- if (result) {
- System.out.println(charsetName + " assumed to be Edcidic");
- }
- return result;
- }
-
- /**
- * @param charset
- */
- boolean canEncodeCRLF(String charsetName, CharsetEncoder charsetEncoder) {
- boolean result = true;
- //String charsetCononicalName = charsetEncoder.charset().name();
- if (!charsetEncoder.canEncode(LF)) {
- if (DEBUGCRLF) {
- String stringName = "LF";
- String testString = LF;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode LF for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- if (!charsetEncoder.canEncode(CR)) {
- if (DEBUGCRLF) {
- String stringName = "CR";
- String testString = CR;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode CR for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- if (!charsetEncoder.canEncode(CRLF)) {
- if (DEBUGCRLF) {
- String stringName = "CRLF";
- String testString = CRLF;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode CRLF for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- return result;
-
- }
-
- private void exploreConversion(String charsetName, String stringName, String testString) throws Error {
- try {
- String newLF = new String(testString.getBytes(charsetName));
- System.out.print("old " + stringName + " (dec): ");
- dumpString(System.out, testString);
- System.out.println();
- System.out.print("new " + stringName + " (dec): ");
- dumpString(System.out, newLF);
- System.out.println();
- }
- catch (UnsupportedEncodingException e) {
- //should never happen, already checked
- throw new Error(e);
- }
- }
-
- /**
- * @param out
- * @param lf2
- */
- private void dumpString(PrintStream out, String lf2) {
- for (int i = 0; i < lf2.length(); i++) {
- out.print((int) lf2.charAt(i) + " ");
- }
-
- }
-
- public final static String getMainDirectoryBasedOnVMNameAndFileExtension() {
- String mainDirectory = getMainDirectoryBasedOnVMName() + "/xml";
- return mainDirectory;
- }
-
- private String getHeaderStart() {
- return "<?xml version=\"1.0\" encoding=\"";
- }
-
- private String getHeaderEnd() {
- return "\"?>";
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java
deleted file mode 100644
index eef0edd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Small class to list charset detected for a particular VM. Simple run as Java
- * Applications to get output to standard out.
- */
-public class ListCharsets {
- private final String tab = "\t";
-
- public static void main(String[] args) {
-
- ListCharsets thisApp = new ListCharsets();
-
- System.out.println();
-
- System.out.println("Current Locale: " + Locale.getDefault());
-
- System.out.println();
-
- String name = System.getProperty("java.fullversion");
- if (name == null) {
- name = System.getProperty("java.version") + " (" + System.getProperty("java.runtime.version") + ")";
- }
- System.out.println("JRE version: " + name);
-
- System.getProperties().list(System.out);
-
- thisApp.listOfLocales();
-
- System.out.println("file.encoding.pkg: " + System.getProperty("file.encoding.pkg"));
- System.out.println("file.encoding: " + System.getProperty("file.encoding"));
- System.out.println();
-
- for (int i = 0; i < args.length; i++) {
- System.out.println(args[i]);
- }
- System.out.println();
- thisApp.listOfCharsets();
- }
-
- private void listOfLocales() {
- System.out.println("Available Locales");
- Locale[] locales = Locale.getAvailableLocales();
- for (int i = 0; i < locales.length; i++) {
- System.out.println(locales[i]);
-
- }
-
- }
-
- private void listOfCharsets() {
- System.out.println("Available Charsets");
- int count = 0;
- Map map = Charset.availableCharsets();
- Iterator it = map.keySet().iterator();
- while (it.hasNext()) {
- count++;
- // Get charset name
- String charsetName = (String) it.next();
- System.out.println(count + ". " + " Charsetname: " + charsetName);
- // Get charset
- Charset charset = Charset.forName(charsetName);
- System.out.println(tab + "displayName: " + charset.displayName(Locale.getDefault()));
- Set set = charset.aliases();
- System.out.println(tab + "aliases: " + set);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
deleted file mode 100644
index ef9c617..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.core.internal.contenttype.ByteReader;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- // The shared instance.
- private static TestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.xml.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * @param topDir
- * @return
- */
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- public static Reader getByteReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new ByteReader(new BufferedInputStream(new FileInputStream(location)));
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java
deleted file mode 100644
index 4fc24b3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.pref;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-
-public class TestPreferences extends TestCase {
-
- /**
- * @param preferences
- * @throws BackingStoreException
- */
- private static void printChildren(Preferences preferences) throws BackingStoreException {
- System.out.println("\t" + preferences.absolutePath());
- String [] keys = preferences.keys();
- printKeys(keys);
- String[] children = preferences.childrenNames();
- printChildren(children);
- for (int i = 0; i < children.length; i++) {
- String child = children[i];
- Preferences subPreferences = preferences.node(child);
- String [] subkeys = subPreferences.keys();
- System.out.println();
- System.out.println(child);
- System.out.println();
- printKeys(subkeys);
- }
- }
- static private void printChildren(String[] children) {
- printStringArray(children, "\t");
- }
-
- /**
- * @param keys
- */
- private static void printKeys(String[] keys) {
- printStringArray(keys, "\t\t");
-
- }
-
- static private void printStringArray(String[] array, String tabChars) {
- for (int i = 0; i < array.length; i++) {
- String string = array[i];
- System.out.println(tabChars + string);
- }
- }
-
- private boolean DEBUG = true;
-
- private void displayPreferenceTree() {
- IEclipsePreferences eclipsePreferences = Platform.getPreferencesService().getRootNode();
-
-
- try {
- String[] children = eclipsePreferences.childrenNames();
- System.out.println(eclipsePreferences.absolutePath());
- printChildren(children);
-
- for (int i = 0; i < children.length; i++) {
- String string = children[i];
- Preferences preferences = eclipsePreferences.node(string);
- printChildren(preferences);
-
-
- }
-
- }
- catch (BackingStoreException e) {
- e.printStackTrace();
- }
-
- }
-
- public void testAccess() {
- if (DEBUG) {
- displayPreferenceTree();
- }
- // always ok if no exceptions thrown
- assertTrue(true);
- }
-
- public void testContentBasedPrefHTML() {
- IContentType contentType = Platform.getContentTypeManager().findContentTypeFor("test.html");
- Preferences preferences = ContentBasedPreferenceGateway.getPreferences(contentType);
- assertNotNull(preferences);
- }
-
- public void testContentBasedPrefXML() {
- IContentType contentType = Platform.getContentTypeManager().findContentTypeFor("test.xml");
- Preferences preferences = ContentBasedPreferenceGateway.getPreferences(contentType);
- assertNotNull(preferences);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java
deleted file mode 100644
index 1ff78d4..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-
-public class TestCommonNames extends TestCase {
-
- private static final boolean DEBUG = false;
-
- public void testCommonNames() {
- String[] names = CommonCharsetNames.getCommonCharsetNames();
- assertTrue("common charset names could not be loaded", names != null && names.length > 0);
- if (DEBUG) {
- for (int i = 0; i < names.length; i++) {
- String name = names[i];
- String displayName = CommonCharsetNames.getDisplayString(name);
- System.out.println( name + " " + displayName);
- }
- }
- }
-
- public void doTestDefaultIanaNames(String stringToCheck, String defaultName, String expected) {
- String actual = CommonCharsetNames.getPreferredDefaultIanaName(stringToCheck, defaultName);
- assertEquals("default IANA name test failed for " + stringToCheck, expected, actual);
- }
-
- public void testASCII() {
- doTestDefaultIanaNames("ASCII", "UTF-8", "US-ASCII");
- }
-
- public void testCp1252() {
- doTestDefaultIanaNames("Cp1252", "UTF-8", "ISO-8859-1");
- }
-
- public void testMS950() {
- doTestDefaultIanaNames("MS950", "UTF-8", "BIG5");
- }
-
- public void testCp1256() {
- doTestDefaultIanaNames("Cp1256", "UTF-8", "windows-1256");
- }
-
- public void testMS949() {
- doTestDefaultIanaNames("MS949", "UTF-8", "EUC-KR");
- }
-
- public void testEUC_JP() {
- doTestDefaultIanaNames("EUC-JP", "UTF-8", "EUC-JP");
- }
-
- public void testTotallyFake() {
- doTestDefaultIanaNames("totallyFake", "UTF-8", "UTF-8");
- }
-
- public void testSystemEncoding() {
- String systemEnc = System.getProperty("file.encoding");
- if (systemEnc != null) {
- String actual = CommonCharsetNames.getPreferredDefaultIanaName(systemEnc, "UTF-8");
- assertNotNull("default IANA name test failed for system encoding " + systemEnc, actual);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java
deleted file mode 100644
index 7d8423b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-
-
-public class TestDisplayNames extends TestCase {
- private static final boolean DEBUG = false;
-
- public void testCommonName() {
- String displayName = CommonCharsetNames.getDisplayString("ISO-8859-2");
- assertNotNull("display name for charset could not be retrieved", displayName);
- if (DEBUG) {
- System.out.println(displayName);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java
deleted file mode 100644
index c5400a8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-public class TestOverrides extends TestCase {
-
- private static final boolean DEBUG = false;
-
- public String doTestOverride(String stringToCheck) {
-
- String charset = CodedIO.getAppropriateJavaCharset(stringToCheck);
- assertNotNull("override test failed for " + stringToCheck, charset);
- return charset;
- }
-
- public void testISO88598I() {
- String result = doTestOverride("ISO-8859-8-I");
- assertEquals("mapping override not correct for ISO-8859-8-I", "ISO-8859-8", result);
- if (DEBUG) {
- System.out.println(result);
- }
- }
-
- public void testXSJIS() {
- String result = doTestOverride("X-SJIS");
- assertEquals("mapping override not correct for X-SJIS", "Shift_JIS", result);
- if (DEBUG) {
- System.out.println(result);
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java
deleted file mode 100644
index f436de3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.wst.sse.core.internal.encoding.CodedReaderCreator;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestCodedReader extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final boolean DEBUG = false;
- private static final boolean DEBUG_TEST_DETAIL = false;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.encoding.resource.newtests";
- static IProject fTestProject;
- protected static int nSetups = 0;
-
- private String massageCharset(String foundCharset) {
- String result = foundCharset;
- if ("UTF-16LE".equals(foundCharset)) {
- result = "UTF-16";
- } else if ("X-UnicodeLittle".equals(foundCharset)) {
- result = "UTF-16";
- } else if ("X-UnicodeBig".equals(foundCharset)) {
- result = "UTF-16BE";
- }
-
- return result;
- }
-
- /**
- *
- */
- public TestCodedReader() {
- super();
- // System.out.println(currentPlatformCharset);
- }
-
- public static void main(String[] args) {
- // try {
- // new TestCodedReader().doAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- // TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- // createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[4000];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- protected void doTest(String expectedJavaCharset, String expectedDetectedCharset, String filePath, Class expectedException) throws CoreException, IOException {
- Reader reader = null;
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull(file);
- expectedJavaCharset = massageCharset(expectedJavaCharset);
- expectedDetectedCharset = massageCharset(expectedDetectedCharset);
-
- // note: eventually, I should change calling methods so if detected
- // charset is expected to be same
- // as the 'used' java charset, then simply pass in null, but for now,
- // we'll "force" that here in this
- // method.
- if (expectedJavaCharset.equals(expectedDetectedCharset)) {
- expectedDetectedCharset = null;
- }
-
- try {
- reader = doCoreTest(expectedJavaCharset, expectedDetectedCharset, file);
- } catch (Exception e) {
- if (expectedException != null) {
- boolean result = expectedException.isInstance(e);
- assertTrue("Unexpected Exception: " + getGoodFullMsg(e), result);
- } else {
- // will alway assert if gets to here
- String msg = getGoodFullMsg(e);
- assertNull("Unexpected Exception: " + msg, e);
- }
- } finally {
- if (reader != null) {
- reader.close();
- }
-
- }
- }
-
- protected Reader doCoreTest(String expectedJavaCharset, String expectedDetectedCharset, IFile file) throws CoreException, IOException {
- Reader reader;
- // create these first, to test exception being thrown correctly
- CodedReaderCreator codedReaderCreator = new CodedReaderCreator();
- codedReaderCreator.set(file);
- reader = codedReaderCreator.getCodedReader();
-
- String javaCharsetName = file.getCharset();
- IContentDescription description = file.getContentDescription();
- javaCharsetName = massageCharset(javaCharsetName);
- // codedReaderCreator.getEncodingMemento().getJavaCharsetName();
- if (expectedJavaCharset.equals("expectPlatformCharset")) {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- assertTrue(javaCharsetName.equals(platformDefault));
- } else {
- boolean asExpected = javaCharsetName.equals(expectedJavaCharset);
- assertTrue(javaCharsetName + " did not equal the expected " + expectedJavaCharset + " (this is a VM dependent test)", asExpected);
- }
- String javaCharsetNameProperty = (String) description.getProperty(IContentDescription.CHARSET);
- String detectedCharsetNameProperty = getDetectedCharsetName(description);
- detectedCharsetNameProperty = massageCharset(detectedCharsetNameProperty);
- // if (detectedCharsetName == null) {
- // detectedCharsetName = javaCharsetNameProperty;
- // }
- if (!expectedJavaCharset.equals("expectPlatformCharset")) {
- boolean expecedResult = expectedJavaCharset.equals(javaCharsetNameProperty);
- assertTrue("java based charset name was not as expected", expecedResult);
- } else {
- String expectedDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- boolean ExpectedResult = expectedDefault.equals(javaCharsetNameProperty);
- assertTrue("java based charset name not as expected when platform default expected", ExpectedResult);
- }
-
- if (expectedDetectedCharset != null) {
- boolean expectedResult = expectedDetectedCharset.equals(detectedCharsetNameProperty);
- assertTrue("detected charset name was not as expected", expectedResult);
- }
- // test if can read/write file
- StringBuffer buffer = readInputStream(reader);
- if (DEBUG_TEST_DETAIL) {
- System.out.print(buffer);
- }
- return reader;
- }
-
- /**
- * This method is just to help handle transition from using
- * EncodingMemtento to not using encodingMemento.
- */
- private String getDetectedCharsetName(IContentDescription description) {
- String result = null;
- result = (String) description.getProperty(IContentDescriptionExtended.DETECTED_CHARSET);
- return result;
- }
-
- /**
- * @param e
- * @return
- */
- private String getGoodFullMsg(Exception e) {
- String msg = e.getClass().getName() + ": " + e.getMessage();
- return msg;
- }
-
- public void testFile1() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile2() throws CoreException, IOException {
- doTest("EUC-JP", "EUC-JP", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile3() throws CoreException, IOException {
- doTest("ISO-2022-JP", "ISO-2022-JP", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/css/encoding_test_sjis.css", null);
- }
-
- public void testFile5() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile7() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
-
- public void testFile57() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/LargeNoEncoding.html", null);
- }
-
- public void testFile60() throws CoreException, IOException {
- doTest("ISO-8859-1", "iso-8859-1", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/EmptyFile.jsp", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("ISO-8859-8", null, "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("windows-1252", "Cp1252", "testfiles/jsp/javaEncodingValue.jsp", null);
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/MalformedNoEncoding.jsp", null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/noEncoding.jsp", null);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/nomalDirectiveCase.jsp", null);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("ISO-8859-3", "ISO-8859-3", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("ISO-8859-8", null, "testfiles/jsp/NormalNonDefault.jsp", null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("ISO-8859-8", "ISO-8859-8", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTest("ISO-8859-7", "ISO-8859-7", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("ISO-8859-3", "ISO-8859-3", "testfiles/jsp/testBrokenLine.jsp", null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testExtraJunk.jsp", null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testExtraValidStuff.jsp", null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("ISO-8859-1", null, "testfiles/jsp/testIllFormed.jsp", null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testIllFormed2.jsp", null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoEncodingValue.jsp", null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoPageDirective.jsp", null);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testNormalCase.jsp", null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/testUTF16.jsp", null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("UTF-16LE", "UTF-16LE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("ISO-8859-8", "ISO-8859-8", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("Shift_JIS", "Shift_JIS", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("EUC-JP", "EUC-JP", "testfiles/xml/eucjp.xml", null);
- }
-
- // public void testFile105() throws CoreException, IOException {
- // doTest("ISO-8859-1", "ISO-8859-1",
- // "testfiles/xml/IllformedNormalNonDefault.xml", null);
- // }
-
- // public void testFile106() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/MalformedNoEncoding.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile107() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/MalformedNoEncoding.xsl",
- // CharacterCodingException.class);
- // }
-
- public void testFile108() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTest("Shift_JIS", "Shift_JIS", "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
- }
-
- // public void testFile113() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed.xml", null);
- // }
-
- public void testFile114() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed2.xml", null);
- }
-
- // public void testFile115() throws CoreException, IOException {
- // doTest("null", "null", "testfiles/xml/testIllFormed3.xml",
- // UnsupportedCharsetExceptionWithDetail.class);
- // }
-
- public void testFile116() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- // public void testFile123() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE", "testfiles/xml/testUTF16.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile124() throws CoreException, IOException {
- // doTest("UTF-16LE", "UTF-16LE",
- // "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- // }
-
- // public void testFile125() throws CoreException, IOException {
- // doTest("UTF-16LE", "UTF-16LE",
- // "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- // }
-
- // public void testFile126() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE",
- // "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile127() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE",
- // "testfiles/xml/utf16WithJapaneseChars.xml", null);
- // }
-
- public void testFile128() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testDocumentStreamCaseHTML() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/DocumentStreamTestCase/kaeru5.htm", null);
- }
-
- public void testDocumentStreamCaseJSP() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/DocumentStreamTestCase/kaeru5.jsp", null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java
deleted file mode 100644
index 7978943..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.GenerateFiles;
-
-
-/**
- * This class should contain a "master list" of all filenames generated by
- * various VM's ... then the test ingores it if the filename's not found due
- * to the VM not supporting it.
- *
- */
-public class TestCodedReaderOnGennedFiles extends TestCodedReader {
- private static int notRan = 0;
- private static final boolean DEBUG = false;
-
- protected void doGenTest(String charsetName) throws CoreException, IOException {
- doTest(charsetName, charsetName, GenerateFiles.getMainDirectoryBasedOnVMName() + "/xml/test-" + charsetName + ".xml", null);
- }
-
- protected void doTest(String expectedJavaCharset, String expectedDetectedCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- IFile file = (IFile) fTestProject.findMember(filePath);
-
- // if there no file, just assume that its due to which VM is
- // bring used. (Could be improved in future to avoid counting as a
- // test) - this check in here for initial debugging only
- if (file == null) {
- notRan++;
- if (DEBUG) {
- System.out.println();
- System.out.println("test not ran since charset not supported by VM: " + filePath);
- }
- return;
- }
- super.doTest(expectedJavaCharset, expectedDetectedCharset, filePath, expectedException);
- }
-
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
-
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
-
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
-
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
-
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
-
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
-
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
-
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
-
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
-
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
-
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
-
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
-
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
-
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
-
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
-
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
-
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
-
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
-
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
-
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
-
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
-
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
-
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
-
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
-
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
-
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
-
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
-
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
-
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
-
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
-
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
-
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
-
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
-
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
-
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
-
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
-
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
-
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
-
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
-
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
-
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
-
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
-
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
-
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
-
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
-
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
-
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
-
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
-
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
-
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
-
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
-
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
-
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
-
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
-
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
-
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
-
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
-
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
-
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
-
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
-
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
-
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
-
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
-
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
-
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
-
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
-
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
-
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
-
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
-
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
-
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
-
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
-
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
-
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
-
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
-
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
-
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
-
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
-
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
-
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
-
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
-
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
-
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
-
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
-
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
-
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
-
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
-
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
-
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
-
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
-
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
-
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
-
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
-
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
-
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
-
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
-
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
-
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
-
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
-
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
-
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
-
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
-
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
-
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
-
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
-
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
-
-// public void testFile106() throws CoreException, IOException {
-// String charsetName = "UTF-16";
-// doGenTest(charsetName);
-// }
-
-// public void testFile107() throws CoreException, IOException {
-// String charsetName = "UTF-16BE";
-// doGenTest(charsetName);
-// }
-
-// public void testFile108() throws CoreException, IOException {
-// String charsetName = "UTF-16LE";
-// doGenTest(charsetName);
-// }
-
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
-
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
-
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
-
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
-
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
-
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
-
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
-
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
-
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
-
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
-
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
-
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
-
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
-
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
-
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
-
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
-
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
-
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
-
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
-
-
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
-
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile129() throws CoreException, IOException {
-// String charsetName = "X-UnicodeBig";
-// doGenTest(charsetName);
-// }
-
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile130() throws CoreException, IOException {
-// String charsetName = "X-UnicodeLittle";
-// doGenTest(charsetName);
-// }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
deleted file mode 100644
index 76ebccb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestContentDescription extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final boolean DEBUG = true;
- //private static final boolean DEBUG_TEST_DETAIL = false;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.encoding.resource.newtests";
- static IProject fTestProject;
- private static int nSetups = 0;
-
- /**
- *
- */
- public TestContentDescription() {
- super();
- //System.out.println(currentPlatformCharset);
- }
-
- public static void main(String[] args) {
- // try {
- // new TestCodedReader().doAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- protected void doTest(String expectedJavaCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- expectedJavaCharset = massageCharset(expectedJavaCharset);
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
- IContentDescription fileContentDescription = file.getContentDescription();
- // IContentDescription streamContentDescription = Platform.getContentTypeManager().getDescriptionFor(file.getContents(), file.getName(), IContentDescription.ALL);
- // assertEquals("comparing file and stream contentDescription", fileContentDescription, streamContentDescription);
-
- assertNotNull("Null content description", fileContentDescription);
- String foundCharset = fileContentDescription.getCharset();
- foundCharset = massageCharset(foundCharset);
-
- if (expectedJavaCharset == null || expectedJavaCharset.equals("expectPlatformCharset")) {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- assertTrue(foundCharset.equals(platformDefault));
- }
- else {
- boolean asExpected = foundCharset.equals(expectedJavaCharset);
- assertTrue(foundCharset + " did not equal the expected " + expectedJavaCharset + " (this is a VM dependent test)", asExpected);
- }
-
-
- }
-
- /**
- * @param foundCharset
- * @return
- */
- private String massageCharset(String foundCharset) {
- String result = foundCharset;
- if ("UTF-16LE".equals(foundCharset)) {
- result = "UTF-16";
- }
- else if ("X-UnicodeLittle".equals(foundCharset)) {
- result = "UTF-16";
- }
- else if ("X-UnicodeBig".equals(foundCharset)) {
- result = "UTF-16BE";
- }
-
- return result;
- }
-
- public void testFile1() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile2() throws CoreException, IOException {
- doTest("EUC-JP", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile3() throws CoreException, IOException {
- doTest("ISO-2022-JP", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/css/encoding_test_sjis.css", null);
- }
-
- public void testFile5() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile7() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
-
- public void testFile57() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/LargeNoEncoding.html", null);
- }
-
- public void testFile60() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/EmptyFile.jsp", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("abc", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("windows-1252", "testfiles/jsp/javaEncodingValue.jsp", null);
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/MalformedNoEncoding.jsp", null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/noEncoding.jsp", null);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/nomalDirectiveCase.jsp", null);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("ISO-8859-3", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/NormalNonDefault.jsp", null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTest("ISO-8859-7", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("ISO-8859-3", "testfiles/jsp/testBrokenLine.jsp", null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("testjunk", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("testjunk", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testExtraJunk.jsp", null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testExtraValidStuff.jsp", null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testIllFormed.jsp", null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testIllFormed2.jsp", null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoEncodingValue.jsp", null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoPageDirective.jsp", null);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testNormalCase.jsp", null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/testUTF16.jsp", null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("EUC-JP", "testfiles/xml/eucjp.xml", null);
- }
-
-// public void testFile105() throws CoreException, IOException {
-// doTest("ISO-8859-1", "testfiles/xml/IllformedNormalNonDefault.xml", null);
-// }
-//
-// public void testFile106() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/MalformedNoEncoding.xml", null);
-// }
-//
-// public void testFile107() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/MalformedNoEncoding.xsl", null);
-// }
-
- public void testFile108() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
- }
-
-// public void testFile113() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/testIllFormed.xml", null);
-// }
-
- public void testFile114() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testIllFormed2.xml", null);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTest("UTF-8 standalone=", "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
-// public void testFile123() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/testUTF16.xml", null);
-// }
-
- public void testFile124() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
-// public void testFile126() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", null);
-// }
-
-// public void testFile127() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/utf16WithJapaneseChars.xml", null);
-// }
-
- public void testFile129() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testFile130() throws CoreException, IOException {
- doTest("UTF-16BE", "testfiles/xml/utf16be.xml", null);
- }
-
- public void testFile131() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16le.xml", null);
- }
-
- public void testFile132() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16leMalformed.xml", null);
- }
-
- public void testFile133() throws CoreException, IOException {
- doTest("UTF-16BE", "testfiles/xml/utf16beMalformed.xml", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java
deleted file mode 100644
index ea8d990..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java
+++ /dev/null
@@ -1,711 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.GenerateFiles;
-
-
-
-public class TestContentTypeDescriptionOnGennedFiles extends TestContentDescription {
- private static int notRan = 0;
- private static final boolean DEBUG = false;
-
- protected void doGenTest(String charsetName) throws CoreException, IOException {
- String filename = GenerateFiles.getMainDirectoryBasedOnVMName() + "/xml/test-" + charsetName + ".xml";
- doTest(charsetName, filename, null);
- }
-
- protected void doTest(String expectedJavaCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- IFile file = (IFile) fTestProject.findMember(filePath);
-
- // if there no file, just assume that its due to which VM is
- // bring used. (Could be improved in future to avoid counting as a
- // test) - this check in here for initial debugging only
- if (file == null) {
- notRan++;
- if (DEBUG) {
- System.out.println();
- System.out.println("test not ran since charset not supported by VM: " + filePath);
- }
- return;
- }
- super.doTest(expectedJavaCharset, filePath, expectedException);
- }
-
-
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
-
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
-
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
-
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
-
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
-
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
-
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
-
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
-
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
-
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
-
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
-
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
-
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
-
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
-
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
-
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
-
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
-
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
-
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
-
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
-
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
-
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
-
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
-
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
-
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
-
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
-
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
-
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
-
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
-
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
-
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
-
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
-
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
-
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
-
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
-
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
-
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
-
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
-
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
-
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
-
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
-
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
-
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
-
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
-
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
-
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
-
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
-
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
-
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
-
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
-
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
-
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
-
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
-
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
-
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
-
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
-
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
-
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
-
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
-
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
-
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
-
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
-
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
-
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
-
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
-
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
-
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
-
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
-
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
-
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
-
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
-
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
-
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
-
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
-
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
-
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
-
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
-
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
-
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
-
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
-
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
-
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
-
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
-
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
-
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
-
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
-
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
-
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
-
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
-
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
-
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
-
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
-
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
-
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
-
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
-
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
-
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
-
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
-
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
-
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
-
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
-
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
-
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
-
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
-
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
-
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
-
- public void testFile106() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
-
-// public void testFile107() throws CoreException, IOException {
-// String charsetName = "UTF-16BE";
-// doGenTest(charsetName);
-// }
-
- public void testFile108() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
-
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
-
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
-
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
-
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
-
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
-
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
-
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
-
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
-
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
-
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
-
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
-
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
-
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
-
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
-
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
-
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
-
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
-
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
-
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
-
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile129() throws CoreException, IOException {
-// String charsetName = "X-UnicodeBig";
-// doGenTest(charsetName);
-// }
-
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java
deleted file mode 100644
index 6b20eda..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestContentTypeDetection extends TestCase {
- private static final boolean DEBUG = false;
- static IProject fTestProject;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.xml.temp.tests.encoding.resource.newtests";
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- // createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- }
-
- /**
- *
- */
- public TestContentTypeDetection() {
- super();
- // System.out.println(currentPlatformCharset);
- }
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- IContentType fileContentType = fileContentDescription.getContentType();
- assertNotNull("file content type was null", fileContentType);
-
- IContentType streamContentType = streamContentDescription.getContentType();
- assertNotNull("stream content type was null", streamContentType);
-
- assertEquals("comparing content type based on file and stream: ", fileContentType, streamContentType);
-
- // if equal, above, as expected, then only need to check one.
- assertEquals("compareing with expected content type id", expectedContentType, fileContentType.getId());
-
- }
-
- protected IContentDescription doGetContentTypeBasedOnStream(IFile file) throws CoreException, IOException {
- IContentDescription streamContentDescription = null;
- InputStream inputStream = null;
- try {
- inputStream = file.getContents();
- streamContentDescription = Platform.getContentTypeManager().getDescriptionFor(inputStream, file.getName(), IContentDescription.ALL);
- }
- finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- assertNotNull("content description was null", streamContentDescription);
- return streamContentDescription;
- }
-
- protected IContentDescription doGetContentTypeBasedOnFile(IFile file) throws CoreException {
- IContentDescription fileContentDescription = file.getContentDescription();
- assertNotNull("file content description was null", fileContentDescription);
- return fileContentDescription;
- }
-
- protected void doTestForParent(String expectedContentType, String filePath, Class expectedException) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
- IContentDescription contentDescription = file.getContentDescription();
- if (contentDescription == null) {
- InputStream inputStream = null;
- try {
- inputStream = file.getContents();
- contentDescription = Platform.getContentTypeManager().getDescriptionFor(inputStream, file.getName(), IContentDescription.ALL);
- }
- finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
- assertNotNull("content description was null", contentDescription);
- IContentType contentType = contentDescription.getContentType();
- assertNotNull("content type was null", contentType);
-
- IContentType parentContentType = contentType;
- boolean found = false;
- while (parentContentType != null && !found) {
- found = expectedContentType.equals(parentContentType.getId());
- parentContentType = parentContentType.getBaseType();
- }
- assertTrue("did not find '" + expectedContentType + "' in parent chain of base types", found);
-
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
-// Display display = PlatformUI.getWorkbench().getDisplay();
-// display.asyncExec(new Runnable() {
-// public void run() {
-// ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-// IProject proj = fTestProject;
-// fTestProject = null;
-// try {
-// projUtil.deleteProject(proj);
-// }
-// catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// });
- }
- }
- }
-
- protected static IProject getTestProject() {
- return fTestProject;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
deleted file mode 100644
index 8ce009c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-
-public class TestContentTypeDetectionForXML extends TestContentTypeDetection {
- private static final String expectedCustomXMLContentType = "org.eclipse.wst.xml.core.xmlsource";
-
- private static final String expectedXSLContentType = "org.eclipse.wst.xml.core.xslsource";
-
- private static final String expectedXMLContentType = "org.eclipse.core.runtime.xml";
-
- public void testFile103() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile103P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/eucjp.xml", null);
- }
-
- public void testFile104b() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/eucjp.xml", null);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/IllformedNormalNonDefault.xml", null);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
- }
-
- /**
- * This file is illformed in its specified charset
- * and characters.
- * @throws CoreException
- * @throws IOException
- */
- public void testFile107() throws CoreException, IOException {
- doTest(expectedXSLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
- }
-
- public void testFile107P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/NormalNonDefault.xml", null);
- }
-
-
- public void testFile110() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testExtraValidStuff.xml", null);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed.xml", null);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed2.xml", null);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile120WS() throws CoreException, IOException {
- // whitespace (CRLF) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
- }
-
- public void testFile120WS2() throws CoreException, IOException {
- // whitespace (space only) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl2.xml", null);
- }
-
- public void testFile120WS3() throws CoreException, IOException {
- // whitespace (space, tabs, and CR only) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl3.xml", null);
- }
-
- public void testFile120P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- // tag (not just white space) before xml declaration.
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile121P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- public void testFile122P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testUTF16.xml", null);
- }
-
- public void testFile124() throws CoreException, IOException {
- // large, utf16, but no xmlDecl
- doTest(expectedXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile124P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile125() throws CoreException, IOException {
- // illformed, is in utf16, but not in header, not in encoding= spec.
- doTest(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
- public void testFile125P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", null);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/utf16WithJapaneseChars.xml", null);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testFile129() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16be.xml", null);
- }
-
- public void testFile130() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16le.xml", null);
- }
-
- public void testFile131() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16beMalformed.xml", null);
- }
-
- public void testFile132() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16leMalformed.xml", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java
deleted file mode 100644
index b5a6167..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-
-
-public class TestContentTypes extends TestCase {
- private static final boolean DEBUG = false;
-
- public void testCreation() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- assertTrue("content type identifer registry must exist", registry != null);
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- IContentType contentType = allTypes[i];
- IContentType parentType = contentType.getBaseType();
- if (DEBUG) {
- System.out.print(contentType);
-
- if (parentType != null) {
- System.out.println(" (extends " + parentType + ")");
- }
- else {
- System.out.println();
- }
- System.out.println(" " + contentType.getName());
- }
- String[] filespecs = contentType.getFileSpecs(IContentType.FILE_EXTENSION_SPEC | IContentType.FILE_NAME_SPEC);
- if (DEBUG) {
- for (int j = 0; j < filespecs.length; j++) {
- String filespec = filespecs[j];
- System.out.println(" " + filespec);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java
deleted file mode 100644
index 8dad582..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.util;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "ProjectTestFiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- //fCreatedProjects.add(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- String inFileName = inFile.getAbsolutePath(); //"c:/example.zip";
- // Specify destination where file will be unzipped
- //String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File sourceZipFile = new File(inFileName);
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
- IProject currentProject = null;
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- //System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fileOutputStream = new FileOutputStream(destFile);
- ByteArrayOutputStream dest = new ByteArrayOutputStream(BUFFER);
- // read and write until last byte is encountered
- boolean eof = false;
- int nBytes = 0;
- while (!eof) {
- nBytes = is.read(data, 0, BUFFER);
- if (nBytes != -1) {
- dest.write(data, 0, nBytes);
- }
- else {
- eof = true;
- }
- }
- dest.flush();
- dest.close();
- fileOutputStream.write(dest.toByteArray());
- fileOutputStream.close();
- is.close();
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- // unlike version in sse.tests, we don't create project
- // for
- // every directory
- // if(projectFolderName == null) {
- // projectFolderName = destFile.getName();
- // fCreatedProjects.add(projectFolderName);
- //
- // currentProject =
- // ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- // }
- }
- }
- zipFile.close();
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- // resynch
- refreshWorkspace();
- //change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- // need to add java nature, or else project won't "exist()" in the
- // java element sense
- String[] natureIds = {"org.eclipse.jdt.core.javanature"};
- if (!proj.isOpen()) {
- proj.open(null);
- }
- IProjectDescription desc = proj.getDescription();
- desc.setNatureIds(natureIds);
- proj.setDescription(desc, null);
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- //WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- //ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java
deleted file mode 100644
index 7d7f7d3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java
deleted file mode 100644
index 112521f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.write;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.internal.encoding.CodedStreamCreator;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
-
-public class TestCodedWrite extends TestCase {
- /** A table of hex digits */
- private static final char[] hexDigit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- private static StringBuffer sBuff = new StringBuffer(2);
-
- private static String byteToHex(byte bytechar) {
- sBuff.setLength(0);
- int low = bytechar & 0xF;
- int hi = (bytechar >> 4) & 0xF;
- sBuff.append(toHex(hi));
- sBuff.append(toHex(low));
- return sBuff.toString();
- }
-
- /**
- * Convert a nibble to a hex character
- *
- * @param nibble
- * the nibble to convert.
- */
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- private boolean DEBUG = false;
-
- /**
- *
- */
- public TestCodedWrite() {
- super();
- }
-
- /**
- * @param name
- */
- public TestCodedWrite(String name) {
- super(name);
- }
-
- public void testSimple() throws UnsupportedEncodingException, CoreException, IOException {
- String jsp = "<%@ page contentType=\"text/html; charset=ISO-8859-3\"%>";
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- codedStreamCreator.set("dummy.jsp", jsp);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimple", jsp, "ISO-8859-3", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- private void debugPrint(String testname, String originalString, String encoding, ByteArrayOutputStream outputStream) throws UnsupportedEncodingException {
- System.out.println();
- System.out.println(testname);
- byte[] bytes = outputStream.toByteArray();
- for (int i = 0; i < bytes.length; i++) {
- System.out.print(byteToHex(bytes[i]));
- }
- System.out.println();
- if (encoding == null) {
- System.out.println(new String(bytes));
-
- }
- else {
- System.out.println(new String(bytes, encoding));
- }
- }
-
- public void testSimpleUTF16BE() throws UnsupportedEncodingException, CoreException, IOException {
- String jsp = "<%@ page contentType=\"text/html; charset=UTF-16BE\"%>";
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- codedStreamCreator.set("dummy.jsp", jsp);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimpleUTF16BE", jsp, "UTF-16BE", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- public void testSimpler() throws UnsupportedEncodingException, CoreException, IOException {
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- String xmlString = "<?xml version=\"1.0\" encoding=\"UTF-16\"?><tag>test text</tag>";
- codedStreamCreator.set("dummy.xml", xmlString);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimpler", xmlString, "UTF-16", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- public void testSimplest() throws UnsupportedEncodingException, CoreException, IOException {
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- String text = "test text";
- codedStreamCreator.set("dummy.xml", text);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimplest", text, null, outputStream);
- }
- assertNotNull(outputStream);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java
deleted file mode 100644
index 0ab1c8e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.xml;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-
-public class XMLEncodingTests extends TestCase {
- private int READ_BUFFER_SIZE = 8000;
- private boolean DEBUG = false;
- private final String fileRoot = "testfiles/";
- private final String fileDir = "xml/";
- private final String fileLocation = fileRoot + fileDir;
-
- public XMLEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = TestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- //InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((XMLResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail) if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- public void testXMLEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.xml";
- String ianaInFile = "ISO-8859-1";
- doTestFileStream(filename, ianaInFile, new XMLResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.xml";
- String ianaInFile = "ISO-8859-1";
- doTestFileStream(filename, ianaInFile, new XMLResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "NoEncoding.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true, it appears
- * incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16BE() throws IOException {
- String filename = fileLocation + "utf16be.xml";
- doTestFileStream(filename, "UTF-16BE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16LE() throws IOException {
- String filename = fileLocation + "utf16le.xml";
- doTestFileStream(filename, "UTF-16LE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16LEMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.xml";
- doTestFileStream(filename, "UTF-16LE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16BEMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.xml";
- doTestFileStream(filename, "UTF-16BE", new XMLResourceEncodingDetector());
- }
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java
deleted file mode 100644
index d03c374..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.xml;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizer;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-
-public class XMLHeadTokenizerTester extends TestCase {
-
- private boolean DEBUG = false;
- private final String fileDir = "xml/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fEncoding = null;
- private HeadParserToken fFinalToken;
-
- private void doTestFile(String filename, String expectedName) {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String expectedFinalTokenType) {
-
- XMLHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = TestsPlugin.getByteReader(filename);
- tokenizer = new XMLHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- String resultValue = null;
- try {
- parse(tokenizer);
- resultValue = fEncoding;
- if (DEBUG) {
- System.out.println("XML Head Tokenizer Found Encoding: " + resultValue);
- }
- fileReader.close();
- }
- catch (java.io.IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
-
- if (expectedFinalTokenType != null) {
- assertTrue("did not end as expected. found: " + fFinalToken.getType(), expectedFinalTokenType.equals(fFinalToken.getType()));
- }
- else {
- if (expectedName == null) {
- // TODO: this test branch needs to be improved ... doesn't
- // fail
- // as it should
- // (such as when tokenizer changed to return early when
- // Unicode
- // stream found).
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
- }
-
- }
-
- private void parse(XMLHeadTokenizer tokenizer) throws IOException {
- HeadParserToken token = null;
- String tokenType = null;
- do {
- token = tokenizer.getNextToken();
- tokenType = token.getType();
- // normally "parsing" the tokens should be done by parser
- // @see, XMLResourceEncodoingDetector
- // but we'll
- // do it here for a little
- // more independent test.
- if (tokenType == EncodingParserConstants.UTF16BE) {
- fEncoding = "UTF16BEInStream";
- }
- if (tokenType == EncodingParserConstants.UTF16LE) {
- fEncoding = "UTF16LEInStream";
- }
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- fEncoding = "UTF83ByteBOMInStream";
- }
- if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- token = tokenizer.getNextToken();
- tokenType = token.getType();
- if (isLegalString(tokenType)) {
- fEncoding = token.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- // for testing
- fFinalToken = token;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * Normal XMLDeclaration with default encoding specified (UTF-8)
- *
- */
- public void testBestCase() {
- String filename = fileLocation + "testNormalCase.xml";
- doTestFile(filename, "UTF-8");
-
- }
-
- /**
- * This is a UTF-16 file (Unicode bytes in BOM). So, the tokenizer by
- * itself can't read correctly. Returns null in "pure" tokenizer test, but
- * encoding detector case should still handle since looks for bytes first.
- */
- public void testUTF16() {
- String filename = fileLocation + "testUTF16.xml";
- doTestFile(filename, "UTF16BEInStream");
- }
-
- /**
- * Just to make sure we don't choke on empty file.
- *
- */
- public void testEmptyFile() {
- String filename = fileLocation + "EmptyFile.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testEUCJP() {
- String filename = fileLocation + "eucjp.xml";
- doTestFile(filename, "EUC-JP");
- }
-
- /**
- * Extended XML Declaration that contains 'standalone' attribute
- *
- */
- public void testExtraAttrCase() {
- String filename = fileLocation + "testExtraValidStuff.xml";
- doTestFile(filename, "UTF-8");
-
- }
-
- /**
- * A case with a valid encoding, but extra attributes which are not
- * valid/meaningful.
- *
- */
- public void testExtraJunkCase() {
- String filename = fileLocation + "testExtraJunk.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * Missing 2 quotes, one and end of version value and one at beginning of
- * encoding value. In this case, tokenizer handles as undelimite string,
- * but if we ever modifiy to also look for 'version', then would not work
- * the same.
- *
- */
- public void testIllFormed() {
- String filename = fileLocation + "testIllFormed.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Missing XMLDecl end tag ... we should be able to safely guess.
- *
- */
- public void testIllFormed2() {
- String filename = fileLocation + "testIllFormed2.xml";
- doTestFile(filename, "UTF-8");
- }
-
- /**
- * Missing end quote on UTF-8 attribute, so picks up following attribte
- * too.
- *
- */
- public void testIllFormed3() {
- String filename = fileLocation + "testIllFormed3.xml";
- doTestFile(filename, "UTF-8 standalone=");
- }
-
- /**
- * Missing end quote on UTF-8 attribute, but then XMLDeclEnds, so should
- * be able to handle
- *
- */
- public void testIllFormed4() {
- String filename = fileLocation + "testIllFormed4.xml";
- doTestFile(filename, "UTF-8");
- }
-
- /**
- * Test of missing end quote on encoding value.
- *
- */
- public void testIllformedNormalNonDefault() {
- String filename = fileLocation + "IllformedNormalNonDefault.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * Empty string as encoding value; (And, malformed input, for UTF-8 ...
- * should not effect results of this level of test).
- *
- */
- public void testMalformedNoEncoding() {
- String filename = fileLocation + "MalformedNoEncoding.xml";
- doTestFile(filename, "");
- }
-
- /**
- * Empty string as encoding value; (And, malformed input, for UTF-8 ...
- * should not effect results of this level of test).
- *
- */
- public void testMalformedNoEncodingXSL() {
- String filename = fileLocation + "MalformedNoEncoding.xsl";
- doTestFile(filename, "");
- }
-
- /**
- * XMLDeclaration not all on same line
- *
- */
- public void testMultiLineCase() {
- String filename = fileLocation + "testMultiLine.xml";
- doTestFile(filename, "ISO-8859-1");
-
- }
-
- /**
- * No encoding in XMLDeclaration
- *
- */
- public void testNoEncoding() {
- String filename = fileLocation + "NoEncoding.xml";
- doTestFile(filename, null);
- }
-
- /**
- * ?Is this a dup?
- *
- */
- public void testNoEncodingCase() {
- String filename = fileLocation + "testNoEncodingValue.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Normal XMLDeclaration with ISO-1 specified
- *
- */
- public void testNormalNonDefault() {
- String filename = fileLocation + "NormalNonDefault.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * No XMLDeclaration at all. (Invalid, but should still be able to parse).
- *
- */
- public void testNoXMLDecl() {
- String filename = fileLocation + "testNoXMLDecl.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Hard to handle safely (may appear in comment, for example).
- *
- */
- public void testNoXMLDeclAtFirst() {
- String filename = fileLocation + "testNoXMLDeclAtFirst.xml";
- doTestFile(filename, null);
- }
-
- /**
- * This test is just to make sure the scanning ends before end of file is
- * reached.
- *
- */
- public void testNoXMLDeclInLargeFile() {
- String filename = fileLocation + "testNoXMLDeclInLargeFile.xml";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testshiftjis() {
- String filename = fileLocation + "shiftjis.xml";
- doTestFile(filename, "Shift_JIS");
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testUTF16LEWithJapaneseChars() {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.xml";
- doTestFile(filename, "UTF16LEInStream");
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testUTF16BEWithJapaneseChars() {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.xml";
- doTestFile(filename, "UTF16BEInStream");
- }
-
- /**
- * A common case.
- *
- */
- public void testUTF8With3ByteBOM() {
- String filename = fileLocation + "UTF8With3ByteBOM.xml";
- doTestFile(filename, "UTF83ByteBOMInStream");
- }
- public void UTF16LEAtStartOfLargeFile() {
- String filename = fileLocation + "UTF16LEAtStartOfLargeFile.xml";
- doTestFile(filename, "UTF16LEInStream");
- }
-
- public void testUTF16LE() {
- String filename = fileLocation + "utf16le.xml";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16BE() {
- String filename = fileLocation + "utf16be.xml";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16BEMalformed() {
- String filename = fileLocation + "utf16beMalformed.xml";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16LEMalformed() {
- String filename = fileLocation + "utf16leMalformed.xml";
- doTestFile(filename, "UTF-16LE");
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java
deleted file mode 100644
index 8be099a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.xml;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.MalformedInputException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.sse.core.internal.exceptions.MalformedInputExceptionWithDetail;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-/**
- * FIXME: this might be a good starting point to create a "file peeker"? But,
- * its not otherwised used -- delete if not fixed/improved soon
- * XMLMalformedInputTests
- */
-
-public class XMLMalformedInputTests extends TestCase {
- private int READ_BUFFER_SIZE = 8000;
- private boolean DEBUG = false;
-
-
- public XMLMalformedInputTests(String name) {
- super(name);
- }
-
- /**
- * Tests for a file, filename that should throw a
- * MalformedInputExceptionWithDetail at character, expectedPosition. This
- * happens when no encoding is specified, so the default is used, but
- * there are characters that the default encoding does not recognize
- */
- void doTestMalformedInput(String filename, IResourceCharsetDetector detector, int expectedPosition) throws IOException {
- Exception foundException = null;
- int badCharPosition = -1;
- File file = TestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- InputStream istream = getMarkSupportedStream(inputStream);
- detector.set(istream);
- // IEncodedDocument doc =
- // detector.createNewStructuredDocument(filename, istream);
- EncodingMemento encodingMemento = ((XMLResourceEncodingDetector) detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
-
- Charset charset = Charset.forName(foundIANAEncoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- istream.close();
- inputStream.close();
-
- // now, try reading as per encoding
- inputStream = new FileInputStream(file);
- // skip BOM for this case
- // System.out.println(inputStream.read());
- // System.out.println(inputStream.read());
- // System.out.println(inputStream.read());
- InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
-
- try {
- // just try reading ... should throw exception
- // exception)
- readInputStream(reader);
- }
- catch (MalformedInputException e) {
- // as expected, now do detailed checking.
- inputStream.close();
- istream.close();
- inputStream = new FileInputStream(file);
- charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
- reader = new InputStreamReader(inputStream, charsetDecoder);
- istream = getMarkSupportedStream(inputStream);
- try {
- handleMalFormedInput_DetailChecking(reader, foundIANAEncoding);
- }
- catch (MalformedInputExceptionWithDetail se) {
- foundException = se;
- badCharPosition = se.getCharPosition();
- }
-
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
-
- }
- // handle adjustments here for VM differnces:
- // for now its either 49 or 49 + 2 BOMs (51)
- // can be smarting later.
- assertTrue("MalformedInputException was not thrown as expected for filename: " + filename + " Exception thrown:" + foundException, foundException instanceof MalformedInputExceptionWithDetail);
- assertTrue("Wrong character position detected in MalformedInputException. Expected: " + expectedPosition + " Found: " + badCharPosition, (badCharPosition == expectedPosition) || badCharPosition == expectedPosition - 2);
- }
-
- // public void testXSLMalformedInput() throws IOException {
- // String filename = fileLocation + "MalformedNoEncoding.xsl";
- // doTestMalformedInput(filename, new XMLResourceEncodingDetector(), 211);
- // }
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- if (DEBUG) {
- System.out.println(tBuff[0]);
- }
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- /*
- * removed for PPC machine with IBM VM
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
- */
- // public void testXMLMalformedInput() throws IOException {
- // String filename = fileLocation + "MalformedNoEncoding.xml";
- // doTestMalformedInput(filename, new XMLResourceEncodingDetector(), 51);
- // }
- // since above test was only one im this class, put in this no op to avoid
- // a failure due to no tests in class!
- public void testNoOp() {
- assertTrue(true);
- }
-
- private void handleMalFormedInput_DetailChecking(Reader reader, String encodingName) throws IOException, MalformedInputExceptionWithDetail {
- int charPostion = -1;
- charPostion = getCharPostionOfFailure(reader);
- // all of that just to throw more accurate error
- // note: we do the conversion to ianaName, instead of using the local
- // variable,
- // because this is ultimately only for the user error message (that
- // is,
- // the error occurred
- // in context of javaEncodingName no matter what ianaEncodingName is
- throw new MalformedInputExceptionWithDetail(encodingName, charPostion);
- }
-
- private int getCharPostionOfFailure(Reader reader) throws IOException {
- int charPosition = 1;
- int charRead = -1;
- int result = -1;
- boolean errorFound = false;
- do {
- try {
- if (reader.ready()) {
- charRead = reader.read();
- }
- if (DEBUG) {
- System.out.println(charPosition + ": " + escape((char) charRead, true));
- }
- charPosition++;
- }
- catch (MalformedInputException e) {
- // this is expected, since we're expecting failure,
- // so no need to do anything.
- errorFound = true;
- break;
- }
- }
- while ((charRead != -1 && !errorFound) && reader.ready());
-
- if (errorFound)
- result = charPosition;
- else
- result = -1;
- return result;
- }
-
- private String escape(char aChar, boolean escapeSpace) {
-
- StringBuffer outBuffer = new StringBuffer();
- switch (aChar) {
- case ' ' :
- if (escapeSpace)
- outBuffer.append('\\');
-
- outBuffer.append(' ');
- break;
- case '\\' :
- outBuffer.append('\\');
- outBuffer.append('\\');
- break;
- case '\t' :
- outBuffer.append('\\');
- outBuffer.append('t');
- break;
- case '\n' :
- outBuffer.append('\\');
- outBuffer.append('n');
- break;
- case '\r' :
- outBuffer.append('\\');
- outBuffer.append('r');
- break;
- case '\f' :
- outBuffer.append('\\');
- outBuffer.append('f');
- break;
- default :
- if ((aChar < 0x0020) || (aChar > 0x007e)) {
- outBuffer.append('\\');
- outBuffer.append('u');
- outBuffer.append(toHex((aChar >> 12) & 0xF));
- outBuffer.append(toHex((aChar >> 8) & 0xF));
- outBuffer.append(toHex((aChar >> 4) & 0xF));
- outBuffer.append(toHex(aChar & 0xF));
- }
- else {
- if (specialSaveChars.indexOf(aChar) != -1)
- outBuffer.append('\\');
- outBuffer.append(aChar);
- }
- }
-
- return outBuffer.toString();
- }
-
- /**
- * Convert a nibble to a hex character
- *
- * @param nibble
- * the nibble to convert.
- */
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- /** A table of hex digits */
- private static final char[] hexDigit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- private static final String specialSaveChars = "=: \t\r\n\f#!";
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/test.xml b/tests/org.eclipse.wst.xml.tests.encoding/test.xml
deleted file mode 100644
index 0769819..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip b/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip
deleted file mode 100644
index e394384..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm
deleted file mode 100644
index 35570fe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%-- jsf:codeBehind language="java" location="/JavaSource/pagecode/test/Kaeru5.java" --%><%-- /jsf:codeBehind --%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@taglib uri="http://www.ibm.com/jsf/html_extended" prefix="hx"%>
-<HTML>
-<HEAD>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ page
-language="java"
-contentType="text/html; charset=SHIFT_JIS"
-pageEncoding="SHIFT_JIS"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<LINK rel="stylesheet" type="text/css" href="../theme/stylesheet.css"
- title="Style">
-<TITLE>kaeru.jsp</TITLE>
-</HEAD>
-<f:view>
- <BODY>
- <hx:scriptCollector id="scriptCollector1">
- <h:form styleClass="form" id="form1">
- ³F
- ³F
- ³F
- <h:selectOneMenu id="Combo30" styleClass="Combo30" tabindex="26">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="Øæø" itemLabel="Øæø" />
- </h:selectOneMenu>
- <h:selectOneMenu id="Combo31" styleClass="Combo31" tabindex="27">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="kyoto" itemLabel="kyoto" />
- </h:selectOneMenu>
- </h:form>
- </hx:scriptCollector>
- </BODY>
-</f:view>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp
deleted file mode 100644
index 083704b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%-- jsf:codeBehind language="java" location="/JavaSource/pagecode/test/Kaeru5.java" --%><%-- /jsf:codeBehind --%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@taglib uri="http://www.ibm.com/jsf/html_extended" prefix="hx"%>
-<HTML>
-<HEAD>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ page
-language="java"
-contentType="text/html; charset=SHIFT_JIS"
-pageEncoding="SHIFT_JIS"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<LINK rel="stylesheet" type="text/css" href="../theme/stylesheet.css"
- title="Style">
-<TITLE>kaeru.jsp</TITLE>
-</HEAD>
-<f:view>
- <BODY>
- <hx:scriptCollector id="scriptCollector1">
- <h:form styleClass="form" id="form1">
- ³F
- ³F
- ³F
- <h:selectOneMenu id="Combo30" styleClass="Combo30" tabindex="26">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="Øæø" itemLabel="Øæø" />
- </h:selectOneMenu>
- <h:selectOneMenu id="Combo31" styleClass="Combo31" tabindex="27">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="kyoto" itemLabel="kyoto" />
- </h:selectOneMenu>
- </h:form>
- </hx:scriptCollector>
- </BODY>
-</f:view>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
- font-family : "£Í£Ó £Ð¥´¥·¥Ã¥¯";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
- font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
- font-family : "lr oSVbN";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
- font-family: "Times New Roman", "MS Sans Serif";
- text-decoration: none;
- background-color: white;
-}
-
-TD {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- text-align: left;
-}
-
-TH {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: left;
-}
-
-H1 {
- font-family: "Times New Roman";
- font-size: 14pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: center
-}
-
-H2 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder
-}
-
-H3 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: italic
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997eb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css
deleted file mode 100644
index 724db8b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css
deleted file mode 100644
index f8c05d5..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css
deleted file mode 100644
index d8527c1..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css
deleted file mode 100644
index 6c94ffb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css
deleted file mode 100644
index c7dd678..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml"
deleted file mode 100644
index fb7a544..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="CESU-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml"
deleted file mode 100644
index 30fb712..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="COMPOUND_TEXT"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml"
deleted file mode 100644
index c50b16b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml"
deleted file mode 100644
index 98492d7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB2312"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml"
deleted file mode 100644
index 777ba75..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1006"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml"
deleted file mode 100644
index c4958e9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1041"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml"
deleted file mode 100644
index 573d3aa..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1043"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml"
deleted file mode 100644
index 6c40c19..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1046"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml"
deleted file mode 100644
index 3de20a4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1046S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml"
deleted file mode 100644
index 07a51a3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1088"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml"
deleted file mode 100644
index cda3443..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1098"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml"
deleted file mode 100644
index d33cef4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1114"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml"
deleted file mode 100644
index b0290b1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1115"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml"
deleted file mode 100644
index 05596c5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1124"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml"
deleted file mode 100644
index af72a5d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1363"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml"
deleted file mode 100644
index f18124d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1363C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml"
deleted file mode 100644
index 1839c89..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1370"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml"
deleted file mode 100644
index 9ac90e9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1381"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml"
deleted file mode 100644
index a9af28a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1383"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml"
deleted file mode 100644
index dad99ce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1386"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml"
deleted file mode 100644
index 1f592eb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-33722C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml"
deleted file mode 100644
index 5f04ef0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-437"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml"
deleted file mode 100644
index bb8535f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-737"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml"
deleted file mode 100644
index adc9449..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-775"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml"
deleted file mode 100644
index 8028fce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-808"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml"
deleted file mode 100644
index 6187d91..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-850"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml"
deleted file mode 100644
index c194d5c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-852"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml"
deleted file mode 100644
index d03547c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-855"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml"
deleted file mode 100644
index 54a4b5b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-856"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml"
deleted file mode 100644
index ae20c91..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-857"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml"
deleted file mode 100644
index 355f14a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-858"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml"
deleted file mode 100644
index e59b250..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-859"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml"
deleted file mode 100644
index ab82293..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-860"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml"
deleted file mode 100644
index 82910ec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-861"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml"
deleted file mode 100644
index 52a7114..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-862"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml"
deleted file mode 100644
index d167357..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-863"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml"
deleted file mode 100644
index 433e577..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-864"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml"
deleted file mode 100644
index e83aeb8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-864S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml"
deleted file mode 100644
index dd7d5db..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-865"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml"
deleted file mode 100644
index b1fa261..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-866"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml"
deleted file mode 100644
index 35f6750..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-867"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml"
deleted file mode 100644
index 6c3801a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-868"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml"
deleted file mode 100644
index 7fee0c1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-869"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml"
deleted file mode 100644
index 37c250a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-874"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml"
deleted file mode 100644
index f1b1596..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-897"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml"
deleted file mode 100644
index 28417e0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-921"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml"
deleted file mode 100644
index 606b826..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-922"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml"
deleted file mode 100644
index 7946fe0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-932"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml"
deleted file mode 100644
index 833e5bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-942"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml"
deleted file mode 100644
index a23e38d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-942C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml"
deleted file mode 100644
index b414260..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-943"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml"
deleted file mode 100644
index dda91ea..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-943C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml"
deleted file mode 100644
index beda222..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-948"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml"
deleted file mode 100644
index 2c5acdb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml"
deleted file mode 100644
index 06f45c6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-949C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml"
deleted file mode 100644
index 0f566b1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml"
deleted file mode 100644
index 9a65c14..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-954C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml"
deleted file mode 100644
index 556b59a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-CN-GB"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml"
deleted file mode 100644
index ecf3da3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml"
deleted file mode 100644
index 5f07496..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-10"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml"
deleted file mode 100644
index 33899cb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-14"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml"
deleted file mode 100644
index 10f57d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-16"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml"
deleted file mode 100644
index 5d9ad9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml"
deleted file mode 100644
index 35233d9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml"
deleted file mode 100644
index 2d9934b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml"
deleted file mode 100644
index d029f63..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0212"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml"
deleted file mode 100644
index 1e07ccb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml"
deleted file mode 100644
index 47cdda0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-RU"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml"
deleted file mode 100644
index 2548f3c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-U"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml"
deleted file mode 100644
index 0859479..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KSC5601"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml"
deleted file mode 100644
index 2fe027a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacArabic"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml"
deleted file mode 100644
index 1bb0d70..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCentralEurope"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml"
deleted file mode 100644
index d50ab3a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCroatian"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml"
deleted file mode 100644
index 00e3c92..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCyrillic"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml"
deleted file mode 100644
index edfad62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacGreek"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml"
deleted file mode 100644
index 93b5492..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacHebrew"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml"
deleted file mode 100644
index 5dad47d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacIceland"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml"
deleted file mode 100644
index bc1f0d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacRoman"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml"
deleted file mode 100644
index 9f6a4b9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacRomania"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml"
deleted file mode 100644
index 4f4dacf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacThai"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml"
deleted file mode 100644
index 1cd6826..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacTurkish"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml"
deleted file mode 100644
index d0bc953..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacUkraine"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml"
deleted file mode 100644
index 0e767ba..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="PTCP154"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml"
deleted file mode 100644
index 169dc52..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml"
deleted file mode 100644
index 410d508..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml"
deleted file mode 100644
index 28a9bf1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml"
deleted file mode 100644
index e90a7f8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml"
deleted file mode 100644
index 146659d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8J"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml"
deleted file mode 100644
index 851b70a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml"
deleted file mode 100644
index 714b9bc..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml"
deleted file mode 100644
index 0e98304..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="hp-roman8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml"
deleted file mode 100644
index 7987264..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml"
deleted file mode 100644
index 82c3d13..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-874"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml"
deleted file mode 100644
index b7f26b5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-932"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml"
deleted file mode 100644
index 0879fce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml"
deleted file mode 100644
index f2d3481..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml"
deleted file mode 100644
index 57c3bc6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text"
deleted file mode 100644
index 774dddb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text"
+++ /dev/null
@@ -1,525 +0,0 @@
-131
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile106() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile107() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile108() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
- public void testFile129() throws CoreException, IOException {
- String charsetName = "X-UnicodeBig";
- doGenTest(charsetName);
- }
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml"
deleted file mode 100644
index 910324d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml"
deleted file mode 100644
index b3a42d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml"
deleted file mode 100644
index 0f70b74..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0212-1990"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml"
deleted file mode 100644
index fec5530..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml"
deleted file mode 100644
index 938cfd5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-31j"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml"
deleted file mode 100644
index 3fdc641..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml"
deleted file mode 100644
index 348e37a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-TW"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml"
deleted file mode 100644
index 62d07fd..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml"
deleted file mode 100644
index deaf87a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml"
deleted file mode 100644
index 5806b31..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-MS950-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml"
deleted file mode 100644
index 0b43dfb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-euc-jp-linux"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml"
deleted file mode 100644
index e1bf10a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-mswin-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml"
deleted file mode 100644
index a8c93f4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml"
deleted file mode 100644
index 548e53b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text"
deleted file mode 100644
index 6f68f24..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text"
+++ /dev/null
@@ -1,193 +0,0 @@
-48
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "Big5-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "JIS_X0201";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "JIS_X0212-1990";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "windows-31j";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "x-EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "x-euc-jp-linux";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "x-EUC-TW";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "x-JIS0208";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "x-Johab";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "x-MS950-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "x-mswin-936";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "x-windows-949";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "x-windows-950";
- doGenTest(charsetName);
- }
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml"
deleted file mode 100644
index 910324d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml"
deleted file mode 100644
index b3a42d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml"
deleted file mode 100644
index 0f70b74..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0212-1990"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml"
deleted file mode 100644
index fec5530..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml"
deleted file mode 100644
index 938cfd5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-31j"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml"
deleted file mode 100644
index 3fdc641..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml"
deleted file mode 100644
index 348e37a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-TW"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml"
deleted file mode 100644
index 62d07fd..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml"
deleted file mode 100644
index deaf87a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml"
deleted file mode 100644
index 5806b31..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-MS950-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml"
deleted file mode 100644
index 0b43dfb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-euc-jp-linux"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml"
deleted file mode 100644
index e1bf10a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-mswin-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml"
deleted file mode 100644
index a8c93f4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml"
deleted file mode 100644
index 548e53b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text"
deleted file mode 100644
index 6f68f24..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text"
+++ /dev/null
@@ -1,193 +0,0 @@
-48
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "Big5-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "JIS_X0201";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "JIS_X0212-1990";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "windows-31j";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "x-EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "x-euc-jp-linux";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "x-EUC-TW";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "x-JIS0208";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "x-Johab";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "x-MS950-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "x-mswin-936";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "x-windows-949";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "x-windows-950";
- doGenTest(charsetName);
- }
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
deleted file mode 100644
index ef8b5c8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html
deleted file mode 100644
index 84ca60e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html
deleted file mode 100644
index 3bcdd14..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html
deleted file mode 100644
index f772113..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html
deleted file mode 100644
index 070e4fe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html
deleted file mode 100644
index ba30c9f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html
deleted file mode 100644
index 254cde4..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content=text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html
deleted file mode 100644
index acbd519..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html
deleted file mode 100644
index d8d62de..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html
deleted file mode 100644
index 0afe69b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html
deleted file mode 100644
index f4efb61..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e68..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cf..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 7656902..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a08..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c18..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 88e271a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp
deleted file mode 100644
index 83c870f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- contentType="text/html; charset=SHIFT_JIS" pageEncoding="SHIFT_JIS"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp
deleted file mode 100644
index 92051b3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
-<jsp:directive.page language="java"
- contentType="text/html; charset=SHIFT_JIS" pageEncoding="SHIFT_JIS" />
-<jsp:text><![CDATA[ <?xml version="1.0" encoding="SHIFT_JIS" ?> ]]></jsp:text>
-<jsp:text><![CDATA[ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ]]></jsp:text>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS" />
-<meta name="GENERATOR" content="IBM WebSphere Studio" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<link href="theme/Master.css" rel="stylesheet"
- type="text/css" />
-<title>testshiftjis.jsp</title>
-</head>
-<body>
-<p>Place testshiftjis.jsp's content here.</p>
-</body>
-</html>
-</jsp:root>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp
deleted file mode 100644
index 31b47c0..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp
+++ /dev/null
@@ -1,194 +0,0 @@
-<%@ page language="java" pageEncoding="Shift_JIS" contentType="text/html; charset=Shift_JIS"%>
-<%@taglib uri="/WEB-INF/websitedesigner.tld" prefix="siteedit"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META name="GENERATOR"
- content="IBM WebSphere Studio Homepage Builder Version 6.5.0.0 for Windows">
-<META http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>Audi A6wüÜÅ</TITLE>
-<LINK rel="stylesheet" href="style.css" type="text/css">
-<LINK rel="stylesheet" type="text/css" id="website_style"
- href="/Audi/site-comp/style/site.css">
-</HEAD>
-<BODY text="#666699" link="#6666cc" vlink="#999999" alink="#cc66ff">
-<siteedit:layout>
- <siteedit:layoutarea id="body">
- <H1>Audi A6wüÜÅ</H1>
-
- <DIV align="left">
- <TABLE width="640" cellpadding="5" cellspacing="0">
- <TBODY>
- <TR>
- <TD bgcolor="#0000cc" height="5"><FONT color="#ffffff">wüÜÅÌoÜ</FONT></TD>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">11</FONT></TD>
- <TD bgcolor="#0000cc" width="5"></TD>
- </TR>
- <TR>
- <TD width="216" bgcolor="#0066cc" valign="top" rowspan="3"></TD>
- <TD width="420">
- <UL>
- <LI>2001N11 AúMy Carð¢µnßéB</LI>
- <LI>RÍ...
- <OL>
- <LI>2002N4Å5NÚð}¦éOÔuÉש¢Ì᪢Ģ½B</LI>
- <LI>GWÌñͳÉäªÅ«ÈÈÁÄ«½B</LI>
- </OL>
- </LI>
- <LI>ȺÌÔíªóâÆÈÁ½B
- <OL>
- <LI>VOLVO V70</LI>
- <LI>BWM 325i touring</LI>
- <LI>VW Passart V6 4 Motion</LI>
- <LI>Mercedes-Benz C Class Wagon</LI>
- <LI>Audi A4 Avant</LI>
- </OL>
- <BR>
- »¤B ±Ì_Å<B>`UÍ®SÈXR[vO</B>Å Á½B</LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" width="5" height="5"></TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD width="420">±±©çAȺÌRªåÅAóâÔªiçê½B<BR>
- i ÜÅàÆÈÌÂlIåÏÉæèÜ·Bj
- <UL>
- <LI>VOLVO V70 - fUCªXÅ{cB</LI>
- <LI>BWM 325i touring - r¼[ÈTCYAXBWM¾ç¯Å{cB</LI>
- <LI>C Class - ¿iÉ©íÈ¢GWAàÅ{cB</LI>
- <LI>Passart - ¿iÍ£ÍI¾ªàOfUCÅ{cB</LI>
- </UL>
- »¤B±±Å<B>cÁ½ÌÍA4 Avant</B>ŵ½B <BR>
- A4 3.0 quattro sportsÉæµAÆÄàCÉüÁĵܢܵ½B<BR>
- µ©µ\èÍ2002N2Æ̱ÆÅA»±ÜÅÒƤÆêxÍßܵ½B<BR>
- <BR>
- BêACÉÈÁÄ¢½ÌͺàÌTCYÆgNeʪV70ÉäשÈ謳ÈéÆ¢¤_ŵ½B</TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc"></TD>
- <TD bgcolor="#0066cc"><FONT color="#ffffff">12{</FONT></TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc"></TD>
- <TD><BR>
- 2ÜÅÒƤÆvÁÄ¢éóÔÅAA4ÌÇÁîñð¾æ¤Æv¢fB[[ɧ¿ñèÁ½Æ±ëASÌcÆÌûªsÝÅX·ÆbðµÜµ½B<BR>
- <BR>
- »±ÅAVOLVO©çÌæè·¦AÆ°\¬i4ljðl¦éÆA6ª¨©ßÆ̱ÆB <B>¿i·àõðl¦éÆA4 Avant
- 3.0 quattro suportÆA6 Avant 3.0 quatrroÌ·ªÙÆñÇÈ¢</B>Æ̱ÆB<BR>
- <BR>
- XɺæèLy[ÅA¼CO[J[©çÌæÖ¦ÌêA¸èz{<B>RO~</B>{[iXÆÈèAÆÁÄਢ¾´ªoÜ·B<BR>
- <BR>
- »µÄANà[ÔÂ\Èó]FiVo[CN^bNjÌ`Uª1äÝɪ éÆ̱ÆB<BR>
- <BR>
- ÅADZÌbÉæÁÄ(æ¹çêÄHjA<B><FONT color="#cc33ff">A6 3.0 Avant quattro
- 2002 Model</FONT></B>ðwüèµÜµ½B<BR>
- <BR>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">wüèII</FONT></TD>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">wüèÌRðÜÆßéÆA</FONT>A</TD>
- <TD bgcolor="#0000cc"></TD>
- </TR>
- <TR>
- <TD width="216" bgcolor="#0066cc" valign="top"></TD>
- <TD width="420">
- <UL>
- <LI>¼ÌóâÔÆärµÄA{fB¨æÑÔàóÔÌfUCðå¢ÉCÉüÁ½B</LI>
- <LI>`SÅÍuVOÉä×ÔàXy[Xª·ÈÁĵܤB</LI>
- <LI>NAgEVXeiskiªï¡ÈÌÅâÍèsnow driveÉÍ4WDª~µÄ...)</LI>
- <LI>lø«ÆÁʺæèLy[¾Á½F|j</LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc" valign="top" colspan="2"><FONT
- color="#ffffff">wüµ½f ¨æÑ ÇÁIvV</FONT></TD>
- <TD bgcolor="#0000cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" valign="top"></TD>
- <TD>
- <UL>
- <LI>f
- <UL>
- <LI><B><FONT color="#cc33ff">A6 3.0 Avant quattro 2002 Model</FONT></B>
- </LI>
- <LI>ÚµÍ`ÌItBVy[Wð²¾³¢B( <A
- href="http://www.audi.co.jp/models/index.html">http://www.audi.co.jp/models/index.html</A>
- )</LI>
- </UL>
- </LI>
- <LI>{fBEJ[
- <UL>
- <LI>Vo[CN^bN</LI>
- </UL>
- </LI>
- <LI>ÇÁIvV
- <UL>
- <LI>[tAeipAOXy[T[ i@B®Ôêp̽ßj</LI>
- <LI>QbWgC (XL[ÂEu[cAqÌì
¹ïðÏÝÞ½ßÌD¯pj</LI>
- <LI>op[Ûìpo[ iÈÌv]Å.....)</LI>
- <LI>X^bhXE^C - uWXg uUbN</LI>
- </UL>
- </LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">1st CvbV</FONT></TD>
- <TD bgcolor="#0000cc"></TD>
- <TD bgcolor="#0000cc" height="5"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" valign="top"><IMG src="image211.jpg"
- border="0" width="195" height="130"></TD>
- <TD>wüè©çANÌQ½¾µ¢úŵ½ª2TÔƵÄ[ÔB<BR>
- 3úãÉcêÉrÉs\èŵ½ÌÅAX^bhX
µÄàç¢Üµ½B<BR>
- <UL>
- <LI><FONT color="#ff00ff"><FONT color="#ff00ff"><B>Pros.</B></FONT></FONT>
- <UL>
- <LI>X[YÈGWB</LI>
- <LI>Àèµ½èi[ÔµÄ3úãÌXm[EhCuÍÆÄàõKŵ½jB</LI>
- <LI>ã¿ÅL¢ºàB</LI>
- <LI>vÁ½æèà«È¢Rïi¬ðÜßA»Ý½Ï6.5Km/LBj</LI>
- <LI>XÅ Ü诶Ô𩩯ȢF|j</LI>
- </UL>
- </LI>
- <LI><B><FONT color="#000033">Cons.</FONT></B>
- <UL>
- <LI>WÚÌmÉr[Rªt¢Ä¢È¢B<BR>
- iaØîñªuhbr¾¯ÅÍs\ªBÈOpµÄ¢½pCIjAÐ yirÍÇ©Á½Bj</LI>
- <LI>ÙíÈ碼®AªêéB gNðJ¯éÆèª^ÁB</LI>
- <LI>¿åÁÆÓíÓíµ½«ñèB</LI>
- <LI>uVOÆä×A¸ÁĵÜÁ½gNeÊB</LI>
- </UL>
- </LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">P|[gɱ........</FONT><A
- href="audi_1month.html"><IMG src="b016lis.gif" width="16"
- height="16" border="0"></A></TD>
- <TD bgcolor="#0000cc"></TD>
- <TD bgcolor="#0000cc" height="5"></TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </siteedit:layoutarea>
-</siteedit:layout>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml
deleted file mode 100644
index e80692b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml
deleted file mode 100644
index 38a1bce..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl
deleted file mode 100644
index bd66482..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml
deleted file mode 100644
index e2d8afd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml
deleted file mode 100644
index e2ec98f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml
deleted file mode 100644
index 9eec539..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml
deleted file mode 100644
index 198112c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml
deleted file mode 100644
index 2359bd6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<Person>
- <Address>
- <City>ÂçÏÂ</City>
- <State>¿ÀÆàÀî</State>
- <Zip>M1C 5C2</Zip>
- <Country>ÆüËÜ</Country>
- </Address>
- <Name>
- <First>°ìϺ</First>
- <Last>ÎëÌÚ</Last>
- </Name>
-</Person>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml
deleted file mode 100644
index a94bcf8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>
-<Person>
- <Address>
- <City>åa</City>
- <State>_Þì</State>
- <Zip>M1C 5C2</Zip>
- <Country>ú{</Country>
- </Address>
- <Name>
- <First>êY</First>
- <Last>éØ</Last>
- </Name>
-</Person>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml
deleted file mode 100644
index a5095e3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml
deleted file mode 100644
index 0d5c1fb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml
deleted file mode 100644
index d611a31..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml
deleted file mode 100644
index 2f422fd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml
deleted file mode 100644
index 21eae02..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8 standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml
deleted file mode 100644
index c90c65d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml
deleted file mode 100644
index b263fc2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml
deleted file mode 100644
index 30b8e94..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml
deleted file mode 100644
index 69aa27e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml
deleted file mode 100644
index 1e6549d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml
deleted file mode 100644
index ca5fc53..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml
deleted file mode 100644
index 575dbaa..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml
deleted file mode 100644
index d39d4d0..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml
deleted file mode 100644
index 8c05b4a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml
deleted file mode 100644
index 88b8d08..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml
deleted file mode 100644
index 0f6e37b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml
deleted file mode 100644
index 7c8cdf2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml
deleted file mode 100644
index 95b530e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml
deleted file mode 100644
index 7d9ba3f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml
deleted file mode 100644
index 7cefcd2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.classpath b/tests/org.eclipse.wst.xml.validation.tests/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
deleted file mode 100644
index 42e94a0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-validatexmltests.jar
-javaCompiler.validatexmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.project b/tests/org.eclipse.wst.xml.validation.tests/.project
deleted file mode 100644
index 112562f..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.validation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 28a20c9..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: validatexmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.errorcustomization;x-internal:=true,
- org.eclipse.wst.xml.validation.tests.internal;x-internal:=true
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.validation,
- org.eclipse.core.resources,
- org.eclipse.wst.common.uriresolver
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.validation.tests/about.html b/tests/org.eclipse.wst.xml.validation.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties
deleted file mode 100644
index 70b0b16..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- testresources/,\
- validatexmltests.jar,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.validatexmltests.jar = src/
-bin.excludes = testresources/.cvsignore
diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
deleted file mode 100644
index 83faaf6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.validation.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = XML Validator Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java
deleted file mode 100644
index 6f3e054..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the XMLValidationConfiguration class.
- */
-public class XMLValidationConfigurationTest extends TestCase
-{
- XMLValidationConfiguration configuration;
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLValidationConfigurationTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- configuration = new XMLValidationConfiguration();
- }
-
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- super.tearDown();
- }
-
-
- /**
- * Test the default setting of the WARN_NO_GRAMMAR feature.
- */
- public void testSetWarnNoGrammarFeatureDefault()
- {
- try
- {
- assertFalse("The WARN_NO_GRAMMAR feature is not set by default to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set read the WARN_NO_GRAMMAR feature: " + e);
- }
- }
-
- /**
- * Test setting the WARN_NO_GRAMMAR feature to true.
- */
- public void testSetWarnNoGrammarFeatureTrue()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true);
- assertTrue("The WARN_NO_GRAMMAR feature is not set to true.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set WARN_NO_GRAMMAR to true: " + e);
- }
- }
-
- /**
- * Test setting the WARN_NO_GRAMMAR feature to false.
- */
- public void testSetWarnNoGrammarFeatureFalse()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- assertFalse("The WARN_NO_GRAMMAR feature is not set to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set WARN_NO_GRAMMAR to false: " + e);
- }
- }
-
- /**
- * Test setting a feature that doesn't exist.
- */
- public void testSetNotExistantFeature()
- {
- try
- {
- configuration.setFeature("NON_EXISTANT_FEATURE", false);
- fail("Setting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
- /**
- * Test getting a feature that doesn't exist.
- */
- public void testGetNotExistantFeature()
- {
- try
- {
- configuration.getFeature("NON_EXISTANT_FEATURE");
- fail("Getting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
- /**
- * Test the default setting of the WARN_NO_GRAMMAR feature.
- */
- public void testIndicateNoGrammarFeatureDefault()
- {
- try
- {
- assertEquals("The INDICATE_NO_GRAMMAR feature is not set by default to Ignore.", 1, configuration.getIntFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set read the WARN_NO_GRAMMAR feature: " + e);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java
deleted file mode 100644
index 0259719..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-public class ValidatorTest extends TestCase
-{
- ValidatorWrapper validator = new ValidatorWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ValidatorTest.class);
- }
-
- /**
- * Test the addInfoToMessage method. The following tests are performed:<br/>
- * 1. When the validation message contains a null key nothing is added to the message.<br/>
- * 2. When the message contains the key "ENTIRE_ELEMENT" the three attributes are added
- * to the method and the SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE is null.<br/>
- * 3. When the message contains the key "EntityNotDeclared" the three attributes are set.
- */
- public void testAddInfoToMessage()
- {
- // These strings are common addition information types.
- String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$
- String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$
- String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$
-
- // Test that the message does not contain the attributes when the method is called
- // with a null key.
- ValidationMessage validationMessage = new ValidationMessage("", 1, 1, "");
- Message message = new Message();
- validator.addInfoToMessage(validationMessage, message);
- assertNull("COLUMN_NUMBER_ATTRIBUTE was not null for a ValidationMessage with a null key. COLUMN_NUMBER_ATTRIBUTE = " + message.getAttribute(COLUMN_NUMBER_ATTRIBUTE), message.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertNull("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "ElementUnterminated".
- ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "ElementUnterminated", null);
- Message message2 = new Message();
- validator.addInfoToMessage(validationMessage2, message2);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key ENTIRE_ELEMENT. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not ENTIRE_ELEMENT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "ENTIRE_ELEMENT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with the key ENTIRE_ELEMENT. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "EntityNotDeclared".
- ValidationMessage validationMessage3 = new ValidationMessage("", 1, 1, "", "EntityNotDeclared", new Object[]{"MyName"});
- Message message3 = new Message();
- validator.addInfoToMessage(validationMessage3, message3);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key EntityNotDeclared. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT_ENTITY_REFERENCE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT_ENTITY_REFERENCE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key EntityNotDeclared. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "MyName", message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
- }
-
- /**
- * Test the validate method. Tests to be performed:<br/>
- * 1. Test that validating a valid file from a URI or an input stream produces the same result.<br/>
- * 2. Test that validating an invalid file from a URI or an input stream produces the same result.
- */
- public void testValidate()
- {
- try
- {
- // Test that validating a valid file from a URI and an input stream produces the same result.
- String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml";
- ValidationReport report1 = validator.validate(uri, null, null);
- ValidationReport report2 = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, null);
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating a valid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertTrue("Validation using a URI did not product a valid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
-
- // Test that validating an invalid file from a URI and an input stream produces the same result.
- uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml";
- report1 = validator.validate(uri, null, null);
- report2 = null;
- is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, null);
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating an invalid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertFalse("Validation using a URI did not product an invalid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
- }
- catch(Exception e)
- {
- fail("Unable to locate plug-in location: " + e);
- }
- }
-
- /**
- * Test that the warn no grammar preference is read from the XML core preferences.
- * There are three tests to perform.
- * 1. Test that the default preference is enabled.
- * 2. Test that setting the preference to disabled works.
- * 3. Test that setting the preference to enabled works.
- */
- public void testWarnNoGrammarPreference()
- {
- // Test that the default preference is disabled.
- validator.setupValidation(null);
- assertNotSame("The default warn no grammar preference is not enabled.", new Integer(0), new Integer(validator.getIndicateNoGrammarPreference()));
-
- // Test that the preference is read when disabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, 0);
- validator.setupValidation(null);
- assertEquals("The warn no grammar preference is not ignore when the preference is set to ignore.", 0, validator.getIndicateNoGrammarPreference());
-
- // Test that the preference is read when enabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, 2);
- validator.setupValidation(null);
- assertEquals("The warn no grammar preference is not error when the preference is set to error.", 2, validator.getIndicateNoGrammarPreference());
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java
deleted file mode 100644
index 2476cce..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-
-/**
- * This class extends validator to expose the protected methods
- * for testing.
- */
-public class ValidatorWrapper extends Validator
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- protected void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
- {
- super.addInfoToMessage(validationMessage, message);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#setupValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext)
- */
- public void setupValidation(NestedValidatorContext context)
- {
- super.setupValidation(context);
- }
-
-/**
- * Export the warn no grammar preference for testing.
- *
- * @return The warn no grammar preference.
- */
- public int getIndicateNoGrammarPreference()
- {
- return indicateNoGrammar;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java
deleted file mode 100644
index 4dbf3cb..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test case to test the XMLMessageInfoHelper class.
- */
-public class XMLMessageInfoHelperTest extends TestCase
-{
- private XMLMessageInfoHelper helper = new XMLMessageInfoHelper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLMessageInfoHelperTest.class);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", null} when
- * given a non-existant key and null message arguments.
- */
- public void testNotExistantKeyAndNullMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo("NON_EXISTANT_KEY", null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertNull("The nameOrValue returned was not null.", messageInfo[1]);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", null} when
- * given a non-existant key and null message arguments.
- */
- public void testNullKeyAndMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo(null, null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertNull("The nameOrValue returned was not null.", messageInfo[1]);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java
deleted file mode 100644
index f0055c9..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the Eclipse specific XML validator.
- */
-public class XMLValidatorTest extends TestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLValidatorTest.class);
- }
-
- /**
- * Test to ensure the URI resolver is not null in the Eclipse
- * specific XML validator.
- */
- public void testURIResolverIsRegistered()
- {
- XMLValidatorWrapper validator = new XMLValidatorWrapper();
- assertNotNull("The URI resolver is null.", validator.getURIResolver());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java
deleted file mode 100644
index 8e1a096..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-
-/**
- * Wrapper for the Eclipse XML validator class to allow for testing.
- */
-public class XMLValidatorWrapper extends XMLValidator
-{
- /**
- * Constructor.
- */
- public XMLValidatorWrapper()
- {
- super();
- }
-
- /**
- * Get the URI resolver registered on the XML validator.
- *
- * @return The URI resolver registered on the XML validator.
- */
- public URIResolver getURIResolver()
- {
- return uriResolver;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java
deleted file mode 100644
index 4b45d1e..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-import org.eclipse.wst.xml.core.internal.validation.XMLValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationManager.ErrorMessageInformation;
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-/**
- * Test the ErrorCustomizationManager class.
- */
-public class ErrorCustomizationManagerTest extends TestCase
-{
-
- /**
- * Test the startElement method with the following tests:
- * 1. Test that the root element is properly pushed to the stack.
- * 2. Test that a subsequent element is properly pushed to the stack and
- * registered as a child element.
- */
- public void testStartElement()
- {
- // 1. Test that the root element is properly pushed to the stack.
- String namespace1 = "http://namespace1";
- String localname1 = "localname";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- assertEquals("1. The element information stack is not empty to start.", 0, manager.getElementInformationStack().size());
- manager.startElement(namespace1, localname1);
- ElementInformation elemInfo = (ElementInformation)manager.getElementInformationStack().pop();
- assertEquals("1. The element information stack is not empty to after popping the top element.", 0, manager.getElementInformationStack().size());
- assertEquals("1. The namespace specified on the element information is not http://namespace1 it is " + elemInfo.getNamespace(), namespace1, elemInfo.getNamespace());
- assertEquals("1. The local name specified on the element information is not localname it is " + elemInfo.getLocalname(), localname1, elemInfo.getLocalname());
-
- // 2. Test that a subsequent element is properly pushed to the stack and registered as a child element.
- String localname2 = "localname2";
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- assertEquals("2. The element information stack is not empty to start.", 0, manager2.getElementInformationStack().size());
- manager2.startElement(namespace1, localname1);
- manager2.startElement(namespace1, localname2);
- assertEquals("2. The element information stack does not contain 2 elements.", 2, manager2.getElementInformationStack().size());
- ElementInformation elemInfo2 = (ElementInformation)manager2.getElementInformationStack().pop();
- assertEquals("2. The element information stack does not contain 1 element after popping the top element.", 1, manager2.getElementInformationStack().size());
- assertEquals("2. The namespace specified on the element information child is not http://namespace1 it is " + elemInfo2.getNamespace(), namespace1, elemInfo2.getNamespace());
- assertEquals("2. The local name specified on the element information child is not localname2 it is " + elemInfo2.getLocalname(), localname2, elemInfo2.getLocalname());
- ElementInformation elemInfo3 = (ElementInformation)manager2.getElementInformationStack().pop();
- assertEquals("2. The element information stack does not contain 0 elements after popping the top element.", 0, manager2.getElementInformationStack().size());
- assertEquals("2. The namespace specified on the element information is not http://namespace1 it is " + elemInfo3.getNamespace(), namespace1, elemInfo3.getNamespace());
- assertEquals("2. The local name specified on the element information is not localname it is " + elemInfo3.getLocalname(), localname1, elemInfo3.getLocalname());
- assertEquals("2. The element information does not contain 1 child element it contains " + elemInfo3.getChildren().size(), 1, elemInfo3.getChildren().size());
- ElementInformation elemInfo4 = (ElementInformation)elemInfo3.getChildren().get(0);
- assertEquals("2. The namespace specified on the element information's child is not http://namespace1 it is " + elemInfo4.getNamespace(), namespace1, elemInfo4.getNamespace());
- assertEquals("2. The local name specified on the element information's child is not localname2 it is " + elemInfo4.getLocalname(), localname2, elemInfo4.getLocalname());
- }
-
- /**
- * Test the endElement method with the following tests:
- * 1. Check that the last element on the stack is successfully popped.
- * 2. Test that an element in a sample namespace produces the expected message.
- * 3. Test that an element not in a sample namespace retains its value.
- */
- public void testEndElement()
- {
- // 1. Check that the last element on the stack is successfully popped.
- String namespace1 = "http://namespace1";
- String localname1 = "localname";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- manager.getElementInformationStack().push(new ElementInformation(namespace1, localname1));
- manager.endElement(namespace1, localname1);
- assertEquals("1. The stack still contains an element.", 0, manager.getElementInformationStack().size());
-
- // 2. Test that an element in a sample namespace produces the expected message.
- String namespace2 = "XMLValidationTestSampleNamespace";
- ErrorCustomizationRegistry.getInstance().addErrorMessageCustomizer(namespace2, new SampleErrorMessageCustomizer());
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- manager2.getElementInformationStack().push(new ElementInformation(namespace2, localname1));
- ErrorMessageInformation emi = manager2.new ErrorMessageInformation();
- emi.message = new ValidationMessage("SampleMessage", 1, 2, namespace2);
- manager2.setMessageForConsideration(emi);
- manager2.endElement(namespace2, localname1);
- assertEquals("2. The message was not customized to AAAA. The message is " + emi.message.getMessage(), "AAAA", emi.message.getMessage());
-
- // 3. Test that an element not in a sample namespace retains its value.
- String namespace3 = "XMLValidationTestSampleNamespace3";
- ErrorCustomizationManagerWrapper manager3 = new ErrorCustomizationManagerWrapper();
- manager3.getElementInformationStack().push(new ElementInformation(namespace3, localname1));
- ErrorMessageInformation emi2 = manager3.new ErrorMessageInformation();
- emi2.message = new ValidationMessage("SampleMessage", 1, 2, namespace3);
- manager3.setMessageForConsideration(emi2);
- manager3.endElement(namespace3, localname1);
- assertEquals("3. The message did not retain its value of SampleMessage. The message is " + emi2.message.getMessage(), "SampleMessage", emi2.message.getMessage());
- }
-
- /**
- * Test the considerReportedError method with the following tests:
- * 1. Check that the messageForConsideration is not set if there are no current
- * validation messages.
- * 2. Check that the messageForConsideration is set correctly if there is a
- * validation message.
- */
- public void testConsiderReportedError()
- {
- // 1. Check that the messageForConsideration is not set if there are no current validation messages.
- String namespace1 = "http://namespace1";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- ValidationInfo valinfo = new ValidationInfo(namespace1);
- manager.considerReportedError(valinfo, "key", null);
- assertNull("1. The messageForConsideration is not null when no validation messages exist.", manager.getMessageForConsideration());
-
- // 2. Check that the messageForConsideration is set correctly if there is a validation message.
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- ValidationInfo valinfo2 = new ValidationInfo(namespace1);
- valinfo2.addError("message", 1, 1, namespace1);
- manager2.considerReportedError(valinfo2, "key", null);
- assertNotNull("2. The messageForConsideration is null when a validation message exists.", manager2.getMessageForConsideration());
- }
-
- /**
- * Test that an error customizer is only called for the
- * correct element.
- */
- public void testErrorReportedOnCorrectElement()
- {
- IErrorMessageCustomizer testCustomizer = new IErrorMessageCustomizer()
- {
- public String customizeMessage(ElementInformation elementInfo, String key, Object[] arguments)
- {
- if(elementInfo.getLocalname().equals("child1"))
- {
- fail("An error was reported for the child1 element.");
- }
- return null;
- }
- };
- ErrorCustomizationRegistry registry = ErrorCustomizationRegistry.getInstance();
- registry.addErrorMessageCustomizer("http://www.example.org/simplenested", testCustomizer);
- try
- {
- String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml";
-
- XMLValidator validator = new XMLValidator();
- validator.validate(uri, null, new XMLValidationConfiguration());
- validator.validate(uri, null, new XMLValidationConfiguration());
- }
- catch(IOException e)
- {
- fail("An exception occurred while running the test:" + e);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java
deleted file mode 100644
index 68202bc..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import java.util.Stack;
-
-/**
- * A wrapper for class ErrorCustomizationManager to facilitate testing.
- */
-public class ErrorCustomizationManagerWrapper extends ErrorCustomizationManager
-{
- /**
- * Get the element information stack.
- *
- * @return
- * The element information stack.
- */
- public Stack getElementInformationStack()
- {
- return elementInformationStack;
- }
-
- /**
- * Get the current message for consideration.
- *
- * @return
- * The current message for consideration.
- */
- public ErrorMessageInformation getMessageForConsideration()
- {
- return messageForConsideration;
- }
-
- /**
- * Set the current message for consideration.
- *
- * @param message
- * The current message for consideration.
- */
- public void setMessageForConsideration(ErrorMessageInformation message)
- {
- messageForConsideration = message;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java
deleted file mode 100644
index bb03412..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for the ErrorCustomizationRegistry class.
- */
-public class ErrorCustomizationRegistryTest extends TestCase
-{
- private ErrorCustomizationRegistry registry = null;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- registry = new ErrorCustomizationRegistryWrapper();
- super.setUp();
- }
-
- /**
- * Test the AddErrorMessageCustomizerToRegistry method with the following tests:
- * 1. Test that adding an error customizer for a namespace is successful.
- * 2. Test that adding two error customizers for a namespace returns both customizers.
- * 3. Test that adding an entry with a null namespace adds the entry for the empty string
- * namespace.
- */
- public void testAddErrorMessageCustomizerToRegistry()
- {
- // 1. Test that adding an error customizer for a namespace is successful.
- String namespace1 = "http://namespace1";
- IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(namespace1, customizer);
- IErrorMessageCustomizer[] registeredCustomizers = registry.getCustomizers(namespace1);
- assertEquals("1. There should only be 1 customizer registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length);
- assertEquals("1. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
-
- // 2. Test that adding two error customizers for a namespace returns both customizers.
- IErrorMessageCustomizer customizer2 = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(namespace1, customizer2);
- registeredCustomizers = registry.getCustomizers(namespace1);
- assertEquals("2. There should be 2 customizers registered for the namespace but there are " + registeredCustomizers.length, 2, registeredCustomizers.length);
- assertEquals("2. The first IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
- assertEquals("2. The second IErrorMessageCustomizer returned is not the same one registered.", customizer2, registeredCustomizers[1]);
-
- // 3. Test that adding an entry with a null namespace adds the entry for the empty string namespace.
- registry.addErrorMessageCustomizer(null, customizer);
- registeredCustomizers = registry.getCustomizers("");
- assertEquals("3. There should be 1 customizers registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length);
- assertEquals("3. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
- }
-
- /**
- * Test the getCustomizers method with the following tests:
- * 1. Test that requesting an error customizer array for a namespace that has not been
- * registered produces an empty array.
- * 2. Test that requesting an error customizer array for the null namespace returns the
- * one registered customizer.
- * 3. Test that requesting an error customizer array for the empty string namespace returns
- * the one registered customizer.
- */
- public void testGetCustomizers()
- {
- // 1. Test that requesting an error customizer list for a namespace that has not been
- // registered produces an empty list.
- IErrorMessageCustomizer[] customizers = registry.getCustomizers("http://nonregisterednamespace");
- assertEquals("1. The array of customizers for an unregistered namespace is not empty.", 0, customizers.length);
-
- // 2. Test that requesting an error customizer array for the null namespace returns the
- // one registered customizer.
- IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(null, customizer);
- customizers = registry.getCustomizers(null);
- assertEquals("2. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer.", 1, customizers.length);
- assertEquals("2. The customizer for the null namespace was not successfully returned.", customizer, customizers[0]);
-
- // 3. Test that requesting an error customizer array for the empty string namespace returns
- // the one registered customizer for the null namespace.
- customizers = registry.getCustomizers("");
- assertEquals("3. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer for the empty string namespace.", 1, customizers.length);
- assertEquals("3. The customizer for the empty string namespace was not successfully returned.", customizer, customizers[0]);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java
deleted file mode 100644
index 2e02d73..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-/**
- * A wrapper for the ErrorCustomizationRegistry class to allow for testing.
- */
-public class ErrorCustomizationRegistryWrapper extends ErrorCustomizationRegistry
-{
- /**
- * Public constructor.
- */
- public ErrorCustomizationRegistryWrapper()
- {
- super();
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java
deleted file mode 100644
index 24f7e49..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-/**
- * Test the ErrorMessageCustomizerDelegate class.
- */
-public class ErrorMessageCustomizerDelegateTest extends TestCase
-{
- /**
- * Test the loadCustomizer method with the following tests:
- * 1. Test that a valid bundle a class succeeds.
- * 2. Test that an invalid class fails and keeps the customizer set to null.
- * 3. Test that a null bundle fails and keeps the customizer set to null.
- */
- public void testLoadCustomizer()
- {
- // 1. Test that a valid bundle a class succeeds.
- ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- delegate.loadCustomizer();
- assertNotNull("1. The customizer loaded was null for a valid customizer and bundle.", delegate.getCustomizer());
-
- // 2. Test that an invalid class fails and keeps the customizer set to null.
- ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer");
- delegate2.loadCustomizer();
- assertNull("2. The customizer loaded was not null for an invalid customizer class.", delegate2.getCustomizer());
-
- // 3. Test that a null bundle fails and keeps the customizer set to null.
- ErrorMessageCustomizerDelegateWrapper delegate3 = new ErrorMessageCustomizerDelegateWrapper(null, "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- delegate3.loadCustomizer();
- assertNull("3. The customizer loaded was not null for a null bundle.", delegate3.getCustomizer());
- }
-
- /**
- * Test the customizeMessage method with the following tests:
- * 1. Test that the message returned is correct for a valid customizer.
- * 2. Test that the message returned is null for an invalid customizer class.
- */
- public void testCustomizeMessage()
- {
- // 1. Test that the message returned is correct for a valid customizer.
- ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- String message = delegate.customizeMessage(null, null, null);
- assertEquals("1. The message returned was not AAAA.", "AAAA", message);
-
- // 2. Test that the message returned is null for an invalid customizer class.
- ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer");
- message = delegate2.customizeMessage(null, null, null);
- assertNull("2. The message returned was not null for an invalid customizer.", message);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java
deleted file mode 100644
index eb87161..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import org.osgi.framework.Bundle;
-
-/**
- * A wrapper of the class ErrorMessageCustomizerDelegate to facilitate testing.
- */
-public class ErrorMessageCustomizerDelegateWrapper extends ErrorMessageCustomizerDelegate
-{
- /**
- * Constructor.
- */
- public ErrorMessageCustomizerDelegateWrapper(Bundle bundle, String classname)
- {
- super(bundle, classname);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegate#loadCustomizer()
- */
- public void loadCustomizer()
- {
- super.loadCustomizer();
- }
-
- public IErrorMessageCustomizer getCustomizer()
- {
- return customizer;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java
deleted file mode 100644
index 7b61828..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-/**
- * A sample error message customizer for testing. This customizer has a simple
- * implementation that simple returns the string "AAAA".
- */
-public class SampleErrorMessageCustomizer implements IErrorMessageCustomizer {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.IErrorMessageCustomizer#customizeMessage(org.eclipse.wst.xml.core.internal.validation.errorcustomization.ElementInformation, java.lang.String, java.lang.Object[])
- */
- public String customizeMessage(ElementInformation elementInfo,
- String errorKey, Object[] arguments) {
- // TODO Auto-generated method stub
- return "AAAA";
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
deleted file mode 100644
index 1d276ee..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfigurationTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.ValidatorTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLMessageInfoHelperTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidatorTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationManagerTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationRegistryTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegateTest;
-
-/**
- * The root test suite that contains all other XML validator test suites.
- */
-public class AllXMLTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXMLTests();
- }
-
- /**
- * Constructor
- */
- public AllXMLTests()
- {
- super("XMLTestsTestSuite");
- addTest(XMLValidationConfigurationTest.suite());
- addTest(ValidatorTest.suite());
- addTest(XMLMessageInfoHelperTest.suite());
- addTest(XMLValidatorTest.suite());
- addTest(XMLExamplesTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- addTestSuite(ErrorCustomizationManagerTest.class);
- addTestSuite(ErrorMessageCustomizerDelegateTest.class);
- addTestSuite(ErrorCustomizationRegistryTest.class);
- addTestSuite(LineNumberAdjustmentsTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index 36d3379..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidator;
-
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected XMLValidator validator = XMLValidator.getInstance();
- protected XMLValidationConfiguration configuration;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws IOException
- {
- PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- configuration = new XMLValidationConfiguration();
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0);
- }
- catch(Exception e)
- {
- fail("Unable to set the feature on the XML validation configuration.");
- }
- }
-
- /**
- * Run a validator test. The test will run the validator, and compare the validation result with
- * the information specified.
- *
- * @param testfile The file to run the validator test on.
- * @param keys The list of allows message keys.
- * @param numErrors The number of expected errors.
- * @param numWarnings The number of expected warnings.
- */
- public void runTest(String testfile, List keys, int numErrors, int numWarnings)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
-
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;
-
- int errorCount = 0;
- int warningCount = 0;
-
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- String key = valmes.getKey();
- assertTrue("The message key " + key + " is not correct.", keys.contains(key));
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- warningCount++;
- }
- else
- {
- errorCount++;
- }
- }
- assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount);
- assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount);
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
deleted file mode 100644
index 4006d8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-/**
- * Test class for the XML validator to test bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- private static final String BUGFIXES_DIR = "bugfixes/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(BugFixesTest.class);
- }
-
- /**
- * Test /bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml.
- */
- public void testRootNoNSChildNS()
- {
- String testname = "RootNoNSChildNS";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "RootNoNSChildNS/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/EmptyFile/Empty.xml.
- */
- public void testEmpty()
- {
- String testname = "Empty";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml.
- */
- public void testValidateWithDTDValid()
- {
- String testname = "ValidateWithDTDValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml.
- */
- public void testValidateWithDTDInvalid()
- {
- String testname = "ValidateWithDTDInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MSG_CONTENT_INVALID");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/NotWellFormed/NotWellFormed.xml.
- */
- public void testNotWellFormed()
- {
- String testname = "NotWellFormed";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NotWellFormed/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("ETagRequired");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/CannotLocateDTD/InvalidHost.xml.
- */
- public void testInvalidHost()
- {
- String testname = "InvalidHost";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/CannotLocateDTD/InvalidLocation.xml.
- */
- public void testInvalidLocation()
- {
- String testname = "InvalidLocation";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/NoGrammar/NoGrammar.xml.
- */
- public void testNoGrammar()
- {
- String testname = "NoGrammar";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoGrammar/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("NO_GRAMMAR_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 1);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- runTest(testfile, keys, numErrors, numWarnings);
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- }
-
- /**
- * Test /bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml.
- */
- public void testNoNamespaceSchema()
- {
- String testname = "NoNamespaceSchema";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoNamespaceSchema/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("cvc-complex-type.2.4.b");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java
deleted file mode 100644
index 51b6506..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-
-/**
- * A test class to test the line number adjustments made in the XML validator.
- */
-public class LineNumberAdjustmentsTest extends BaseTestCase
-{
- private static final String LINE_NUMBER_ADJUSTMENTS_DIR = "LineNumberAdjustments/";
-
- /**
- * Run a validator test. The test will run the validator, and compare the validation result with
- * the information specified.
- *
- * @param testfile
- * The file to run the validator test on.
- * @param key
- * The message key.
- * @param numErrors
- * The number of expected errors.
- * @param numWarnings
- * The number of expected warnings.
- * @param lineno
- * The line number the message should be located on.
- * @param columnno
- * The column number the message should be located on.
- */
- public void runTest(String testfile, String key, int numErrors, int numWarnings, int lineno, int columnno)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
-
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;
-
- int errorCount = 0;
- int warningCount = 0;
-
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- String messkey = valmes.getKey();
- assertTrue("The message key " + key + " is not correct.", key.equals(messkey));
- assertEquals("The line number is incorrect.", lineno, valmes.getLineNumber());
- assertEquals("The column number is incorrect.", columnno, valmes.getColumnNumber());
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- warningCount++;
- }
- else
- {
- errorCount++;
- }
- }
- assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount);
- assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount);
- }
-
- /**
- * Test /LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml.
- */
- public void testcvccomplextype23()
- {
- String testname = "cvc-complex-type.2.3";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.3/" + testname + ".xml";
- String key = "cvc-complex-type.2.3";
- int lineno = 2;
- int columnno = 187;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml.
- */
- public void testcvccomplextype24b()
- {
- String testname = "cvc-complex-type.2.4.b";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.4.b/" + testname + ".xml";
- String key = "cvc-complex-type.2.4.b";
- int lineno = 2;
- int columnno = 187;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml.
- */
- public void testMsgContentIncomplete()
- {
- String testname = "MSG_CONTENT_INCOMPLETE";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INCOMPLETE/" + testname + ".xml";
- String key = "MSG_CONTENT_INCOMPLETE";
- int lineno = 6;
- int columnno = 7;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml.
- */
- public void testMsgContentInvalid()
- {
- String testname = "MSG_CONTENT_INVALID";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INVALID/" + testname + ".xml";
- String key = "MSG_CONTENT_INVALID";
- int lineno = 6;
- int columnno = 7;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
deleted file mode 100644
index f2390c0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Test class for the XML validator to test bug fixes.
- *
- * @author Lawrence Mandel, IBM
- */
-public class PathsTest extends BaseTestCase
-{
- private static final String PATHS_DIR = "Paths/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(PathsTest.class);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathValid.xml.
- */
- public void testSpaceInPathValid()
- {
- String testname = "SpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathInvalid.xml.
- */
- public void testSpaceInPathInvalid()
- {
- String testname = "SpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xml.
- */
- public void testCloseBracketInPathValid()
- {
- String testname = "CloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml.
- */
- public void testCloseBracketInPathInvalid()
- {
- String testname = "CloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml.
- */
- public void testCloseBracketInFilenameValid()
- {
- String testname = "CloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml.
- */
- public void testCloseBracketInFilenameInvalid()
- {
- String testname = "CloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathValid.xml.
- */
- public void testDashInPathValid()
- {
- String testname = "DashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathInvalid.xml.
- */
- public void testDashInPathInvalid()
- {
- String testname = "DashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameValid.xml.
- */
- public void testDashInFilenameValid()
- {
- String testname = "Dash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xml.
- */
- public void testDashInFilenameInvalid()
- {
- String testname = "Dash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xml.
- */
- public void testExclamationInPathValid()
- {
- String testname = "ExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xml.
- */
- public void testExclamationInPathInvalid()
- {
- String testname = "ExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml.
- */
- public void testExclamationInFilenameValid()
- {
- String testname = "Exclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml.
- */
- public void testExclamationInFilenameInvalid()
- {
- String testname = "Exclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xml.
- */
- public void testOpenBracketInPathValid()
- {
- String testname = "OpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml.
- */
- public void testOpenBracketInPathInvalid()
- {
- String testname = "OpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml.
- */
- public void testOpenBracketInFilenameValid()
- {
- String testname = "OpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml.
- */
- public void testOpenBracketInFilenameInvalid()
- {
- String testname = "OpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathValid.xml.
- */
- public void testPeriodBracketInPathValid()
- {
- String testname = "PeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathInvalid.xml.
- */
- public void testPeriodBracketInPathInvalid()
- {
- String testname = "PeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameValid.xml.
- */
- public void testPeriodBracketInFilenameValid()
- {
- String testname = "Period.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xml.
- */
- public void testPeriodBracketInFilenameInvalid()
- {
- String testname = "Period.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathValid.xml.
- */
- public void testQuoteInPathValid()
- {
- String testname = "QuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathInvalid.xml.
- */
- public void testQuoteInPathInvalid()
- {
- String testname = "QuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xml.
- */
- public void testQuoteInFilenameValid()
- {
- String testname = "Quote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xml.
- */
- public void testQuoteInFilenameInvalid()
- {
- String testname = "Quote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameValid.xml.
- */
- public void testSpaceInFilenameValid()
- {
- String testname = "Space InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xml.
- */
- public void testSpaceInFilenameInvalid()
- {
- String testname = "Space InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathValid.xml.
- */
- public void testTildeInPathValid()
- {
- String testname = "TildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathInvalid.xml.
- */
- public void testTildeInPathInvalid()
- {
- String testname = "TildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xml.
- */
- public void testTildeInFilenameValid()
- {
- String testname = "Tilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xml.
- */
- public void testTildeInFilenameInvalid()
- {
- String testname = "Tilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xml.
- */
- public void testUnderscoreInPathValid()
- {
- String testname = "UnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xml.
- */
- public void testUnderscoreInPathInvalid()
- {
- String testname = "UnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml.
- */
- public void testUnderscoreInFilenameValid()
- {
- String testname = "Underscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml.
- */
- public void testUnderscoreInFilenameInvalid()
- {
- String testname = "Underscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xml.
- */
- public void testAngleHatInPathValid()
- {
- String testname = "AngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xml.
- */
- public void testAngleHatInPathInvalid()
- {
- String testname = "AngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml.
- */
- public void testAngleHatInFilenameValid()
- {
- String testname = "AngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml.
- */
- public void testAngleHatInFilenameInvalid()
- {
- String testname = "AngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
deleted file mode 100644
index 2511f63..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Test class for the XML validator to test the XMLProject.
- *
- * @author Lawrence Mandel, IBM
- */
-public class XMLExamplesTest extends BaseTestCase
-{
- private static final String XMLExamples_DIR = "XMLExamples/";
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLExamplesTest.class);
- }
-
- /**
- * Test /XMLExamples/Invoice/Invoice.xml.
- */
- public void testInvoice()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "Invoice/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceRemote/Invoice.xml.
- */
- public void testInvoiceRemote()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceRemote/Invoice.xml.
- */
- public void testInvoiceRemoteIndirect()
- {
- String testname = "InvoiceIndirect";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceInvalid/Invoice.xml.
- */
- public void testInvoiceInvalid()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceInvalid/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/PublicationCatalogue/Catalogue.xml.
- */
- public void testCatalogue()
- {
- String testname = "Catalogue";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogue/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/PublicationCatalogueInvalid/Catalogue.xml.
- */
- public void testCatalogueInvalid()
- {
- String testname = "CatalogueInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogueInvalid/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/j2ee/web.xml.
- */
- /**
- public void testWeb()
- {
-
- String testname = "web";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "j2ee/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
- */
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
deleted file mode 100644
index 76ee31d..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The plugin class for this test plugin.
- */
-public class XMLValidatorTestsPlugin extends Plugin {
- private static XMLValidatorTestsPlugin plugin = null;
-
- public XMLValidatorTestsPlugin() {
- plugin = this;
- }
-
- public static String getPluginLocation() throws IOException {
- String file = FileLocator.resolve(plugin.getBundle().getEntry("/")).getFile();
- return new Path(file).removeTrailingSeparator().toString();
- }
-
- public static XMLValidatorTestsPlugin getPlugin()
- {
- return plugin;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/test.xml b/tests/org.eclipse.wst.xml.validation.tests/test.xml
deleted file mode 100644
index bea3313..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.validation.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml
deleted file mode 100644
index 4985c9a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE root [
-<!ELEMENT root (child+)>
-<!ELEMENT child (#PCDATA)>
-]>
-<root>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml
deleted file mode 100644
index 0e1bd52..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE root [
-<!ELEMENT root (child+)>
-<!ELEMENT child (#PCDATA)>
-]>
-<root>
-aaaa
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd
deleted file mode 100644
index 2e0f4d0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren">
-
- <element name="MyElement" type="tns:NewXSDComplexType"></element>
-
- <complexType name="NewXSDComplexType">
- <sequence>
- <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="0"></element>
- </sequence>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml
deleted file mode 100644
index c805ecf..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd ">
-aaaaa
-</tns:MyElement>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd
deleted file mode 100644
index ab01a09..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren">
-
- <element name="MyElement" type="tns:NewXSDComplexType"></element>
-
- <complexType name="NewXSDComplexType">
- <sequence>
- <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="1"></element>
- </sequence>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml
deleted file mode 100644
index 3bbedb6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd ">
-
-</tns:MyElement>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd
deleted file mode 100644
index 0737ba6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT Invoice (Header,Item+)>
-<!ELEMENT Header (Date,BillTo)>
-<!ATTLIST Header
- invoiceNumber CDATA #REQUIRED
->
-<!ELEMENT Item (description*)>
-<!ATTLIST Item
- price CDATA #REQUIRED
- discount (promotion | regular) "regular"
->
-<!ELEMENT Date ((Month,Day,Year)|(Day,Month,Year))>
-<!ELEMENT BillTo (Address)>
-<!ATTLIST BillTo
- custNumber ID #REQUIRED
- name CDATA #IMPLIED
- phone CDATA #IMPLIED
->
-<!ELEMENT description (#PCDATA)>
-<!ELEMENT Address (street1,street2?,city,(state|province),zip,country?)>
-<!ELEMENT street1 (#PCDATA)>
-<!ELEMENT street2 (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT province (#PCDATA)>
-<!ELEMENT zip (#PCDATA)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT Month (#PCDATA)>
-<!ELEMENT Day (#PCDATA)>
-<!ELEMENT Year (#PCDATA)>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml
deleted file mode 100644
index b79af27..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml
deleted file mode 100644
index b79af27..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml
deleted file mode 100644
index 15ba3ea..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd">
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml
deleted file mode 100644
index f9e9874..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd">
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml
deleted file mode 100644
index 2749876..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd ">
- <c:Book>
- <title>Professional XML Schema</title>
- <date>2001</date>
- <isbn>1-861005-47-4</isbn>
- <publisher>Wrox Press</publisher>
- </c:Book>
- <c:Magazine>
- <title>WebSphere Developer's Journal</title>
- <date>2001</date>
- </c:Magazine>
- <c:Book>
- <title>Java and XSLT</title>
- <date>2001</date>
- <isbn>0-596-00143-6</isbn>
- <publisher>O'Reilly</publisher>
- </c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd
deleted file mode 100644
index d4ff9fd..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.eclipse.org/webtools/Catalogue" xmlns:c="http://www.eclipse.org/webtools/Catalogue">
-
- <complexType name="PublicationType">
- <sequence>
- <element name="title" type="string"></element>
- <element name="author" type="string" minOccurs="0" maxOccurs="unbounded"></element>
- <element name="date" type="gYear"></element>
- </sequence>
- </complexType>
-
- <complexType name="BookType">
- <complexContent>
- <extension base="c:PublicationType">
- <sequence>
- <element name="isbn" type="string" />
- <element name="publisher" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MagazineType">
- <complexContent>
- <restriction base="c:PublicationType">
- <sequence>
- <element name="title" type="string" />
- <element name="author" type="string" minOccurs="0" maxOccurs="0"/>
- <element name="date" type="gYear"></element>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
- <element name="Publication" type="c:PublicationType" abstract="true"></element>
-
- <element name="Book" type="c:BookType" substitutionGroup="c:Publication"></element>
-
- <element name="Magazine" type="c:MagazineType" substitutionGroup="c:Publication"></element>
-
- <element name="Catalogue">
- <complexType>
- <sequence>
- <element ref="c:Publication" maxOccurs="unbounded"></element>
- </sequence>
- </complexType>
- </element>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml
deleted file mode 100644
index 2749876..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd ">
- <c:Book>
- <title>Professional XML Schema</title>
- <date>2001</date>
- <isbn>1-861005-47-4</isbn>
- <publisher>Wrox Press</publisher>
- </c:Book>
- <c:Magazine>
- <title>WebSphere Developer's Journal</title>
- <date>2001</date>
- </c:Magazine>
- <c:Book>
- <title>Java and XSLT</title>
- <date>2001</date>
- <isbn>0-596-00143-6</isbn>
- <publisher>O'Reilly</publisher>
- </c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml
deleted file mode 100644
index 8c60a40..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>module</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
-
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml
deleted file mode 100644
index 19e8db6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.blah/non-existent-dtd.dtd">
-<example/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml
deleted file mode 100644
index 421b8bc..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.org/webtools/non-existent-dtd.dtd">
-<example/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
deleted file mode 100644
index 8ce7ba6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns="http://www.example.org/simplenested" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/simplenested simplenested.xsd ">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
deleted file mode 100644
index 2cf5ad2..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/simplenested" xmlns:tns="http://www.example.org/simplenested">
-
- <element name="root">
- <complexType>
- <sequence>
-
- <element ref="tns:child1"></element>
- <element ref="tns:child2"></element>
- </sequence>
- </complexType>
- </element>
- <element name="child1" type="string"></element>
- <element name="child2" type="string"></element>
-
-</schema>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml
deleted file mode 100644
index 089c886..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <child>
- <child2/>
- </child>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
deleted file mode 100644
index 00f19a1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="NoNamespaceSchema.xsd">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
deleted file mode 100644
index e2b0f24..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="root" type="RootType"></xsd:element>
- <xsd:complexType name="RootType">
- <xsd:sequence>
- <xsd:element name="child1" type="xsd:string"></xsd:element>
- <xsd:element name="child2" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml
deleted file mode 100644
index 8099b2a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <noclosingtag>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml
deleted file mode 100644
index b4e44ef..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<root>
- <test:test xmlns:test="http://test.org/test">
- </test:test>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml
deleted file mode 100644
index 904d0a1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE simple SYSTEM "simple.dtd">
-
-<simple version="2.0" xmlns="http://www.simple.com/simple">
- <dummy> </dummy>
-</simple>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml
deleted file mode 100644
index e995d8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE simple SYSTEM "simple.dtd">
-
-<simple version="2.0" xmlns="http://www.simple.com/simple">
- <simple1>
- <simple2/>
- </simple1>
-</simple>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd
deleted file mode 100644
index 2849b97..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!ELEMENT simple (simple1)>
-<!ATTLIST simple
- version CDATA #REQUIRED
- xmlns CDATA #FIXED 'http://www.simple.com/simple'
- >
-<!ELEMENT simple1 (simple2)>
-<!ELEMENT simple2 EMPTY>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/.classpath b/tests/org.eclipse.wst.xsd.core.tests/.classpath
deleted file mode 100644
index 23e61fd..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/.project b/tests/org.eclipse.wst.xsd.core.tests/.project
deleted file mode 100644
index b425b09..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35bdab8..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jan 09 16:45:03 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index df7b463..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.core.tests
-Bundle-Version: 1.0.2.qualifier
-Bundle-ClassPath: xsdcoretests.jar
-Bundle-Activator: org.eclipse.wst.xsd.core.tests.internal.XSDCoreTestsPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="[3.8.2,4.0.0)",
- org.eclipse.wst.xsd.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsd.core.tests.internal
diff --git a/tests/org.eclipse.wst.xsd.core.tests/about.html b/tests/org.eclipse.wst.xsd.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/build.properties b/tests/org.eclipse.wst.xsd.core.tests/build.properties
deleted file mode 100644
index bfd9a42..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
- xsdcoretests.jar,\
- plugin.properties,\
- about.html,\
- testresources/,\
- test.xml
-source.xsdcoretests.jar = src/
-output.xsdcoretests.jar = bin/
-src.includes = build.properties
diff --git a/tests/org.eclipse.wst.xsd.core.tests/plugin.properties b/tests/org.eclipse.wst.xsd.core.tests/plugin.properties
deleted file mode 100644
index cd2cd31..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.core.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = XSD Core Tests Plugin
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java
deleted file mode 100644
index bb9a2b1..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.tests.internal;
-import junit.framework.Test;
-/**
- * The root test suite that contains all other XSD Core test suites.
- */
-public class AllXSDCoreTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDCoreTests();
- }
-
- /**
- * Constructor
- */
- public AllXSDCoreTests()
- {
- super("AllXSDCoreTests");
- addTest(BugFixesTest.suite());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java
deleted file mode 100644
index 95fb1a7..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
- protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
- protected String LOG_FILE_LOCATION = "results.log";
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XSDCoreTestsPlugin.getInstallURL();
- }
-
- protected String locateFileUsingCatalog(String namespaceURI)
- {
- URIResolver resolver = URIResolverPlugin.createResolver();
- String result = resolver.resolve("", namespaceURI, "");
- String resolvedURI = resolver.resolvePhysicalLocation("", namespaceURI, result);
- if (resolvedURI == null || resolvedURI.length() == 0)
- {
- return namespaceURI;
- }
- return resolvedURI;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
deleted file mode 100644
index 25e505d..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,497 +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
- * David Carver - STAR - bug 157254
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.tests.internal;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xsd.contentmodel.internal.CMDocumentFactoryXSD;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.DocumentationImpl;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDModelGroupAdapter;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.osgi.framework.Bundle;
-
-/**
- * Test class for bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- protected String BUGFIXES_DIR = "BugFixes/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(BugFixesTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- // Add tests here
-
- @SuppressWarnings("unchecked")
- public void testXSIType()
- {
- String soapSchemaURI = locateFileUsingCatalog("http://schemas.xmlsoap.org/wsdl/soap/");
-
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
-
- CMDocument cmDocument = factory.createCMDocument(soapSchemaURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
-
- CMNamedNodeMap elements = cmDocument.getElements();
-
- boolean foundDesiredElement = false;
- for (Iterator<CMElementDeclaration> i = elements.iterator(); i.hasNext(); )
- {
- CMElementDeclaration element = i.next();
- if ("binding".equals(element.getElementName()))
- {
- foundDesiredElement = true;
-
- CMNamedNodeMap attributes = element.getAttributes();
- assertNotNull(attributes); // Three attributes: required, transport and style
- assertTrue(attributes.getLength() == 3); // If the xsi:type was present, it would be 4 attributes
-
- CMNode attrNode = null;
-
- attrNode = attributes.getNamedItem("required");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("transport");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("style");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("type"); // Should be null!
- assertNull(attrNode);
- break;
- }
- }
- assertTrue(foundDesiredElement); // if we didn't even find the binding element, then something terrible went wrong
- }
-
- @SuppressWarnings("unchecked")
- public void testStackOverflow()
- {
- String vxmlSchemaURI = locateFileUsingCatalog("http://www.w3.org/TR/voicexml20/vxml.xsd");
-
- // See bug 206138
-
- // Two ways to test this.
- // First way. Call findTypesDerivedFrom from XSDImpl.
-
- XSDSchema xsdSchema = XSDImpl.buildXSDModel(vxmlSchemaURI);
- assertNotNull(xsdSchema);
- boolean foundDesiredType = false;
- for (Iterator<XSDTypeDefinition> types = xsdSchema.getTypeDefinitions().iterator(); types.hasNext(); )
- {
- XSDTypeDefinition type = types.next();
- if (type instanceof XSDComplexTypeDefinition)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) type;
- if ("basic.event.handler".equals(complexType.getName()))
- {
- foundDesiredType = true;
- List<XSDTypeDefinition> list = XSDImpl.findTypesDerivedFrom(complexType);
- int size = list.size();
- // assertTrue(size == 1); // if we got something back, then great, there was no out of stack error
- assertTrue(size >= 0);
- // Because of bug 203048, there is a change in behaviour to redefined types.
- // The complex type named speaker is no longer circular. In terms of this junit, the value returned is not relevant
- // since we just want some length back (i.e. there was no crash from a stack overflow).
- break;
- }
- }
- }
- assertTrue(foundDesiredType); // if we didn't even find the complex type, then something terrible went wrong
-
- // Second way to test via content model
-
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
-
- CMDocument cmDocument = factory.createCMDocument(vxmlSchemaURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
-
- CMNamedNodeMap elements = cmDocument.getElements();
-
- boolean foundDesiredElement = false;
- for (Iterator<CMElementDeclaration> i = elements.iterator(); i.hasNext(); )
- {
- CMElementDeclaration element = i.next();
- if ("noinput".equals(element.getElementName()))
- {
- CMNamedNodeMap attributes = element.getAttributes();
- assertNotNull(attributes);
- // assertTrue(attributes.getLength() == 3); // if we got something back, then great, there was no out of stack error
- // Because of bug 203048, there is a change in behaviour to redefined types.
- // The complex type named speaker is no longer circular. In terms of this junit, the value returned is not relevant
- // since we just want some length back (i.e. there was no crash from a stack overflow).
- assertTrue(attributes.getLength() >= 0);
- foundDesiredElement = true;
- break;
- }
- }
- assertTrue(foundDesiredElement); // if we didn't even find the noinput element, then something terrible went wrong
- }
-
- public void testXSDTypeWhitespaceFacets() {
- // Bug [194698] - Test that the correct whitespace facets are applied to the types
- String XSD_FILE_NAME = "XSDWhitespace.xsd";
- String fileURI = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_FILE_NAME;
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
- CMDocument cmDocument = factory.createCMDocument(fileURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
- CMElementDeclaration elemDecl = (CMElementDeclaration)cmDocument.getElements().item(0);
- assertEquals("test", elemDecl.getNodeName());
- assertTrue(elemDecl.getContent() instanceof XSDModelGroupAdapter);
- XSDModelGroupAdapter group = (XSDModelGroupAdapter) elemDecl.getContent();
- CMNodeList list = group.getChildNodes();
- XSDElementDeclarationAdapter adapter = null;
-
- String nodeName = null, expected = null;
- CMDataType type = null;
- // Iterate over the child nodes of the element, examining the whitespace facets */
- for(int i = 0; i < list.getLength(); i++) {
- adapter = (XSDElementDeclarationAdapter) list.item(i);
-
- nodeName = adapter.getNodeName();
- assertNotNull(nodeName);
- assertTrue(nodeName.contains("-"));
- type = adapter.getDataType();
- assertNotNull(type);
-
- expected = nodeName.substring(nodeName.indexOf('-') + 1);
- assertEquals(expected, type.getProperty(XSDImpl.PROPERTY_WHITESPACE_FACET));
- }
- }
-
- public void testXSITypeVsTypeAttr()
- {
-
- // See bug 225447, 225819
-
- // Load the XSD file
- String XSD_FILE_NAME = "XSITypeTest.xsd";
- String fileURI = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_FILE_NAME;
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
- CMDocument cmDocument = factory.createCMDocument(fileURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
-
- // Check and obtain the two global elements (elementA and elementB)
- CMNamedNodeMap elements = cmDocument.getElements();
- assertEquals(elements.getLength(), 2);
- CMElementDeclaration cmElementDeclaration = (CMElementDeclaration)elements.item(0);
- CMElementDeclaration cmElementDeclarationA = null;
- CMElementDeclaration cmElementDeclarationB = null;
- if ("elementA".equals(cmElementDeclaration.getElementName()))
- {
- cmElementDeclarationA = cmElementDeclaration;
- cmElementDeclarationB = (CMElementDeclaration)elements.item(1);
- }
- else
- {
- cmElementDeclarationB = cmElementDeclaration;
- cmElementDeclarationA = (CMElementDeclaration)elements.item(1);
- }
-
- // elementA has a "type" attribute with "X" enumerated value, make sure it appears in the model
- CMNamedNodeMap attributesA = cmElementDeclarationA.getAttributes();
- assertEquals(attributesA.getLength(), 1);
- CMAttributeDeclaration cmAttributeDeclarationA = (CMAttributeDeclaration)attributesA.item(0);
- assertEquals("type", cmAttributeDeclarationA.getAttrName());
- CMDataType attrTypeA = cmAttributeDeclarationA.getAttrType();
- String[] enumeratedValuesA = attrTypeA.getEnumeratedValues();
- assertEquals(1, enumeratedValuesA.length);
- assertEquals("X", enumeratedValuesA[0]);
-
- // elementB does not have a "type" attribute, make sure the xsi:type appears in the model
- CMNamedNodeMap attributesB = cmElementDeclarationB.getAttributes();
- assertEquals(attributesB.getLength(), 1);
- CMAttributeDeclaration cmAttributeDeclarationB = (CMAttributeDeclaration)attributesB.item(0);
- assertEquals("type", cmAttributeDeclarationB.getAttrName());
- CMDataType attrTypeB = cmAttributeDeclarationB.getAttrType();
- assertEquals("typeNames", attrTypeB.getDataTypeName());
- }
-
- public void testEnumerationsInComplexTypesWithSimpleContent()
- {
- // See bug 215514
-
- // Obtain the Web Application schema
- String vxmlSchemaURI = locateFileUsingCatalog("http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd");
- XSDSchema xsdSchema = XSDImpl.buildXSDModel(vxmlSchemaURI);
- assertNotNull(xsdSchema);
-
- // The type transport-guaranteeType is defined as a complex type with simple type content
- // It has 3 enumerated values
- String typeName = "transport-guaranteeType";
- for (Iterator<XSDTypeDefinition> types = xsdSchema.getTypeDefinitions().iterator(); types.hasNext();)
- {
- XSDTypeDefinition type = types.next();
- if (type instanceof XSDComplexTypeDefinition)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)type;
- if (typeName.equals(complexType.getName()))
- {
- String[] enumeratedValuesForType = XSDImpl.getEnumeratedValuesForType(complexType);
- // Ensure that the 3 enumerated values are returned
- assertEquals(3, enumeratedValuesForType.length);
- return;
- }
- }
- }
- }
-
- public void testGlobalElementDocumentation()
- {
- // See bug 157254
-
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/documentation/globalreftest.xsd");
-
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- CMNamedNodeMap elements = document.getElements();
-
- CMElementDeclaration node = (CMElementDeclaration)elements.getNamedItem("rootTest");
- assertNotNull("Missing rootElement", node);
-
- CMElementDeclaration testElement = (CMElementDeclaration)node.getLocalElements().getNamedItem("test");
- assertNotNull("Missing test element", testElement);
-
- CMNodeList documentation = (CMNodeList)testElement.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("test global element missing documentation.");
- }
- for (int cnt = 0; cnt < documentation.getLength(); cnt++) {
- DocumentationImpl doc = (DocumentationImpl) documentation.item(cnt);
- assertEquals("Test global element missing documentation.", "This some global documentation", doc.getValue());
- }
-
- testElement = (CMElementDeclaration)node.getLocalElements().getNamedItem("testElement");
- documentation = (CMNodeList)testElement.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("testElement local element missing documentation.");
- }
- for (int cnt = 0; cnt < documentation.getLength(); cnt++) {
- DocumentationImpl doc = (DocumentationImpl) documentation.item(cnt);
- assertEquals("testElement documentation wrong.", "This is an override", doc.getValue());
- }
- }
-
- public void testGlobalAtrributeDocumentation()
- {
- // See bug 157254
-
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/documentation/TestAttributeRefs.xsd");
-
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- CMNamedNodeMap elements = document.getElements();
-
- CMElementDeclaration node = (CMElementDeclaration)elements.getNamedItem("object");
- assertNotNull("Missing object element", node);
-
- CMNamedNodeMap attributes = node.getAttributes();
- testGlobalAttr1Documentation(attributes);
- testGlobalAttr2Documentation(attributes);
- testGlobalAttr3Documentation(attributes);
- testGlobalAttr4Documentation(attributes);
- testLocalAttrDocumentation(attributes);
-
- }
-
- private void testLocalAttrDocumentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("localAttr");
- assertNotNull("Missing localAttr attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for localAttr");
- }
- assertEquals("Wrong number of documentation annotations.", 2, documentation.getLength());
- assertEquals("Incorrect annotation for localAttr:",
- "PASS! Multiple documentation elements for local attribute part 1",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- assertEquals("Incorrect annotation for localAttr:",
- "PASS! Multiple documentation elements for local attribute part 2",
- ((DocumentationImpl)documentation.item(1)).getValue().trim());
- }
-
-
- private void testGlobalAttr1Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr1");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr1");
- }
- assertEquals("Wrong number of documentation annotations.", 2, documentation.getLength());
- assertEquals("Incorrect first annotation for globalAttr1:",
- "PASS! Documentation for attribute ref overrides the resolved attribute ref documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
-
- assertEquals("Incorrect second annotation for globalAttr1:",
- "PASS! Multiple documentation elements.",
- ((DocumentationImpl)documentation.item(1)).getValue().trim());
- }
-
- private void testGlobalAttr2Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr2");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr2");
- }
- assertEquals("Wrong number of documentation annotations.", 1, documentation.getLength());
- assertEquals("Incorrect annotation for globalAttr2:",
- "PASS! Documentation for resolved attribute ref when the attribute ref does not have documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- }
-
- private void testGlobalAttr3Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr3");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr3");
- }
- assertEquals("Wrong number of documentation annotations.", 1, documentation.getLength());
- assertEquals("Incorrect annotation for globalAttr3:",
- "PASS! Documentation for resolved attribute ref when the attribute ref has an annotation but does not have documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- }
-
- private void testGlobalAttr4Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr4");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Documentation element not returned for globalAttr4");
- }
- assertNull("globalAttr4 returned data when non expected.", ((DocumentationImpl)documentation.item(0)).getValue());
- }
-
-
- public void testCMVisitorForCyclicGroupReferences()
- {
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245851
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd");
-
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- CMNamedNodeMap elements = document.getElements();
-
- CMElementDeclaration rootElement = (CMElementDeclaration)elements.getNamedItem("RootElement");
- assertNotNull("Missing object element", rootElement);
-
- try
- {
- // Tests GraphGenerator's visitCMNode
- CMValidator cmValidator = new CMValidator(); // internal
- cmValidator.createGraph(rootElement);
-
- // Tests CMDescriptionBuilder's visitCMNode
- CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder(); // internal
- descriptionBuilder.buildDescription(rootElement);
- }
- catch (StackOverflowError e)
- {
- fail(e.getLocalizedMessage());
- }
- }
-
- public void testXSDVisitorForCyclicGroupReferences()
- {
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=245851
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd");
-
- XSDSchema xsdSchema = XSDImpl.buildXSDModel(url.toExternalForm());
- assertNotNull(xsdSchema);
-
- String typeName = "RootElement";
- try
- {
- for (Iterator elements = xsdSchema.getElementDeclarations().iterator(); elements.hasNext();)
- {
- Object obj = elements.next();
- if (obj instanceof XSDElementDeclaration)
- {
- XSDElementDeclaration element = (XSDElementDeclaration) obj;
- if (typeName.equals(element.getName()))
- {
- CMNode cmNode = XSDImpl.getAdapter(element);
- if (cmNode instanceof XSDElementDeclarationAdapter)
- {
- XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) cmNode;
- CMContent content = adapter.getContent();
- assertNotNull("Content is null", content);
-
- CMNamedNodeMap localElements = adapter.getLocalElements();
- assertNotNull("localElements is null", localElements);
- return;
- }
- }
- }
- }
- }
- catch (StackOverflowError e)
- {
- fail(e.getLocalizedMessage());
- }
- fail("Unexpected failure");
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java
deleted file mode 100644
index fa74cea..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XSDCoreTestsPlugin extends Plugin
-{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.xsd.core.tests";
- protected static Bundle pluginBundle;
-
- // The shared instance
- private static XSDCoreTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public XSDCoreTestsPlugin()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- plugin = this;
- pluginBundle = context.getBundle();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- plugin = null;
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static XSDCoreTestsPlugin getDefault()
- {
- return plugin;
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.core.tests/test.xml b/tests/org.eclipse.wst.xsd.core.tests/test.xml
deleted file mode 100644
index f79cf81..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xsd.core.tests.internal.AllXSDCoreTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd
deleted file mode 100644
index 2c6491c..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="test" type="xsdTest" />
- <!-- Define a simple type to test that the hierarchy overriding whitespace rule is observed -->
- <xsd:simpleType name="CollapsedString">
- <xsd:restriction base="xsd:string">
- <xsd:whiteSpace value="collapse" />
- </xsd:restriction>
- </xsd:simpleType>
- <!-- Define a simple type to test that the whitespace rule is inherited from the ancestor -->
- <xsd:simpleType name="Normalized">
- <xsd:restriction base="xsd:normalizedString"></xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="xsdTest">
- <xsd:sequence>
- <!-- Whitespace should be replaced -->
- <xsd:element name="simple-replace" type="xsd:normalizedString" />
- <xsd:element name="integer-collapse" type="xsd:nonNegativeInteger" />
- <!-- Whitespace should collapse -->
- <xsd:element name="token-collapse" type="xsd:token" />
- <!-- Whitespace should be preserved -->
- <xsd:element name="string-preserve" type="xsd:string" />
- <!-- Whitespace should collapse -->
- <xsd:element name="duration-collapse" type="xsd:duration" />
- <xsd:element name="extended-collapse" type="CollapsedString" />
- <xsd:element name="extended-replace" type="Normalized" />
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd
deleted file mode 100644
index 1439647..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NewXMLSchema"
- xmlns:tns="http://www.example.org/NewXMLSchema" elementFormDefault="qualified">
- <complexType name="typeA">
- <attribute name="type" use="required">
- <simpleType>
- <restriction base="string">
- <enumeration value="X"></enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- <complexType name="typeB">
- </complexType>
- <complexType name="typeC">
- <complexContent>
- <extension base="tns:typeA">
- </extension>
- </complexContent>
- </complexType>
- <complexType name="typeD">
- <complexContent>
- <extension base="tns:typeB">
- </extension>
- </complexContent>
- </complexType>
- <element name="elementA" type="tns:typeA"></element>
- <element name="elementB" type="tns:typeB"></element>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd
deleted file mode 100644
index 37c20aa..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="object" type="object"></xsd:element>
- <xsd:complexType name="object">
- <xsd:attribute ref="globalAttr1" use="required">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for attribute ref overrides the resolved attribute ref documentation
- </xsd:documentation>
- <xsd:documentation>
- PASS! Multiple documentation elements.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute ref="globalAttr2" use="required"></xsd:attribute>
- <xsd:attribute ref="globalAttr3" use="required">
- <xsd:annotation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute ref="globalAttr4" use="required">
- <xsd:annotation>
- <xsd:documentation></xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="localAttr" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Multiple documentation elements for local attribute part 1
- </xsd:documentation>
- <xsd:documentation>
- PASS! Multiple documentation elements for local attribute part 2
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:attribute name="globalAttr1">
- <xsd:annotation>
- <xsd:documentation>
- FAILED! Documentation for resolved attribute ref. If this doc shows, it's a bug.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:pattern value="[a-zA-Z0-9_]+"></xsd:pattern>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="globalAttr2" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for resolved attribute ref when the attribute ref does not have documentation
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="globalAttr3" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for resolved attribute ref when the attribute ref has an annotation but does not have documentation
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="globalAttr4" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- FAILED! Documentation for attribute ref is empty. This documentation should not display.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd
deleted file mode 100644
index 54f8676..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver - STAR - bug 157254 - Test file for documentation
- *******************************************************************************/
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/globalreftest" xmlns="http://www.example.org/globalreftest" elementFormDefault="qualified">
- <xsd:element name="rootTest" type="TestType"/>
- <xsd:element name="test" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>This some global documentation</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="testElement" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Some more testing</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType name="TestType">
- <xsd:sequence>
- <xsd:element ref="test" minOccurs="0" maxOccurs="1"/>
- <xsd:element ref="testElement" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>This is an override</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="testAttribute" type="AttributeTestType" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AttributeTestType">
- <xsd:sequence>
- <xsd:element name="test2" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="testAt" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo/>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="testAtWithDoc" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Attribute Documentation</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd
deleted file mode 100644
index d495539..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/groups/CyclicModelGroupDefinitionReferences.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://cyclicGroupReferences"
- elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cyclicGroupReferences">
-
- <group name="NewGroupDefinition0">
- <sequence>
- <element name="gr0e1" type="string"></element>
- <group ref="tns:NewGroupDefinition1"></group>
- </sequence>
- </group>
-
- <group name="NewGroupDefinition1">
- <sequence>
- <element name="gr1e1" type="string"></element>
- <element name="gr1e2" type="string"></element>
- <group ref="tns:NewGroupDefinition2"></group>
- <element name="gr1e3" type="string"></element>
- </sequence>
- </group>
-
- <complexType name="GlobalComplexType">
- <sequence>
- <element name="cte1" type="string"></element>
- <group ref="tns:NewGroupDefinition1"></group>
- <element name="cte2" type="string"></element>
- <element name="cte3" type="string"></element>
- </sequence>
- </complexType>
-
- <group name="NewGroupDefinition2">
- <sequence>
- <element name="gr2e1" type="string"></element>
- <element name="gr2e2" type="string"></element>
- <group ref="tns:NewGroupDefinition0"></group>
- </sequence>
- </group>
-
- <group name="ValidGroup001">
- <sequence>
- <element name="ve1" type="string"></element>
- <element name="ve2" type="string"></element>
- <group ref="tns:ValidGroup002"></group>
- </sequence>
- </group>
-
- <group name="ValidGroup002">
- <sequence>
- <element name="v2e2" type="string"></element>
- <element name="v2e1" type="string"></element>
- <group ref="tns:ValidGroup003"></group>
- </sequence>
- </group>
-
- <group name="ValidGroup003">
- <sequence>
- <element name="v3e1" type="string"></element>
- <element name="v3e2" type="string"></element>
- </sequence>
- </group>
-
- <element name="RootElement" type="tns:GlobalComplexType">
- </element>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.classpath b/tests/org.eclipse.wst.xsd.validation.tests/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
deleted file mode 100644
index a037531..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-validatexsdtests.jar
-temp.folder
-javaCompiler.validatexsdtests.jar.args
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.project b/tests/org.eclipse.wst.xsd.validation.tests/.project
deleted file mode 100644
index d48cd47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.validation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d2ebd57..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: validatexsdtests.jar
-Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.xml.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.xsd.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.xsd.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xsd.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xsd.validation.tests.internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/about.html b/tests/org.eclipse.wst.xsd.validation.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties
deleted file mode 100644
index 63f5d66..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = validatexsdtests.jar,\
- test.xml,\
- testresources/,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.validatexsdtests.jar = src/
-
-bin.excludes = testresources/.cvsignore,\
- testresources/generatedResults/
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties b/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
deleted file mode 100644
index fa0d84b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-# properties file for org.eclipse.wst.xsd.validation.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = XSD Validation Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
deleted file mode 100644
index 4983d79..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation;
-
-import junit.framework.TestCase;
-
-/**
- * Test the XSDValidationConfiguration class.
- */
-public class XSDValidationConfigurationTest extends TestCase
-{
- XSDValidationConfiguration configuration;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- configuration = new XSDValidationConfiguration();
- }
-
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- super.tearDown();
- }
-
-
- /**
- * Test the default setting of the HONOUR_ALL_SCHEMA_LOCATIONS feature.
- */
- public void testSetHonourAllSchemaLocationsFeatureDefault()
- {
- try
- {
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set by default to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set read the HONOUR_ALL_SCHEMA_LOCATIONS feature: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to true.
- */
- public void testSetHonourAllSchemaLocationsFeatureTrue()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- assertTrue("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to true.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS to true: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to false.
- */
- public void testSetHonourAllSchemaLocationsFeatureFalse()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS to false: " + e);
- }
- }
-
- /**
- * Test setting a feature that doesn't exist.
- */
- public void testSetNotExistantFeature()
- {
- try
- {
- configuration.setFeature("NON_EXISTANT_FEATURE", false);
- fail("Setting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
- /**
- * Test getting a feature that doesn't exist.
- */
- public void testGetNotExistantFeature()
- {
- try
- {
- configuration.getFeature("NON_EXISTANT_FEATURE");
- fail("Getting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
deleted file mode 100644
index 668b419..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin;
-
-/**
- * A test class for the Validator class.
- */
-public class ValidatorTest extends TestCase
-{
- ValidatorWrapper validator = new ValidatorWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ValidatorTest.class);
- }
-
- /**
- * Test the addInfoToMessage method. The following tests are performed:<br/>
- * 1. When the validation message contains a null key nothing is added to the message.<br/>
- * 2. When the message contains the key "ENTIRE_ELEMENT" the three attributes are added
- * to the method and the SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE is null.<br/>
- * 3. When the message contains the key "EntityNotDeclared" the three attributes are set.
- */
- public void testAddInfoToMessage()
- {
- // These strings are common addition information types.
- String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$
- String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$
- String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$
-
- // Test that the message does not contain the attributes when the method is called
- // with a null key.
- ValidationMessage validationMessage = new ValidationMessage("", 1, 1, "");
- Message message = new Message();
- validator.addInfoToMessage(validationMessage, message);
- assertNull("COLUMN_NUMBER_ATTRIBUTE was not null for a ValidationMessage with a null key. COLUMN_NUMBER_ATTRIBUTE = " + message.getAttribute(COLUMN_NUMBER_ATTRIBUTE), message.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertNull("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "s4s-elt-character".
- ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "s4s-elt-character", null);
- Message message2 = new Message();
- validator.addInfoToMessage(validationMessage2, message2);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key s4s-elt-character. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not an empty string for a ValidationMessage with the key s4s-elt-character. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "", message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "src-resolve".
- ValidationMessage validationMessage3 = new ValidationMessage("'MyName'", 1, 1, "", "src-resolve", null);
- Message message3 = new Message();
- validator.addInfoToMessage(validationMessage3, message3);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key src-resolve. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key src-resolve. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "MyName", message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
- }
-
- /**
- * Test the validate method. Tests to be performed:<br/>
- * 1. Test that validating a valid file from a URI or an input stream produces the same result.<br/>
- * 2. Test that validating an invalid file from a URI or an input stream produces the same result.
- */
- public void testValidate()
- {
- try
- {
- // Test that validating a valid file from a URI and an input stream produces the same result.
- String PLUGIN_ABSOLUTE_PATH = XSDValidationTestsPlugin.getInstallURL();
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd";
- ValidationReport report1 = validator.validate(uri, null, new NestedValidatorContext());
- ValidationReport report2 = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating a valid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertTrue("Validation using a URI did not product a valid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
-
- // Test that validating an invalid file from a URI and an input stream produces the same result.
- uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd";
- report1 = validator.validate(uri, null, new NestedValidatorContext());
- report2 = null;
- is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating an invalid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertFalse("Validation using a URI did not product an invalid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
- }
- catch(Exception e)
- {
- fail("Unable to locate plug-in location: " + e);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
deleted file mode 100644
index ada95f5..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-
-/**
- * A wrapper class to allow for testing the Validator class.
- */
-public class ValidatorWrapper extends Validator
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
- {
- super.addInfoToMessage(validationMessage, message);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
deleted file mode 100644
index dc6eb1a..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test case to test the XSDMessageInfoHelper class.
- */
-public class XSDMessageInfoHelperTest extends TestCase
-{
- private XSDMessageInfoHelperWrapper helper = new XSDMessageInfoHelperWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDMessageInfoHelperTest.class);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} when
- * given a non-existant key and null message arguments.
- */
- public void testNotExistantKeyAndNullMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo("NON_EXISTANT_KEY", null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} when
- * given a non-existant key an null message arguments.
- */
- public void testNullKeyAndMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo(null, null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test the method getFirstStringBetweenSingleQuotes. There are a few tests:
- * 1. Test that a simple string with single quotes 'name' returns name.
- * 2. Test that a string with no single quotes returns null.
- * 3. Test that a string with a single single quote 'name returns null.
- * 4. Test that a string with 3 single quotes 'name'name2' returns name.
- */
- public void testGetFirstStringBetweenSingleQuotes()
- {
- // 1. Test that a simple string with single quotes 'name' returns name.
- String result = helper.getFirstStringBetweenSingleQuotes("'name'");
- assertEquals("The returned string was not \"name\" for the string \"'name'\".", "name", result);
-
- // 2. Test that a string with no single quotes returns null.
- result = helper.getFirstStringBetweenSingleQuotes("name");
- assertNull("The returned string was not null for the string \"name\" with no single quotes.", result);
-
- // 3. Test that a string with a single single quote 'name returns null.
- result = helper.getFirstStringBetweenSingleQuotes("'name");
- assertNull("The returned string was not null for the string \"'name\" with one single quote.", result);
-
- // 4. Test that a string with 3 single quotes 'name'name2' returns name.
- result = helper.getFirstStringBetweenSingleQuotes("'name'name2'");
- assertEquals("The returned string was not \"name\" for the string \"'name'name2'\" with 3 single quotes.", "name", result);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
deleted file mode 100644
index 0442964..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-/**
- * A wrapper class for the XSDMessageInfoHelper class for testing.
- */
-public class XSDMessageInfoHelperWrapper extends XSDMessageInfoHelper
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelper#getFirstStringBetweenSingleQuotes(java.lang.String)
- */
- public String getFirstStringBetweenSingleQuotes(String s)
- {
- return super.getFirstStringBetweenSingleQuotes(s);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java
deleted file mode 100644
index 25a7458..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the Eclipse specific XSD validator.
- */
-public class XSDValidatorTest extends TestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDValidatorTest.class);
- }
-
- /**
- * Test to ensure the URI resolver is not null in the Eclipse
- * specific XSD validator.
- */
- public void testURIResolverIsRegistered()
- {
- XSDValidatorWrapper validator = new XSDValidatorWrapper();
- assertNotNull("The URI resolver is null.", validator.getURIResolver());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java
deleted file mode 100644
index 9147eea..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-
-/**
- * Wrapper for the Eclipse XSD validator class to allow for testing.
- */
-public class XSDValidatorWrapper extends XSDValidator
-{
- /**
- * Constructor.
- */
- public XSDValidatorWrapper()
- {
- super();
- }
-
- /**
- * Get the URI resolver registered on the XML validator.
- *
- * @return The URI resolver registered on the XML validator.
- */
- public URIResolver getURIResolver()
- {
- return uriresolver;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
deleted file mode 100644
index 6ba1e61..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfigurationTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.ValidatorTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelperTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidatorTest;
-/**
- * The root test suite that contains all other XSD validator test suites.
- */
-public class AllXSDTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDTests();
- }
-
- /**
- * Constructor
- */
- public AllXSDTests()
- {
- super("AllXSDTests");
- addTest(ValidatorTest.suite());
- addTest(XSDMessageInfoHelperTest.suite());
- addTest(XSDValidatorTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- addTestSuite(XSDValidationConfigurationTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index fecd613..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidator;
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
- protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
- protected String LOG_FILE_LOCATION = "results.log";
- protected static final String PLUGIN_NAME = "org.eclipse.wst.xsd.validation.tests";
- private XSDValidator validator = XSDValidator.getInstance();
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XSDValidationTestsPlugin.getInstallURL();
- }
-
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile The file to run the validator test on.
- * @param loglocation The location to create the log file.
- * @param idealloglocation The location of the ideal log file.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation)
- {
- runTest(testfile, loglocation, idealloglocation, new XSDValidationConfiguration());
- }
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile
- * The file to run the validator test on.
- * @param loglocation
- * The location to create the log file.
- * @param idealloglocation
- * The location of the ideal log file.
- * @param configuration
- * The XSDValidationConfiguration for this validation test.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation, XSDValidationConfiguration configuration)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
- try
- {
- createLog(loglocation, valreport);
- String generatedLog = getStringFromFile(loglocation);
- String idealLog = getStringFromFile(idealloglocation);
- assertEquals(idealLog, generatedLog);
- } catch (Exception e)
- {
- fail("Could not compare log files");
- }
- }
-
- /**
- * Get a string representation of a file.
- *
- * @param filename the file name of the file to get the string representation.
- * @return The string representation if successful.
- * @throws Exception Thrown if unable to create a string representaion of the file.
- */
- private String getStringFromFile(String filename) throws Exception
- {
- StringBuffer filestring = new StringBuffer();
- Reader reader = null;
- BufferedReader bufreader = null;
- try
- {
- File file = new File(filename);
- reader = new FileReader(file);
- bufreader = new BufferedReader(reader);
- while (bufreader.ready())
- {
- filestring.append(bufreader.readLine() + "\n");
- }
- } catch (FileNotFoundException e)
- {
- throw new Exception();
- } finally
- {
- bufreader.close();
- reader.close();
- }
- return filestring.toString();
- }
-
- /**
- * Create a log file for an XSD test.
- *
- * @param filename The name of the log file to create.
- * @param valreport The validation report for this file.
- * @return The file contents as a string if successful or null if not successful.
- */
- private String createLog(String filename, ValidationReport valreport)
- {
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;//validator.getErrors().size() + validator.getWarnings().size();
- StringBuffer errorsString = new StringBuffer();
- StringBuffer warningsString = new StringBuffer();
- int numerrors = 0;
- int numwarnings = 0;
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- numwarnings++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- warningsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- warningsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- else
- {
- numerrors++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- errorsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- errorsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- }
- StringBuffer log = new StringBuffer();
- log.append("number of errors : " + numerrors + "\n");
- if(numwarnings > 0)
- {
- log.append("number of warnings : " + numwarnings + "\n");
- }
- log.append("\n------------error list-------------------------------------------\n");
- if(numerrors == 0)
- {
- log.append("(none)\n");
- }
- else
- {
- log.append(errorsString.toString());
- }
- if(numwarnings > 0)
- {
- log.append("------------warning list-----------------------------------------\n");
- log.append(errorsString.toString());
- }
- log.append(warningsString.toString());
- log.append("-----------------------------------------------------------------\n");
-
- DataOutputStream outStream = null;
- try
- {
- File logfile = new File(filename);
- File parent = logfile.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- if(logfile.exists())
- {
- logfile.delete();
- }
- logfile.createNewFile();
-
- outStream = new DataOutputStream(new FileOutputStream(filename, true));
- outStream.writeBytes(log.toString());
- outStream.close();
-
- } catch (IOException e)
- {
- // If we can't write the log then clear the log.
- log.delete(0, log.length());
- }
- return log.toString();
- }
-
- protected String getPluginName()
- {
- return PLUGIN_NAME;
- }
-
- private String createNestedMessageString(List nestedMessages)
- {
- return createNestedMessageString(nestedMessages, 0);
- }
-
- private String createNestedMessageString(List nestedMessages, int depth)
- {
- if(nestedMessages != null && nestedMessages.size() > 0)
- {
- String messageString = "";
- Iterator nestedMesIter = nestedMessages.iterator();
- while(nestedMesIter.hasNext())
- {
- ValidationMessage nesvalmes = (ValidationMessage)nestedMesIter.next();
- for(int i = 0; i < depth; i++)
- {
- messageString += " ";
- }
- // If the message contains any file references make them relative.
- String message = nesvalmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "[(]");
- messageString += ("-> " + message + " [" + nesvalmes.getLineNumber() +", " + nesvalmes.getColumnNumber() +"]\n");
- messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1);
- }
- return messageString;
- }
- else
- {
- return "";
- }
- }
-
- protected IProject createSimpleProject(String projectName, String[] files)
- {
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject(projectName);
- if(!project.exists())
- {
- try
- {
- project.create(null);
- }
- catch(CoreException e)
- {
- fail("Could not create project " + projectName + e);
- }
- }
- if(!project.isOpen())
- {
- try
- {
- project.open(null);
- }
- catch(CoreException e)
- {
- fail("Could not open project " + projectName + e);
- }
- }
- try
- {
- IProjectDescription projectDescription = project.getDescription();
- projectDescription.setName(projectName);
- project.setDescription(projectDescription, null);
- }
- catch(Exception e)
- {
- fail("Unable to set project properties for project " + projectName + ". " + e);
- }
-
- if(files != null)
- {
- int numfiles = files.length;
- for(int i = 0; i < numfiles; i++)
- {
- try
- {
- String filename = files[i];
- filename = filename.replace('\\','/');
- if(filename.startsWith("file:"))
- {
- filename = filename.substring(5);
- while(filename.startsWith("/"))
- {
- filename = filename.substring(1);
- }
- }
-
- File file = new File(filename);
- FileInputStream in = new FileInputStream(file);
- IFile iFile = project.getFile(file.getName());
- if(!iFile.exists())
- {
- iFile.create(in, true, null);
- in.close();
- }
- }
- catch(Exception e)
- {
- fail("Unable to locate file " + files[i]);
- }
- }
- }
- try
- {
- project.refreshLocal(-1, null);
- }
- catch(Exception e)
- {}
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
deleted file mode 100644
index 00bb327..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Carver, Standards for Technology in Automotive Retail, bug 147033
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-
-
-
-/**
- * Test class for bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- private String BUGFIXES_DIR = "BugFixes/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(BugFixesTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /BugFixes/Empty.xsd
- */
- public void testEmpty()
- {
- String testname = "Empty";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
- */
- public void testInvalidSchemaInXMLCatalog()
- {
- String testname = "InvalidSchemaInXMLCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("testKey");
- catalogEntry.setURI("http://testuri");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd"/*FILE_PROTOCOL + file.getLocation().toString()*/, loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-
- /**
- * Test /BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
- */
- public void testMissingClosingSchemaTag()
- {
- String testname = "MissingClosingSchemaTag";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
- */
- public void testImportXSDWithXSDImportInDiffDir()
- {
- String testname = "ImportXSDWithXSDImportInDiffDir";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
- */
- public void testImportInvalidLocation()
- {
- String testname = "ImportInvalidLocation";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
- */
- public void testTwoOpenBrackets()
- {
- String testname = "TwoOpenBrackets";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportWithIncorrectSlash/A.xsd
- */
- public void testImportWithIncorrectSlash()
- {
- String testname = "A";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/HonourAllSchemaLocations/dog.xsd
- */
- public void testHonourAllSchemaLocations()
- {
- String testname = "dog";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
-
- XSDValidationConfiguration configuration = new XSDValidationConfiguration();
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- }
- catch(Exception e)
- {
- fail("Unable to set the HONOUR_ALL_SCHEMA_LOCATIONS feature to true: " + e);
- }
- runTest(testfile, loglocation, idealloglocation, configuration);
- }
-
- /**
- * Test /BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
- */
- public void testInvalidSchemaWithNamespaceInCatalog()
- {
- String testname = "InvalidSchemaWithNamespaceInCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("http://www.eclipse.org/webtools/Catalogue");
- catalogEntry.setURI("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaWithNamespaceInCatalog.xsd", loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-
- /**
- * Test /BugFixes/FullConformance/FullConformance.xsd
- * bug 147033
- */
- public void testFullConformance()
- {
- String testname = "FullConformance";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd-log";
-
- XSDValidationConfiguration configuration = new XSDValidationConfiguration();
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- configuration.setFeature(XSDValidationConfiguration.FULL_SCHEMA_CONFORMANCE, true);
- }
- catch(Exception e)
- {
- fail("Unable to set the FULL_SCHEMA_CONFORMANCE feature to true: " + e);
- }
- runTest(testfile, loglocation, idealloglocation, configuration);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
deleted file mode 100644
index e2aaecd..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests that test various types of variations in file paths.
- */
-public class PathsTest extends BaseTestCase
-{
- private String PATHS_DIR = "Paths/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(PathsTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathValid.xsd
- */
- public void testSpaceInPathValid()
- {
- String testname = "SpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathInvalid.xsd
- */
- public void testSpaceInPathInvalid()
- {
- String testname = "SpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd
- */
- public void testCloseBracketInPathValid()
- {
- String testname = "CloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd
- */
- public void testCloseBrackettInPathInvalid()
- {
- String testname = "CloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd
- */
- public void testCloseBracketInFilenameValid()
- {
- String testname = "CloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd
- */
- public void testCloseBracketInFilenameInvalid()
- {
- String testname = "CloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathValid.xsd
- */
- public void testDashInPathValid()
- {
- String testname = "DashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathInvalid.xsd
- */
- public void testDashInPathInvalid()
- {
- String testname = "DashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameValid.xsd
- */
- public void testDashInFilenameValid()
- {
- String testname = "Dash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xsd
- */
- public void testDashInFilenameInvalid()
- {
- String testname = "Dash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xsd
- */
- public void testExclamationInPathValid()
- {
- String testname = "ExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd
- */
- public void testExclamationInPathInvalid()
- {
- String testname = "ExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd
- */
- public void testExclamationInFilenameValid()
- {
- String testname = "Exclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd
- */
- public void testExclamationInFilenameInvalid()
- {
- String testname = "Exclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd
- */
- public void testOpenBracketInPathValid()
- {
- String testname = "OpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd
- */
- public void testOpenBracketInPathInvalid()
- {
- String testname = "OpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd
- */
- public void testOpenBracketInFilenameValid()
- {
- String testname = "OpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd
- */
- public void testOpenBracketInFilenameInvalid()
- {
- String testname = "OpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathValid.xsd
- */
- public void testPeriodInPathValid()
- {
- String testname = "PeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathInvalid.xsd
- */
- public void testPeriodInPathInvalid()
- {
- String testname = "PeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameValid.xsd
- */
- public void testPeriodInFilenameValid()
- {
- String testname = "Period.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
- */
- public void testPeriodInFilenameInvalid()
- {
- String testname = "Period.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathValid.xsd
- */
- public void testQuoteInPathValid()
- {
- String testname = "QuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathInvalid.xsd
- */
- public void testQuoteInPathInvalid()
- {
- String testname = "QuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xsd
- */
- public void testQuoteInFilenameValid()
- {
- String testname = "Quote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd
- */
- public void testQuoteInFilenameInvalid()
- {
- String testname = "Quote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameValid.xsd
- */
- public void testSpaceInFilenameValid()
- {
- String testname = "Space InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xsd
- */
- public void testSpaceInFilenameInvalid()
- {
- String testname = "Space InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathValid.xsd
- */
- public void testTildeInPathValid()
- {
- String testname = "TildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathInvalid.xsd
- */
- public void testTildeInPathInvalid()
- {
- String testname = "TildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xsd
- */
- public void testTildeInFilenameValid()
- {
- String testname = "Tilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
- */
- public void testTildeInFilenameInvalid()
- {
- String testname = "Tilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xsd
- */
- public void testUnderscoreInPathValid()
- {
- String testname = "UnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
- */
- public void testUnderscoreInPathInvalid()
- {
- String testname = "UnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
- */
- public void testUnderscoreInFilenameValid()
- {
- String testname = "Underscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
- */
- public void testUnderscoreInFilenameInvalid()
- {
- String testname = "Underscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xsd
- */
- public void testAngleHatInPathValid()
- {
- String testname = "AngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
- */
- public void testAngleHatInPathInvalid()
- {
- String testname = "AngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
- */
- public void testAngleHatInFilenameValid()
- {
- String testname = "AngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
- */
- public void testAngleHatInFilenameInvalid()
- {
- String testname = "AngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /*****************
- * Test Imports
- *****************/
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
- */
- public void testImportAngleHatInFilenameValid()
- {
- String testname = "ImportAngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
- */
- public void testImportAngleHatInFilenameInvalid()
- {
- String testname = "ImportAngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
- */
- public void testImportAngleHatInPathValid()
- {
- String testname = "ImportAngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
- */
- public void testImportAngleHatInPathInvalid()
- {
- String testname = "ImportAngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathValid.xsd
- */
- public void testImportSpaceInPathValid()
- {
- String testname = "ImportSpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathInvalid.xsd
- */
- public void testImportSpaceInPathInvalid()
- {
- String testname = "ImportSpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd
- */
- public void testImportCloseBracketInPathValid()
- {
- String testname = "ImportCloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd
- */
- public void testImportCloseBrackettInPathInvalid()
- {
- String testname = "ImportCloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd
- */
- public void testImportCloseBracketInFilenameValid()
- {
- String testname = "ImportCloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd
- */
- public void testImportCloseBracketInFilenameInvalid()
- {
- String testname = "ImportCloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathValid.xsd
- */
- public void testImportDashInPathValid()
- {
- String testname = "ImportDashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathInvalid.xsd
- */
- public void testImportDashInPathInvalid()
- {
- String testname = "ImportDashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameValid.xsd
- */
- public void testImportDashInFilenameValid()
- {
- String testname = "ImportDash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
- */
- public void testImportDashInFilenameInvalid()
- {
- String testname = "ImportDash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd
- */
- public void testImportExclamationInPathValid()
- {
- String testname = "ImportExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd
- */
- public void testImportExclamationInPathInvalid()
- {
- String testname = "ImportExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd
- */
- public void testImportExclamationInFilenameValid()
- {
- String testname = "ImportExclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd
- */
- public void testImportExclamationInFilenameInvalid()
- {
- String testname = "ImportExclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd
- */
- public void testImportOpenBracketInPathValid()
- {
- String testname = "ImportOpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd
- */
- public void testImportOpenBracketInPathInvalid()
- {
- String testname = "ImportOpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd
- */
- public void testImportOpenBracketInFilenameValid()
- {
- String testname = "ImportOpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd
- */
- public void testImportOpenBracketInFilenameInvalid()
- {
- String testname = "ImportOpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathValid.xsd
- */
- public void testImportPeriodInPathValid()
- {
- String testname = "ImportPeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
- */
- public void testImportPeriodInPathInvalid()
- {
- String testname = "ImportPeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
- */
- public void testImportPeriodInFilenameValid()
- {
- String testname = "ImportPeriod.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
- */
- public void testImportPeriodInFilenameInvalid()
- {
- String testname = "ImportPeriod.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathValid.xsd
- */
- public void testImportQuoteInPathValid()
- {
- String testname = "ImportQuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd
- */
- public void testImportQuoteInPathInvalid()
- {
- String testname = "ImportQuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd
- */
- public void testImportQuoteInFilenameValid()
- {
- String testname = "ImportQuote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd
- */
- public void testImportQuoteInFilenameInvalid()
- {
- String testname = "ImportQuote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
- */
- public void testImportSpaceInFilenameValid()
- {
- String testname = "ImportSpace InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
- */
- public void testImportSpaceInFilenameInvalid()
- {
- String testname = "ImportSpace InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathValid.xsd
- */
- public void testImportTildeInPathValid()
- {
- String testname = "ImportTildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
- */
- public void testImportTildeInPathInvalid()
- {
- String testname = "ImportTildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
- */
- public void testImportTildeInFilenameValid()
- {
- String testname = "ImportTilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
- */
- public void testImportTildeInFilenameInvalid()
- {
- String testname = "ImportTilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
- */
- public void testImportUnderscoreInPathValid()
- {
- String testname = "ImportUnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
- */
- public void testImportUnderscoreInPathInvalid()
- {
- String testname = "ImportUnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
- */
- public void testImportUnderscoreInFilenameValid()
- {
- String testname = "ImportUnderscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
- */
- public void testImportUnderscoreInFilenameInvalid()
- {
- String testname = "ImportUnderscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
deleted file mode 100644
index 2a4a752..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plugin class for this test plugin.
- */
-public class XSDValidationTestsPlugin extends Plugin
-{
- protected static Bundle pluginBundle;
-
- public XSDValidationTestsPlugin()
- {
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- pluginBundle = context.getBundle();
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/test.xml b/tests/org.eclipse.wst.xsd.validation.tests/test.xml
deleted file mode 100644
index 3fdec81..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.validation.tests" />
-
- <property
- name="classname"
- value="org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log
deleted file mode 100644
index aa478ac..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 2
-
-------------error list-------------------------------------------
-rcase-Recurse.2: There is not a complete functional mapping between the particles. [35, 43]
-derivation-ok-restriction.5.4.2: Error for type 'RestrictedFoo'. The particle of the type is not a valid restriction of the particle of the base. [35, 43]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
deleted file mode 100644
index faffcef..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-schema_reference.4: Failed to read schema document 'subdir/importing.xsda', because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <xsd:schema>. [3, 98]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
deleted file mode 100644
index 54a6653..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-src-resolve.4.2: Error resolving component 'stringa'. It was detected that 'stringa' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. If this is the incorrect namespace, perhaps the prefix of 'stringa' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. [3, 50]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
deleted file mode 100644
index e7fb00d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 125]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
deleted file mode 100644
index cf33997..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-The markup in the document preceding the root element must be well-formed. [1, 2]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
deleted file mode 100644
index 5ed1a99..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Element type "complexType" must be followed by either attribute specifications, ">" or "/>". [6, 3]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index d594c99..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 8fa6135..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 43a672e..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index 2fcf49b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
deleted file mode 100644
index 3dcef18..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
deleted file mode 100644
index 82697df..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index d0627d4..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 80a8f42..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 7ed9be8..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 9dd8bce..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
deleted file mode 100644
index 60a7021..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
deleted file mode 100644
index fe79aea..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
deleted file mode 100644
index 9c739f9..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index f8071e2..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
deleted file mode 100644
index 569a6e2..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
deleted file mode 100644
index bb78124..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 0b9b109..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde%7EInFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 63f6e91..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
deleted file mode 100644
index 1597130..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 49ea3f7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index 91e7786..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd
deleted file mode 100644
index dd61c6a..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- xmlns:foo="urn:foo"
- targetNamespace="urn:foo"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
- <xsd:complexType name="Foo">
- <xsd:sequence>
- <xsd:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="Foo" />
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="bar">
- <xsd:complexType>
- <xsd:attribute
- name="value"
- use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="bar01" />
- <xsd:enumeration value="bar02" />
- <xsd:enumeration value="bar03" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="RestrictedFoo">
- <xsd:complexContent>
- <xsd:restriction base="foo:Foo">
- <xsd:sequence>
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="Foo" />
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="bar">
- <xsd:complexType>
- <xsd:attribute
- name="value"
- use="required">
- <xsd:simpleType>
- <xsd:restriction
- base="xsd:string">
- <xsd:enumeration value="bar01" />
- <xsd:enumeration value="bar02" />
- <xsd:enumeration value="bar03" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
deleted file mode 100644
index 21c81f7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
- <complexType name="Head"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
deleted file mode 100644
index 0b13d05..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
-
- <complexType name="Tail"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
deleted file mode 100644
index 6c4c669..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/ADog"
- xmlns:tns="http://www.example.org/ADog"
- xmlns:pref="http://www.example.org/Dog">
-
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part1.xsd">
- </import>
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part2.xsd">
- </import>
-
- <complexType name="DogType">
- <sequence>
-
- <element name="Tail" type="pref:Tail"></element>
- <element name="Body" type="string"></element>
- </sequence>
- </complexType>
-
- <element name="aDog" type="tns:DogType"></element>
-
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
deleted file mode 100644
index 4b8347e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsda"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
deleted file mode 100644
index 0c20fe1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:include schemaLocation="C.xsd"/>
- <xsd:import namespace="http://B" schemaLocation="B.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
deleted file mode 100644
index b45007e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://B">
- <xsd:import namespace="http://AC" schemaLocation=".\C.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
deleted file mode 100644
index f6df675..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:complexType name="SampleType">
- <xsd:sequence>
- <xsd:element name="SampleElement" nillable="true" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
deleted file mode 100644
index 95e6af0..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
deleted file mode 100644
index 9af5462..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/importing" xmlns:ex="http://www.example.com/importing" xmlns:simple="http://www.example.com/simple">
- <import namespace="http://www.example.com/simple" schemaLocation="simple.xsd"/>
- <simpleType name="mySimpleType">
- <list itemType="string"/>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
deleted file mode 100644
index 8810a4d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/simple" xmlns:ibm="http://www.example.com/simple">
- <element name="myElement" type="string"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
deleted file mode 100644
index 8044319..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/invalid" xmlns:invalid="http://www.example.com/invalid">
- <element name="NewGlobalElement" type="stringa"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
deleted file mode 100644
index d4d7634..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
deleted file mode 100644
index 297c8f6..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/TwoOpenBrackets" xmlns:tns="http://www.example.org/TwoOpenBrackets">
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
deleted file mode 100644
index e3e24da..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.eclipse.org/webtools/Catalogue" xmlns:c="http://www.eclipse.org/webtools/Catalogue">
-
- <complexType name="PublicationType"
- <sequence>
- <element name="title" type="string"></element>
- <element name="author" type="string" minOccurs="0" maxOccurs="unbounded"></element>
- <element name="date" type="gYear"></element>
- </sequence>
- </complexType>
-
- <complexType name="BookType">
- <complexContent>
- <extension base="c:PublicationType">
- <sequence>
- <element name="isbn" type="string" />
- <element name="publisher" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MagazineType">
- <complexContent>
- <restriction base="c:PublicationType">
- <sequence>
- <element name="title" type="string" />
- <element name="author" type="string" minOccurs="0" maxOccurs="0"/>
- <element name="date" type="gYear"></element>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
- <element name="Publication" type="c:PublicationType" abstract="true"></element>
-
- <element name="Book" type="c:BookType" substitutionGroup="c:Publication"></element>
-
- <element name="Magazine" type="c:MagazineType" substitutionGroup="c:Publication"></element>
-
- <element name="Catalogue">
- <complexType>
- <sequence>
- <element ref="c:Publication" maxOccurs="unbounded"></element>
- </sequence>
- </complexType>
- </element>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index c6df147..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
deleted file mode 100644
index e084e6e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
deleted file mode 100644
index 2d82c95..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
deleted file mode 100644
index 67bd0d7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
deleted file mode 100644
index 8bd9a74..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
deleted file mode 100644
index 2180513..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index d60d06f..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index 7a2503b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
deleted file mode 100644
index 09648ca..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
deleted file mode 100644
index 3f2da8d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
deleted file mode 100644
index c534d83..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
deleted file mode 100644
index b6334ae..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
deleted file mode 100644
index 3189ff3..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
deleted file mode 100644
index e8390c6..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index 3430528..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
deleted file mode 100644
index e92dd97..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
deleted file mode 100644
index 1412516..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
deleted file mode 100644
index ee461dd..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index 70a67e9..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d0ab738..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
deleted file mode 100644
index 4897802..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
deleted file mode 100644
index 223ab33..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
deleted file mode 100644
index dc62544..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
deleted file mode 100644
index 4e97d47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
deleted file mode 100644
index fd7496c..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
deleted file mode 100644
index 4f83c85..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
deleted file mode 100644
index f1fb34b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
deleted file mode 100644
index 9ccf6de..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
deleted file mode 100644
index 63a27ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
deleted file mode 100644
index 3c93d20..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
deleted file mode 100644
index 97c0baa..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
deleted file mode 100644
index 916ba37..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
deleted file mode 100644
index 2a09853..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
deleted file mode 100644
index fbe9a6c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
deleted file mode 100644
index 6963d4b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
deleted file mode 100644
index 1c81133..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
deleted file mode 100644
index 0bda16e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
deleted file mode 100644
index cf216fc..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
deleted file mode 100644
index c5277a1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
deleted file mode 100644
index fd74266..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
