This commit was manufactured by cvs2svn to create tag 'v201004110600'.
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 7d2de05..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "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\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.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(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - 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\
-\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, and\n\
-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 fd4fd5f..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.wst.jsdt.web.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</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>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "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>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the 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" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>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>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>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>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</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 1ac1d34..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "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\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.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(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - 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\
-\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, and\n\
-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 d9b1edc..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.dtd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.catalog.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</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>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "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>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the 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" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>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>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>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>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
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 9eba7c8..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/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.css.ui.tests; singleton:=true
-Bundle-Version: 1.0.300.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.2,
- org.eclipse.core.resources,
- org.eclipse.ui.ide
-Eclipse-LazyStart: true
-Bundle-ClassPath: cssuitests.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Import-Package: org.eclipse.core.resources
diff --git a/tests/org.eclipse.wst.css.ui.tests/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 841a885..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = META-INF/,\
- cssuitests.jar,\
- about.html,\
- src/,\
- test.xml,\
- testresources/,\
- plugin.properties,\
- plugin.xml
-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/plugin.xml b/tests/org.eclipse.wst.css.ui.tests/plugin.xml
deleted file mode 100644
index e31b4d1..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.wst.sse.ui.editorConfiguration">
- <provisionalConfiguration
- type="sourceReconcilingListener" target="org.eclipse.wst.css.core.csssource" class="org.eclipse.wst.css.ui.tests.viewer.CSSCodeFoldingTest"/>
- </extension>
-</plugin>
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 f514e39..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.ui.tests.contentassist.TestCSSContentAssistComputers;
-import org.eclipse.wst.css.ui.tests.viewer.CSSCodeFoldingTest;
-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));
- addTest(CSSCodeFoldingTest.suite());
- addTest(TestCSSContentAssistComputers.suite());
- }
-}
\ 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/ProjectUtil.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java
deleted file mode 100644
index d655fd1..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ProjectUtil.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-public class ProjectUtil {
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = CSSUITestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = CSSUITestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return file;
- }
-
- /**
- * @param rootEntry - avoid trailing separators
- * @param fullTargetPath
- */
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @param entryname
- * path relative to TEST plugin starting w/ a "/" (eg.
- * "/testfiles/bugnumber/struts-logic.tld")
- * @param fullPath
- * path relative to junit test workpace (eg.
- * "/myruntimeproj/struts-logic.tld")
- * @return
- */
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return file[0];
- }
-
- public static IProject createProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/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/contentassist/TestCSSContentAssistComputers.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/contentassist/TestCSSContentAssistComputers.java
deleted file mode 100644
index f90ed56..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/contentassist/TestCSSContentAssistComputers.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests.contentassist;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class TestCSSContentAssistComputers extends TestCase {
- /** The name of the project that all of these tests will use */
- private static final String PROJECT_NAME = "TestCSSContentAssistComputers";
-
- /** so we don't have to depend on JSDT */
- private static final String JAVA_SCRIPT_NATURE_ID = "org.eclipse.wst.jsdt.core.jsNature";
-
- /** The location of the testing files */
- private static final String PROJECT_FILES = "/testresources/contentassist";
-
- /** The project that all of the tests use */
- private static IProject fProject;
-
- /**
- * Used to keep track of the already open editors so that the tests don't go through
- * the trouble of opening the same editors over and over again
- */
- private static Map fFileToEditorMap = new HashMap();
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public TestCSSContentAssistComputers() {
- super("Test CSS Content Assist Computers");
- }
-
- /**
- * <p>Constructor that takes a test name.</p>
- * <p>Use {@link #suite()}</p>
- *
- * @param name The name this test run should have.
- *
- * @see #suite()
- */
- public TestCSSContentAssistComputers(String name) {
- super(name);
- }
-
- /**
- * <p>Use this method to add these tests to a larger test suite so set up
- * and tear down can be performed</p>
- *
- * @return a {@link TestSetup} that will run all of the tests in this class
- * with set up and tear down.
- */
- public static Test suite() {
- TestSuite ts = new TestSuite(TestCSSContentAssistComputers.class, "Test CSS Content Assist Computers");
- return new TestCSSContentAssistComputersSetup(ts);
- }
-
- public void testSelectorProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {101, 0, 101, 101};
- runProposalTest("test1.css", 2, 0, expectedProposalCounts);
- }
-
- public void testDeclarationPropertyProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {122, 0, 122, 122};
- runProposalTest("test1.css", 5, 0, expectedProposalCounts);
- }
-
- public void testDeclarationValueProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {11, 0, 11, 11};
- runProposalTest("test1.css", 9, 16, expectedProposalCounts);
- }
-
- public void testEmptyDoc() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {103, 1, 102, 103};
- runProposalTest("test2.css", 0, 0, expectedProposalCounts);
- }
-
- public void testFinishSelectorProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {20, 0, 20, 20};
- runProposalTest("test3.css", 2, 1, expectedProposalCounts);
- }
-
- public void testFinishDeclarationProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {4, 0, 4, 4};
- runProposalTest("test4.css", 3, 14, expectedProposalCounts);
- }
-
- public void testFinishDeclarationValueProposals() throws Exception {
- // default page, templates page, standard page, default page again
- int[] expectedProposalCounts = new int[] {4, 0, 4, 4};
- runProposalTest("test4.css", 7, 23, expectedProposalCounts);
- }
-
- /**
- * <p>Run a proposal test by opening the given file and invoking content assist for
- * each expected proposal count at the given line number and line character
- * offset and then compare the number of proposals for each invocation (pages) to the
- * expected number of proposals.</p>
- *
- * @param fileName
- * @param lineNum
- * @param lineRelativeCharOffset
- * @param expectedProposalCounts
- * @throws Exception
- */
- private static void runProposalTest(String fileName,
- int lineNum, int lineRelativeCharOffset,
- int[] expectedProposalCounts) throws Exception{
-
- IFile file = getFile(fileName);
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- int offset = viewer.getDocument().getLineOffset(lineNum) + lineRelativeCharOffset;
-
- ICompletionProposal[][] pages = getProposals(viewer, offset, expectedProposalCounts.length);
-
- verifyProposalCounts(pages, expectedProposalCounts);
- }
-
- /**
- * <p>Invoke content assist on the given viewer at the given offset, for the given number of pages
- * and return the results of each page</p>
- *
- * @param viewer
- * @param offset
- * @param pageCount
- * @return
- * @throws Exception
- */
- private static ICompletionProposal[][] getProposals(StructuredTextViewer viewer, int offset, int pageCount) throws Exception {
- //setup the viewer
- StructuredTextViewerConfigurationCSS configuration = new StructuredTextViewerConfigurationCSS();
- ContentAssistant contentAssistant = (ContentAssistant)configuration.getContentAssistant(viewer);
- viewer.configure(configuration);
- viewer.setSelectedRange(offset, 0);
-
- //get the processor
- String partitionTypeID = viewer.getDocument().getPartition(offset).getType();
- IContentAssistProcessor processor = contentAssistant.getContentAssistProcessor(partitionTypeID);
-
- //fire content assist session about to start
- Method privateFireSessionBeginEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionBeginEvent", new Class[] {boolean.class});
- privateFireSessionBeginEventMethod.setAccessible(true);
- privateFireSessionBeginEventMethod.invoke(contentAssistant, new Object[] {Boolean.TRUE});
-
- //get content assist suggestions
- ICompletionProposal[][] pages = new ICompletionProposal[pageCount][];
- for(int p = 0; p < pageCount; ++p) {
- pages[p] = processor.computeCompletionProposals(viewer, offset);
- }
-
- //fire content assist session ending
- Method privateFireSessionEndEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionEndEvent", null);
- privateFireSessionEndEventMethod.setAccessible(true);
- privateFireSessionEndEventMethod.invoke(contentAssistant, null);
-
- return pages;
- }
-
- /**
- * <p>Compare the expected number of proposals per page to the actual number of proposals
- * per page</p>
- *
- * @param pages
- * @param expectedProposalCounts
- */
- private static void verifyProposalCounts(ICompletionProposal[][] pages, int[] expectedProposalCounts) {
- StringBuffer error = new StringBuffer();
- for(int page = 0; page < expectedProposalCounts.length; ++page) {
- if(expectedProposalCounts[page] != pages[page].length) {
- error.append("\nProposal page " + page + " did not have the expected number of proposals: was " +
- pages[page].length + " expected " + expectedProposalCounts[page]);
- }
- }
-
- //if errors report them
- if(error.length() > 0) {
- Assert.fail(error.toString());
- }
- }
-
- /**
- * <p>Given a file name in <code>fProject</code> attempts to get an <code>IFile</code>
- * for it, if the file doesn't exist the test fails.</p>
- *
- * @param name the name of the file to get
- * @return the <code>IFile</code> associated with the given <code>name</code>
- */
- private static IFile getFile(String name) {
- IFile file = fProject.getFile(name);
- assertTrue("Test file " + file + " can not be found", file.exists());
-
- return file;
- }
-
- /**
- * <p>Given a <code>file</code> get an editor for it. If an editor has already
- * been retrieved for the given <code>file</code> then return the same already
- * open editor.</p>
- *
- * <p>When opening the editor it will also standardized the line
- * endings to <code>\n</code></p>
- *
- * @param file open and return an editor for this
- * @return <code>StructuredTextEditor</code> opened from the given <code>file</code>
- */
- private static StructuredTextEditor getEditor(IFile file) {
- StructuredTextEditor editor = (StructuredTextEditor)fFileToEditorMap.get(file);
-
- if(editor == null) {
- try {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorPart editorPart = IDE.openEditor(page, file, true, true);
- if(editorPart instanceof StructuredTextEditor) {
- editor = ((StructuredTextEditor)editorPart);
- } else {
- fail("Unable to open structured text editor");
- }
-
- if(editor != null) {
- standardizeLineEndings(editor);
- fFileToEditorMap.put(file, editor);
- } else {
- fail("Could not open editor for " + file);
- }
- } catch (Exception e) {
- fail("Could not open editor for " + file + " exception: " + e.getMessage());
- }
- }
-
- return editor;
- }
-
- /**
- * <p>Line endings can be an issue when running tests on different OSs.
- * This function standardizes the line endings to use <code>\n</code></p>
- *
- * <p>It will get the text from the given editor, change the line endings,
- * and then save the editor</p>
- *
- * @param editor standardize the line endings of the text presented in this
- * editor.
- */
- private static void standardizeLineEndings(StructuredTextEditor editor) {
- IDocument doc = editor.getTextViewer().getDocument();
- String contents = doc.get();
- contents = StringUtils.replace(contents, "\r\n", "\n");
- contents = StringUtils.replace(contents, "\r", "\n");
- doc.set(contents);
- }
-
- /**
- * <p>This inner class is used to do set up and tear down before and
- * after (respectively) all tests in the inclosing class have run.</p>
- */
- private static class TestCSSContentAssistComputersSetup extends TestSetup {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static String previousWTPAutoTestNonInteractivePropValue = null;
-
- /**
- * Default constructor
- *
- * @param test do setup for the given test
- */
- public TestCSSContentAssistComputersSetup(Test test) {
- super(test);
- }
-
- /**
- * <p>This is run once before all of the tests</p>
- *
- * @see junit.extensions.TestSetup#setUp()
- */
- public void setUp() throws Exception {
- //setup properties
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
-
- //setup project
- fProject = ProjectUtil.createProject(PROJECT_NAME, null, new String[] {JAVA_SCRIPT_NATURE_ID});
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, PROJECT_NAME);
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- //close out the editors
- Iterator iter = fFileToEditorMap.values().iterator();
- while(iter.hasNext()) {
- StructuredTextEditor editor = (StructuredTextEditor)iter.next();
- editor.doSave(null);
- editor.close(false);
- }
-
- //remove project
- fProject.delete(true, new NullProgressMonitor());
-
- //restore properties
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/CSSCodeFoldingTest.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/CSSCodeFoldingTest.java
deleted file mode 100644
index cba40a8..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/CSSCodeFoldingTest.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests.viewer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.css.ui.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener;
-
-/**
- * <p>Tests that code folding annotations are correctly added/removed from CSS Documents</p>
- * <p>All of these tests use the same project and when possible the same open documents</p>
- *
- * @see org.eclipse.wst.xml.ui.tests.XMLCodeFoldingTest Similar Test - XML Code Folding Test
- * @see org.eclipse.wst.css.ui.tests.viewer.CSSCodeFoldingTest Similar Test - CSS Code Folding Test
- * @see org.eclipse.wst.dtd.ui.tests.viewer.DTDCodeFoldingTest Similar Test - DTD Code Folding Test
- */
-public class CSSCodeFoldingTest extends TestCase implements ISourceReconcilingListener {
- /** max amount of time to wait for */
- private static final int MAX_WAIT_TIME = 4000;
-
- /** amount of time to wait for */
- private static final int WAIT_TIME = 200;
-
- /**
- * The name of the project that all of these tests will use
- */
- private static final String PROJECT_NAME = "CSSCodeFoldingTest";
-
- /**
- * The location of the testing files
- */
- private static final String PROJECT_FILES = "/testresources/folding";
-
- /**
- * The project that all of the tests use
- */
- protected static IProject fProject;
-
- /**
- * Used to keep track of the already open editors so that the tests don't go through
- * the trouble of opening the same editors over and over again
- */
- protected static Map fFileToEditorMap = new HashMap();
-
- /** the last {@link IDocument} to be reconciled */
- private static IDocument fReconciledDoc = null;
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public CSSCodeFoldingTest() {
- super("CSS Code Folding Test");
- }
-
- /**
- * <p>Constructor that takes a test name.</p>
- * <p>Use {@link #suite()}</p>
- *
- * @param name The name this test run should have.
- *
- * @see #suite()
- */
- public CSSCodeFoldingTest(String name) {
- super(name);
- }
-
- /**
- * <p>Use this method to add these tests to a larger test suite so set up
- * and tear down can be performed</p>
- *
- * @return a {@link TestSetup} that will run all of the tests in this class
- * with set up and tear down.
- */
- public static Test suite() {
- TestSuite ts = new TestSuite(CSSCodeFoldingTest.class, "CSS Code Folding Test");
- return new CSSCodeFoldingTestSetup(ts);
-
- }
-
- /**
- * Reset the state between tests
- *
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
-
- fReconciledDoc = null;
- }
-
- /**
- * <p><b>TEST:</b> the initially placed folding annotations</p>
- */
- public void testInitFolding() throws Exception {
- IFile file = getFile("CSSFoldingTest1.css");
-
- StructuredTextEditor editor = getEditor(file);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(401, 120));
- expectedPositions.add(new Position(333, 62));
- expectedPositions.add(new Position(181, 72));
- expectedPositions.add(new Position(258, 69));
- expectedPositions.add(new Position(21, 113));
-
- waitForReconcileThenVerify(editor.getTextViewer(), expectedPositions);
- }
-
- /**
- * <p><b>TEST:</b> that folding annotations are updated after node is removed</p>
- */
- public void testRemoveNode() throws Exception{
- IFile file = getFile("CSSFoldingTest1.css");
-
- StructuredTextEditor editor = getEditor(file);
-
- try {
- StructuredTextViewer viewer = editor.getTextViewer();
- IDocument doc = viewer.getDocument();
- doc.replace(253, 76, "");
- editor.doSave(null);
-
- final List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(325, 120));
- expectedPositions.add(new Position(21, 113));
- expectedPositions.add(new Position(181, 72));
- expectedPositions.add(new Position(257, 62));
-
- waitForReconcileThenVerify(viewer, expectedPositions);
- } catch(BadLocationException e) {
- fail("Test is broken, replace location has become invalid.\n" + e.getMessage());
- }
- }
-
- /**
- * <p><b>TEST:</b> that folding annotations are updated after node is added</p>
- */
- public void testAddNode() throws Exception {
- IFile file = getFile("CSSFoldingTest2.css");
-
- StructuredTextEditor editor = getEditor(file);
-
- try {
- StructuredTextViewer viewer = editor.getTextViewer();
- IDocument doc = viewer.getDocument();
- doc.replace(255, 0, "\ntd {\nborder: 1px solid black;\n}\n");
- editor.doSave(null);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(291, 69));
- expectedPositions.add(new Position(256, 31));
- expectedPositions.add(new Position(21, 113));
- expectedPositions.add(new Position(434, 120));
- expectedPositions.add(new Position(181, 72));
- expectedPositions.add(new Position(366, 62));
-
- waitForReconcileThenVerify(viewer, expectedPositions);
- } catch(BadLocationException e) {
- fail("Test is broken, add location has become invalid.\n" + e.getMessage());
- }
- }
-
- /**
- * <p>Given a file name in <code>fProject</code> attempts to get an <code>IFile</code>
- * for it, if the file doesn't exist the test fails.</p>
- *
- * @param name the name of the file to get
- * @return the <code>IFile</code> associated with the given <code>name</code>
- */
- private static IFile getFile(String name) {
- IFile file = fProject.getFile(name);
- assertTrue("Test file " + file + " can not be found", file.exists());
-
- return file;
- }
-
- /**
- * <p>Given a <code>file</code> get an editor for it. If an editor has already
- * been retrieved for the given <code>file</code> then return the same already
- * open editor.</p>
- *
- * @param file open and return an editor for this
- * @return <code>StructuredTextEditor</code> opened from the given <code>file</code>
- */
- private StructuredTextEditor getEditor(IFile file) {
- StructuredTextEditor editor = (StructuredTextEditor)fFileToEditorMap.get(file);
-
- if(editor == null) {
- try {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorPart editorPart = IDE.openEditor(page, file, true, true);
- if(editorPart instanceof StructuredTextEditor) {
- editor = ((StructuredTextEditor)editorPart);
- standardizeLineEndings(editor);
- } else {
- fail("Unable to open structured text editor");
- }
-
- if(editor != null) {
- fFileToEditorMap.put(file, editor);
- } else {
- fail("Could not open viewer for " + file);
- }
- } catch (Exception e) {
- fail("Could not open editor for " + file + " exception: " + e.getMessage());
- }
- }
-
- return editor;
- }
-
- /**
- * Waits for the dirty region reconciler to finish and then verifies that only and all
- * of the <code>expectedPositions</code> have folding annotations in the given <code>viewer</code>
- *
- * @param viewer check for annotations at the given <code>expectedPositions</code>
- * in here after the dirty region reconciler job has finished
- * @param expectedPositions check for annotations at these positions in the given <code>viewer</code>
- * after the dirty region reconciler job has finished
- */
- private void waitForReconcileThenVerify(final StructuredTextViewer viewer, final List expectedPositions) throws Exception{
- IDocument doc = viewer.getDocument();
- int time = 0;
- while(doc != fReconciledDoc && time <= MAX_WAIT_TIME) {
- Thread.sleep(WAIT_TIME);
- time += WAIT_TIME;
- }
-
- if(doc == fReconciledDoc) {
- verifyAnnotationPositions(viewer, expectedPositions);
- } else {
- Assert.fail("Document " + viewer.getDocument() + " was not reconciled with in " + MAX_WAIT_TIME +
- " so gave up waiting and in turn could not validate folding anotations");
- }
- }
-
- /**
- * Verifies that only and all of the <code>expectedPositions</code> have folding annotations
- * in the given <code>viewer</code>
- *
- * @param viewer check for annotations at the given <code>expectedPositions</code> in here
- * @param expectedPositions check for annotations at these positions in the given <code>viewer</code>
- */
- private void verifyAnnotationPositions(StructuredTextViewer viewer, List expectedPositions) throws Exception{
- ProjectionAnnotationModel projectionModel = viewer.getProjectionAnnotationModel();
- Iterator annotationIter = projectionModel.getAnnotationIterator();
-
- //even with the waiting for the job sometimes the test is just to fast
- int attempts = 0;
- while(!annotationIter.hasNext() && attempts < 3) {
- ++attempts;
- annotationIter = projectionModel.getAnnotationIterator();
- Thread.sleep(500);
- }
-
- List unexpectedPositions = new ArrayList();
-
- while(annotationIter.hasNext()) {
- Object obj = annotationIter.next();
- if(obj instanceof ProjectionAnnotation) {
- ProjectionAnnotation annotation = (ProjectionAnnotation)obj;
- Position pos = projectionModel.getPosition(annotation);
-
- boolean found = expectedPositions.remove(pos);
- if(!found) {
- unexpectedPositions.add(pos);
- }
-
- }
- }
-
- String error = "";
- if(unexpectedPositions.size() != 0) {
- error += "There were " + unexpectedPositions.size() + " unexpected positions that were found";
- for(int i = 0; i < unexpectedPositions.size(); ++i) {
- error += "\n\t" + unexpectedPositions.get(i);
- }
- }
-
- if(expectedPositions.size() != 0 ) {
- error += "\nThere were " + expectedPositions.size() + " expected positions that were not found";
- for(int i = 0; i < expectedPositions.size(); ++i) {
- error += "\n\t" + expectedPositions.get(i);
- }
- }
-
- if(error.length() != 0) {
- fail(error);
- }
- }
-
- /**
- * <p>Line endings can be an issue when running tests on different OSs.
- * This function standardizes the line endings to use <code>\n</code></p>
- *
- * <p>It will get the text from the given editor, change the line endings,
- * and then save the editor</p>
- *
- * @param editor standardize the line endings of the text presented in this
- * editor.
- */
- private void standardizeLineEndings(StructuredTextEditor editor) {
- IDocument doc = editor.getTextViewer().getDocument();
- String contents = doc.get();
- contents = StringUtils.replace(contents, "\r\n", "\n");
- contents = StringUtils.replace(contents, "\r", "\n");
- doc.set(contents);
- }
-
- /**
- * <p>This inner class is used to do set up and tear down before and
- * after (respectively) all tests in the inclosing class have run.</p>
- */
- private static class CSSCodeFoldingTestSetup extends TestSetup {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static String previousWTPAutoTestNonInteractivePropValue = null;
-
- /**
- * Default constructor
- *
- * @param test do setup for the given test
- */
- public CSSCodeFoldingTestSetup(Test test) {
- super(test);
- }
-
- /**
- * <p>This is run once before all of the tests</p>
- *
- * @see junit.extensions.TestSetup#setUp()
- */
- public void setUp() throws Exception {
- initializeResources();
-
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- //close out the editors
- Iterator iter = fFileToEditorMap.values().iterator();
- while(iter.hasNext()) {
- StructuredTextEditor editor = (StructuredTextEditor)iter.next();
- editor.doSave(null);
- editor.close(false);
- }
-
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
-
- fProject.delete(true, new NullProgressMonitor());
- }
-
- /**
- * Set up the project and workbench, this should only be done once
- */
- private static void initializeResources() {
- fProject = ProjectUtil.createProject(PROJECT_NAME, null, null);
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, PROJECT_NAME);
- }
- }
-
- /**
- * ignore
- * @see org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener#aboutToBeReconciled()
- */
- public void aboutToBeReconciled() {
- //ignore
- }
-
- /**
- * keep track of last document reconciled
- *
- * @see org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener#reconciled(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.source.IAnnotationModel, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void reconciled(IDocument document, IAnnotationModel model,
- boolean forced, IProgressMonitor progressMonitor) {
- fReconciledDoc = document;
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java
deleted file mode 100644
index 6b9904e..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestCSSContentAssist.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.tests.viewer;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor;
-import org.eclipse.wst.css.ui.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class TestCSSContentAssist extends TestCase {
-
- protected String projectName = null;
- protected String fileName = null;
- protected String resourcesFolder = null;
- private StructuredTextViewer sourceViewer = null;
- protected IStructuredDocument document = null;
- private IStructuredModel model;
- protected IFile file = null;
-
- public TestCSSContentAssist() {
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- projectName = "CSSContentAssistForMedia";
- fileName = "mediaexample.css";
- resourcesFolder = "/testresources";
-
- String filePath = setupProject();
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(
- new Path(filePath));
-
- if (file != null && !file.exists()) {
- Assert.fail("Unable to locate " + file + ".");
- }
-
- loadFile();
-
- initializeSourceViewer();
- }
-
- private void initializeSourceViewer() {
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- } else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- sourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- } else {
- Assert.fail("Unable to run the test as a display must be available.");
- }
-
- configureSourceViewer();
- }
-
- protected void configureSourceViewer() {
- sourceViewer.configure(new StructuredTextViewerConfigurationCSS());
-
- sourceViewer.setDocument(document);
- }
-
- protected void loadFile() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForEdit(file);
- document = model.getStructuredDocument();
- }
-
- protected String setupProject() throws Exception{
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- } catch (CoreException e) {
-
- }
- String filePath = project.getFullPath().addTrailingSeparator().append(fileName).toString();
-
- ProjectUtil.copyBundleEntriesIntoWorkspace(resourcesFolder, project.getFullPath().toString());
-
- return filePath;
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testContentAssistInsideMedia() throws Exception {
-
- try {
- CSSContentAssistProcessor processor = new CSSContentAssistProcessor();
- ICompletionProposal[] proposals = processor.computeCompletionProposals(sourceViewer, 24);
- assertTrue("No proposals at offset.", proposals.length > 0);
- ICompletionProposal proposal = proposals[0];
- assertEquals("Wrong proposal returned for ACRONYM.", "azimuth", proposal.getDisplayString());
- } finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/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.css.ui.tests/testresources/contentassist/test1.css b/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test1.css
deleted file mode 100644
index c7890af..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test1.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-
-
-.bar {
-
-}
-
-.foo {
- border-style:
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test2.css b/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test2.css
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test2.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test3.css b/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test3.css
deleted file mode 100644
index 051ce95..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test3.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-t {
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test4.css b/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test4.css
deleted file mode 100644
index 6f89c0a..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/contentassist/test4.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-table {
- border-bottom
-}
-
-td {
- border-bottom-style: d
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest1.css b/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest1.css
deleted file mode 100644
index a270624..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest1.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* global (begin) */
-body {
- font-family: sans-serif;
- color: #000;
- background: #fff url("global/body-back.gif") repeat-x;
-}
-
-/* global (end) */
-
-/* header (begin) */
- #header {
- margin-bottom: 1em;
- padding-bottom: 2px;
- }
- #header form {
- font-size: 85%;
- display: inline;
- }
-
- #header .btn,
- #header .txt {
- font-size: 80%;
- }
-
- .message {
- border: 1px solid red;
- margin: 0.3em 0em;
- padding: 0.3em;
- color: green;
- }
-
-/* header (end) */
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest2.css b/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest2.css
deleted file mode 100644
index a270624..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/folding/CSSFoldingTest2.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* global (begin) */
-body {
- font-family: sans-serif;
- color: #000;
- background: #fff url("global/body-back.gif") repeat-x;
-}
-
-/* global (end) */
-
-/* header (begin) */
- #header {
- margin-bottom: 1em;
- padding-bottom: 2px;
- }
- #header form {
- font-size: 85%;
- display: inline;
- }
-
- #header .btn,
- #header .txt {
- font-size: 80%;
- }
-
- .message {
- border: 1px solid red;
- margin: 0.3em 0em;
- padding: 0.3em;
- color: green;
- }
-
-/* header (end) */
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css b/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css
deleted file mode 100644
index 1ec4b8c..0000000
--- a/tests/org.eclipse.wst.css.ui.tests/testresources/mediaexample.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@MEDIA {
- ACRONYM {
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.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/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.jsdt.web.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 33e4d64..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Dec 07 03:23:26 EST 2009
-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.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 79ff3a4..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,
- org.eclipse.wst.jsdt.web.core,
- org.eclipse.core.resources,
- org.eclipse.wst.xml.core
-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 9c3b7e9..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- test.xml,\
- testFiles/
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/AllWebCoreTests.java b/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java
deleted file mode 100644
index 4d4c6eb..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.jsdt.web.core.tests.translation.TestHtmlTranslation;
-
-public class AllWebCoreTests extends TestSuite {
- public AllWebCoreTests() {
- super("JSDT Web Core Tests");
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("JSDT Web Core Tests");
- //$JUnit-BEGIN$
-
- //$JUnit-END$
- suite.addTestSuite(TestHtmlTranslation.class);
- return suite;
- }
-
-}
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 7a3c346..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/translation/TestHtmlTranslation.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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 {
- private 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();
- }
-
- private 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;
- }
-
- private static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- private 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;
- }
-
- private IStructuredModel getSharedModel(String id, String contents) {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- inputStream = new ByteArrayInputStream(contents.getBytes("UTF8"));
-
- 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;
- }
-
- private String getFile(String fileName) {
- return readFile("/testFiles/".concat(fileName));
- }
-
- public void testMangleTagInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var a = <custom:tag/>5; if(a < 4) {} ; </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("tag included", translated.indexOf("<custom") < 0);
- assertTrue("tag included", translated.indexOf("/>") < 0);
-
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleServerSideAndClientTagInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var a = <custom:tag/>5;\nif(a < <%= 4 %>) {} ; </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("<%") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("%>") < 0);
- assertTrue("tag included\n" + translated, translated.indexOf("custom") < 0);
- assertTrue("tag included\n" + translated, translated.indexOf("/>") < 0);
- assertTrue("var dropped\n" + translated, translated.indexOf("var a = ") > -1);
- assertTrue("if dropped\n" + translated, translated.indexOf("5;\nif(a <") > -1);
- assertTrue("block dropped\n" + translated, translated.indexOf(") {} ; ") > -1);
-
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleTagAndServerSideInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var a = <%= 4 %>5;\nif(a < <custom:tag/>) {} ; </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("<%") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("%>") < 0);
- assertTrue("tag included\n" + translated, translated.indexOf("custom") < 0);
- assertTrue("tag included\n" + translated, translated.indexOf("/>") < 0);
- assertTrue("var dropped\n" + translated, translated.indexOf("var a = ") > -1);
- assertTrue("if dropped\n" + translated, translated.indexOf("5;\nif(a < ") > -1);
- assertTrue("block dropped\n" + translated, translated.indexOf(") {} ; ") > -1);
-
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
-// public void testMangleOverlappingTagAndServerSideInJS() {
-// // get model
-// String fileName = getName() + ".html";
-// IStructuredModel structuredModel = getSharedModel(fileName, "<script> var a = <%= 4 %>5;\nif(a < <custom:tag attr=\"<%=%>\"/>) {} ; </script>");
-// assertNotNull("missing test model", structuredModel);
-//
-// // do translation
-// JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
-// JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
-// IJsTranslation translation = translationAdapter.getJsTranslation(false);
-// String translated = translation.getJsText();
-// assertTrue("server-side script block included\n" + translated, translated.indexOf("<%") < 0);
-// assertTrue("server-side script block included\n" + translated, translated.indexOf("%>") < 0);
-// assertTrue("tag included\n" + translated, translated.indexOf("custom") < 0);
-// assertTrue("tag included\n" + translated, translated.indexOf("/>") < 0);
-// assertTrue("var dropped\n" + translated, translated.indexOf("var a = ") > -1);
-// assertTrue("if dropped\n" + translated, translated.indexOf("5;\nif(a < ") > -1);
-// assertTrue("block dropped\n" + translated, translated.indexOf(") {} ; ") > -1);
-//
-// assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
- public void testMangleServerSide1InJSCheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <%= javaObject.getText() %>; </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleServerSide2InJSCheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <? serverObject.getText() ?>; </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleServerSide1InJSCheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <%= javaObject.getText() %>; <%= javaObject.getText() %></script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleServerSide2InJSCheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <? serverObject.getText() ?>; <? serverObject.getText() ?></script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleMixedServerSideInJS_and_CheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <? serverObject.getText() ?>; <%=\"a\"%> <%=\"b\"%> <? serverObject.getText() ?><%=\"c\"%> </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals("translated contents not as expected", " var text = _$tag_______________________; _$tag___ _$tag___ _$tag________________________$tag___ ",translated);
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleMixedServerSideInJSwithXMLcomment_and_CheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> <!-- var text = <? serverObject.getText() ?>; <%=\"a\"%> <%=\"b\"%> <? serverObject.getText() ?><%=\"c\"%> </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals("translated contents not as expected", " var text = _$tag_______________________; _$tag___ _$tag___ _$tag________________________$tag___ ",translated);
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleMixedServerSideAndClientTagInJS_and_CheckProblems() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <? serverObject.getText() ?>; <%=\"a\"%> <%=\"b\"%> <server:tag/> <? serverObject.getText() ?><%=\"c\"%> </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals("translated contents not as expected", " var text = _$tag_______________________; _$tag___ _$tag___ _$tag________ _$tag________________________$tag___ ",translated);
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testMangleMultipleMixedServerSideAndClientTagInJS_and_CheckProblems2() {
- // get model
- String fileName = getName() + ".jsp";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> var text = <? serverObject.getText() ?>; <%=\"a\"%> <%=\"b\"%> <server:tag/> <? serverObject.getText() ?><%=\"c\"%> </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals("translated contents not as expected", " var text = _$tag_______________________; _$tag___ _$tag___ _$tag________ _$tag________________________$tag___ ",translated);
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included", translated.indexOf("<?") < 0);
- assertTrue("server-side script block included", translated.indexOf("?>") < 0);
- assertTrue("server-side script block included", translated.indexOf("<%") < 0);
- assertTrue("server-side script block included", translated.indexOf("%>") < 0);
- assertTrue("var dropped", translated.indexOf("var text = ") > -1);
- assertTrue("problems found in translation ", translation.getProblems().isEmpty());
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testJustClientTagInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script><custom:tag /></script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("<") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("/") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf(">") < 0);
- assertTrue("content not included\n" + translated, translated.length() != 0);
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testJustServer1SideInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script><%= %></script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("<%") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("%>") < 0);
- assertTrue("content not included\n" + translated, translated.length() != 0);
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testJustServer2SideInJS() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script><? !!!!!!!!!!!!!! ?></script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertTrue("translation empty", translated.length() > 5);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("<?") < 0);
- assertTrue("server-side script block included\n" + translated, translated.indexOf("?>") < 0);
- assertTrue("content not included\n" + translated, translated.length() != 0);
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testLeadingXMLComment() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, " <script> <!-- </script> ");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals(" ", translated);
-
- // release model
- structuredModel.releaseFromRead();
- }
- public void testXMLComment() {
- // get model
- String fileName = getName() + ".html";
- IStructuredModel structuredModel = getSharedModel(fileName, "<script> if(a) <!-- --> </script>");
- assertNotNull("missing test model", structuredModel);
-
- // do translation
- JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) ((IDOMModel) structuredModel).getDocument().getAdapterFor(IJsTranslation.class);
- IJsTranslation translation = translationAdapter.getJsTranslation(false);
- String translated = translation.getJsText();
- assertEquals(" if(a) <!-- --> ", translated);
-
- // release model
- structuredModel.releaseFromRead();
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/test.xml b/tests/org.eclipse.wst.jsdt.web.core.tests/test.xml
deleted file mode 100644
index 6d34689..0000000
--- a/tests/org.eclipse.wst.jsdt.web.core.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.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.jsdt.web.core.tests.AllWebCoreTests" />
- <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.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/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.jsdt.web.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 33e4d64..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Dec 07 03:23:26 EST 2009
-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.jsdt.web.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.web.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 92ac2b4..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.ui.tests;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.wst.jsdt.web.ui.tests.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.commands,
- org.junit,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.jsdt.core,
- org.eclipse.wst.jsdt.ui,
- org.eclipse.wst.jsdt.web.core,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.wst.jsdt.web.ui.tests,
- org.eclipse.wst.jsdt.web.ui.tests.translation
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.jsdt.web.ui.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f9d8c9b..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Properties file for org.eclipse.wst.jsdt.web.ui.tests
-Bundle-Name = Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties b/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties
deleted file mode 100644
index b6bbd8a..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,\
- plugin.xml,\
- OSGI-INF/l10n/,\
- plugin.properties,\
- test.xml
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.properties b/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.properties
deleted file mode 100644
index 73f8bb2..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-_UI_SHOW_TRANSLATION=Show Translation
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.xml b/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.xml
deleted file mode 100644
index 6e359b5..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/plugin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<plugin>
- <extension
- point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.wst.jsdt.web.showTranslation"
- name="Show JavaScript Translation">
- </command>
- <command
- id="org.eclipse.wst.jsdt.web.runCode"
- name="Run Example Handler">
- </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+8"
- contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
- commandId="org.eclipse.wst.jsdt.web.showTranslation"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- sequence="M1+M2+7"
- contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
- commandId="org.eclipse.wst.jsdt.web.runCode"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- </extension>
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.wst.jsdt.web.ui.tests.translation.ShowTranslationHandler"
- commandId="org.eclipse.wst.jsdt.web.showTranslation"/>
- <handler
- class="org.eclipse.wst.jsdt.web.ui.tests.translation.RunCodeHandler"
- commandId="org.eclipse.wst.jsdt.web.runCode"/>
- </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+8"
- contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
- commandId="org.eclipse.wst.jsdt.web.executeArbitrarySnippet"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.wst.jsdt.web.executeArbitrarySnippet"
- name="%_UI_RUN"/>
- </extension>
-</plugin>
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/AllWebUITests.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/AllWebUITests.java
deleted file mode 100644
index c1d7378..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/AllWebUITests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.web.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.jsdt.web.ui.tests.style.StyleTests;
-
-public class AllWebUITests extends TestSuite {
- public AllWebUITests() {
- super("JSDT Web UI Tests");
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("JSDT Web UI Tests");
- // $JUnit-BEGIN$
- suite.addTestSuite(StyleTests.class);
- // $JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/style/StyleTests.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/style/StyleTests.java
deleted file mode 100644
index b18b73d..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/style/StyleTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.web.ui.tests.style;
-
-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.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.LibrarySuperType;
-import org.eclipse.wst.jsdt.internal.core.JavaProject;
-import org.eclipse.wst.jsdt.launching.JavaRuntime;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-
-/**
- * @author nitin
- *
- */
-public class StyleTests extends TestCase {
-
- /**
- *
- */
- public StyleTests() {
- super();
- }
-
- /**
- * @param name
- */
- public StyleTests(String name) {
- super(name);
- }
-
- public void testKeywordStyle() throws CoreException {
- String projectName = getName();
- String fileName = projectName + ".html";
- String contents = "<html><head><script> var params = \"someBadString\".substring(1,2,3,4);\nparahnas.shift();</script></head><body> </body></html>";
-
- // Create the JavaScript project
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
- description.setNatureIds(new String[]{JavaScriptCore.NATURE_ID});
- IProject iProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- iProject.create(description, new NullProgressMonitor());
- iProject.open(null);
-
- // Setup the JavaScript project with Web support
- IJavaScriptProject project = JavaScriptCore.create(iProject);
- project.setRawIncludepath(null, new NullProgressMonitor());
- LibrarySuperType superType = new LibrarySuperType(new Path(JavaRuntime.DEFAULT_SUPER_TYPE_LIBRARY), project, JavaRuntime.DEFAULT_SUPER_TYPE);
- ((JavaProject) project).setCommonSuperType(superType);
- new JsWebNature(iProject, null).configure();
-
- // create test file
- IFile file = iProject.getFile(fileName);
- file.create(new ByteArrayInputStream(contents.getBytes()), true, null);
- IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
- assertNotNull("editor failed to open", editor);
- Control control = (Control) editor.getAdapter(Control.class);
- assertNotNull("editor did not return a Control adapter", control);
- assertTrue("editor Control adapter is not a StyledText widget", control instanceof StyledText);
- int varIndex = contents.indexOf("var");
- StyleRange[] styleRanges = ((StyledText) control).getStyleRanges(varIndex, 3);
- assertTrue("no style range for 'var' keyword", styleRanges.length > 0);
- assertNotNull("no foreground color for 'var' keyword", styleRanges[0].foreground);
- assertNotSame("foreground color has same RGB as black", PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_BLACK).getRGB(), styleRanges[0].foreground.getRGB());
- }
-}
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 4abf0ee..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/JSTranslationEditorInput.java
+++ /dev/null
@@ -1,160 +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.sse.core.internal.util.DocumentInputStream;
-
-/**
- * @author nitin
- *
- */
-public class JSTranslationEditorInput implements IStorageEditorInput {
- private class JSTranslationStorage implements IStorage {
- private final IJsTranslation fTranslation;
- final String fBaseLocation;
-
- public JSTranslationStorage(IJsTranslation translation, String baseLocation) {
- fTranslation = translation;
- fBaseLocation = baseLocation;
- }
-
- /*
- * (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 {
- return new DocumentInputStream(new Document(fTranslation.getJsText()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getFullPath()
- */
- public IPath getFullPath() {
- return new Path(fTranslation.getJavaPath());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#getName()
- */
- public String getName() {
- return new Path(fBaseLocation).lastSegment() + ".js";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IStorage#isReadOnly()
- */
- public boolean isReadOnly() {
- return false;
- }
- }
-
- private JSTranslationStorage fStorage;
-
- /**
- *
- */
- public JSTranslationEditorInput(IJsTranslation translation, String baseLocation) {
- fStorage = new JSTranslationStorage(translation, baseLocation);
- }
-
- /*
- * (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 null;
- }
-
- /*
- * (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.fBaseLocation;
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/RunCodeHandler.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/RunCodeHandler.java
deleted file mode 100644
index bbb8177..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/RunCodeHandler.java
+++ /dev/null
@@ -1,418 +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.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.dom.AST;
-import org.eclipse.wst.jsdt.core.dom.ASTNode;
-import org.eclipse.wst.jsdt.core.dom.ASTParser;
-import org.eclipse.wst.jsdt.core.dom.ASTVisitor;
-import org.eclipse.wst.jsdt.core.dom.Assignment;
-import org.eclipse.wst.jsdt.core.dom.Block;
-import org.eclipse.wst.jsdt.core.dom.ExpressionStatement;
-import org.eclipse.wst.jsdt.core.dom.FunctionInvocation;
-import org.eclipse.wst.jsdt.core.dom.JavaScriptUnit;
-import org.eclipse.wst.jsdt.core.dom.ObjectLiteral;
-import org.eclipse.wst.jsdt.core.dom.ObjectLiteralField;
-import org.eclipse.wst.jsdt.core.dom.QualifiedName;
-import org.eclipse.wst.jsdt.core.dom.StringLiteral;
-import org.eclipse.wst.jsdt.internal.core.DocumentAdapter;
-import org.eclipse.wst.jsdt.internal.corext.ValidateEditException;
-import org.eclipse.wst.jsdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaEditor;
-
-
-/**
- * Connected handler for whatever we need it to be
- *
- * Invoke with M1+M2+7
- *
- * @author nitin
- */
-public class RunCodeHandler extends AbstractHandler {
-
- /**
- *
- */
- public RunCodeHandler() {
- }
-
-
- static final class MyNodeVisitor extends ASTVisitor{
- IJavaScriptUnit jsUnit;
- String className;
- private JavaScriptUnit cu;
-
- public MyNodeVisitor(IJavaScriptUnit jsUnit, String className, ASTNode ast) {
- super();
- this.jsUnit = jsUnit;
- this.className = className;
- this.cu = (JavaScriptUnit) ast;
- }
-
- public boolean visit(org.eclipse.wst.jsdt.core.dom.FunctionDeclaration node) {
-// this.jsUnit = (IJavaScriptUnit) node.getRoot();
- Block body = node.getBody();
- try {
- IJavaScriptElement element = jsUnit.getElementAt(body.getStartPosition());
- if (element instanceof IFunction) {
- IFunction function = (IFunction) element;
- if (!function.isConstructor() && function.getDisplayName().equals("sayHello")) {
- IType type = function.getDeclaringType();
- if (type != null /*&& type.getDisplayName().equals(className)*/) {
- cu.recordModifications();
- AST ast = node.getAST();
-
-// String newField = "dojo.declare(\"temp\", null,{handler : function(){ }});";
- String functionLiteral = "handler : function(args){alert(\"Hello\");}";
- ObjectLiteralField field = getObjectLiteralField(functionLiteral);
-
- //creating the function
-// AST parentAST = node.getParent().getAST();
-// FunctionDeclaration decl = parentAST.newFunctionDeclaration();
-// decl.setName(parentAST.newSimpleName("handler"));
-// Block block = parentAST.newBlock();
-//// block.statements().add(parentAST.newExpressionStatement(parentAST.newBlockComment()));
-// decl.setBody(block);
- List fields = ((ObjectLiteral)(node.getParent().getParent().getParent())).fields();
-
- fields.add(field);
-// node.getParent().getBody().statements().add(decl);
-
-// SourceType sty ;
-// sty.createMethod(contents, sibling, force, monitor)
-// ExpressionStatement st = parentAST.newExpressionStatement(decl);
-
-
-
- FunctionInvocation methodInvocation = ast.newFunctionInvocation();
- QualifiedName name = ast.newQualifiedName(ast.newSimpleName("dojo"),ast.newSimpleName("connect"));//$NON-NLS-1$
- methodInvocation.setExpression(name);
- methodInvocation.arguments().add(ast.newSimpleName("a"));
- StringLiteral lit = ast.newStringLiteral();
- lit.setLiteralValue("a");
- methodInvocation.arguments().add(lit);
- ExpressionStatement expressionStatement = ast.newExpressionStatement(methodInvocation);
- body.statements().add(expressionStatement);
-
- TextEdit edits= cu.rewrite(getDocument(jsUnit), JavaScriptCore.getDefaultOptions());
- try {
- JavaModelUtil.applyEdit(jsUnit, edits, true, new NullProgressMonitor());
- } catch (ValidateEditException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
-// jsUnit.becomeWorkingCopy(null);
-
- // get source and make changes to the body directly in the buffer
-// String source = jsUnit.getBuffer().getText(body.getStartPosition(), body.getLength());
-// String toInsert = "\tdojo.connect(a ,b , c, d);\n";
-// int offset = body.getStartPosition()+ body.getLength()-1;
-// IBuffer buffer = jsUnit.getBuffer();
-// buffer.replace(offset, 0, toInsert);
-
- // OR build the syntax up using AST manipulation
-
-//
-
-// ImportDeclaration id = nodeAst.newImportDeclaration();
-// id.setName(nodeAst.newName(new String[] {"java", "util", "Set"}));
-//
-// FunctionInvocation replacement= nodeAst.newFunctionInvocation();
-//
-//
-//
-// ASTRewrite rewriter = ASTRewrite.create(nodeAst);
-//
-// replacement.setName((SimpleName) rewriter.createCopyTarget(function.getName()));
-// replacement.arguments().add(nodeAst.newThisExpression());
-// replacement.setExpression((Expression) rewriter.createCopyTarget(right));
-// rewriter.replace(method, replacement, null);
-//
-//
-// TypeDeclaration td = (TypeDeclaration) cu.types().get(0);
-// ITrackedNodePosition tdLocation = rewriter.track(td);
-// ListRewrite lrw = rewriter.getListRewrite(cu, JavaScriptUnit.TYPES_PROPERTY);
-// lrw.insertLast(id, null);
-// IDocument doc = getDocument(jsUnit);
-// TextEdit edits = rewriter.rewriteAST(doc, null);
-// try {
-// UndoEdit undo = edits.apply(doc);
-// } catch (MalformedTreeException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// } catch (BadLocationException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// }
-//
-
-// jsUnit.commitWorkingCopy(true, new NullProgressMonitor());
-// jsUnit.discardWorkingCopy();
- }
- }
- }
- }
- catch (JavaScriptModelException e) {
- e.printStackTrace();
- }
- return false;
- };
- }
-
- protected void doExecute(IFile jsFile) {
- IProject project = jsFile.getProject();
-// String namespace = CodeGenUtil.getNameSpace(project);
-// final String className = IPCCommandUtil.getPortletHelperClassName(jsFile, namespace);
- final IJavaScriptUnit jsUnit = (IJavaScriptUnit) JavaScriptCore.create(jsFile);
-
- if (jsUnit == null)
- return;
- IProgressMonitor monitor = null;
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
-
-
- ////////////////////////////////////////////////////////////////////////////////
-
- // this part may not be of interest for what you're trying to do
-// IType t = null;
-// try{
-// for (org.eclipse.wst.jsdt.core.IFunction function : jsUnit.getFunctions()) {
-// // functions declared in the file outside of any types
-// org.eclipse.wst.jsdt.core.ISourceRange sourceRange = function.getSourceRange();
-// String source = jsUnit.getBuffer().getText(sourceRange.getOffset(), sourceRange.getLength());
-// }
-//
-// // start with the types in the file
-// IType[] types = jsUnit.getTypes();
-//
-// for (IType type: types) {
-//// if (type.getDisplayName().equals(className)) {
-// t = type;
-// for (IFunction function : type.getFunctions()) {
-// // functions declared in a type
-// if(function.getDisplayName().equals("sayHello") && !function.isConstructor()) {
-// ISourceRange sourceRange = function.getSourceRange();
-// String source = jsUnit.getBuffer().getText(sourceRange.getOffset(), sourceRange.getLength());
-// }
-// }
-//// }
-// }
-// }catch (JavaScriptModelException e) {
-// // TODO: handle exception
-// //;
-// }
-
- //It would be more accurate to walk the AST of the file instead of searching just the top-level children:
-// SourceType st = null;
-// if(t instanceof SourceType)
-// st = (SourceType) t;
-// try {
-// if(st!=null)
-// st.createMethod("function hello(args){}", null, false, null);
-//
-// } catch (JavaScriptModelException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
- ASTParser parser = org.eclipse.wst.jsdt.core.dom.ASTParser.newParser(AST.JLS3);
- parser.setSource(jsUnit);
- ASTNode ast = parser.createAST(null);
- ASTVisitor visitor = new MyNodeVisitor(jsUnit,/*className*/null , ast);
- ast.accept(visitor);
-
-
- }
-
-
-
-
-
-
-
-
-
-
-
- ////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
-
-
-//
-// try {
-// // TODO: check for dirty state first, and save all the opened documents
-// //then do the operation
-//
-// jsUnit.becomeWorkingCopy(monitor);
-// IJavaScriptElement[] children = jsUnit.getChildren();
-// for (IJavaScriptElement javaScriptElement : children) {
-// if(javaScriptElement instanceof SourceType){
-// SourceType st = (SourceType) javaScriptElement;
-// if(st.isClass()){
-// if(st.getDisplayName().equals(className)){
-// SourceTypeElementInfo info = (SourceTypeElementInfo) st.getElementInfo();
-// IJavaScriptElement[] infoChildren =info.getChildren();
-// boolean found = false;
-// SourceMethod method = null;
-// for (IJavaScriptElement javaScriptElement2 : infoChildren) {
-// if(javaScriptElement2 instanceof SourceMethod){
-// method = (SourceMethod) javaScriptElement2;
-// if(method.getDisplayName().equals("sayHello")){
-// found = true;
-// break;
-// }
-// }
-// }
-// if(found){
-//
-// IPath filePath = jsFile.getFullPath();
-// String toInsert = "dojo.connect(a ,b , c, d)";
-// int offset = method.getSourceRange().getOffset();
-// IBuffer source = jsUnit.getBuffer();
-//// source.replace(offset+1, 0, toInsert);
-//// st.createMethod("hello: function(){ var x=5 }", null, true, monitor);
-// //method.
-// IDocument document = getDocument(jsUnit);
-// CompilationUnitChange result = new CompilationUnitChange("Insert dojo connect", jsUnit);
-// AST cu;
-// if(jsUnit instanceof JavaScriptUnit){
-// cu =((JavaScriptUnit)jsUnit).getAST();
-// ASTRewrite rewriter = ASTRewrite.create(cu);
-//
-// }else {
-// ASTParser parser = ASTParser.newParser(AST.JLS3);
-// parser.setSource(document.get().toCharArray());
-// JavaScriptUnit cu = (JavaScriptUnit) parser.createAST(null);
-// cu = cu.getAST();
-// cu.getBodyChild();
-// List<Object> stmts = cu.statements();
-// ExpressionStatement stmt = (ExpressionStatement) stmts.get(2);
-//// stmt.get
-// for (Object object : stmts) {
-// object = object;
-// ((ExpressionStatement)object).getAST();
-// //ASTNodes.getBodyDeclarations((ExpressionStatement)object);
-// FunctionInvocation fi = (FunctionInvocation) (ASTNodes.getChildren((ExpressionStatement)object)).get(0);
-// fi.getBodyChild();
-//// fi.
-// }
-//
-// FunctionInvocation invocation = cu.newFunctionInvocation();
-// }
-//
-//
-//
-// //testing only...
-//// IJavaScriptElement[] elements = method.getChildren();
-//// String source = method.getSource();
-//// Object info1 = method.getElementInfo();
-//// IJavaScriptModel model = method.getJavaScriptModel();
-////// model = model;
-//// st.createMethod("myfun : function(){}", method, true, monitor);
-// }
-//// info = info;
-// }
-//
-// }
-// }
-// }
-//// String toInsert = "dojo.connect(a ,b , c, d)";
-//// int offset = 50;
-//// IBuffer source = jsUnit.getBuffer();
-//// source.replace(offset+1, 0, toInsert);
-//// IBuffer source = jsUnit.getBuffer();
-//// jsUnit.getBuffer().append("\n" + "var x;");
-// jsUnit.commitWorkingCopy(true, monitor);
-// jsUnit.discardWorkingCopy();
-// } catch (JavaScriptModelException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-
-
-
- protected static IDocument getDocument(IJavaScriptUnit cu) throws JavaScriptModelException {
- IBuffer buffer = cu.getBuffer();
- if (buffer instanceof IDocument)
- return (IDocument) buffer;
- return new DocumentAdapter(buffer);
- }
-
- static ObjectLiteralField getObjectLiteralField(String source){
- String js = "x.prototype = {" + source + "}";
- JavaScriptUnit jsu = getAST(js);
- ExpressionStatement stmt = (ExpressionStatement)jsu.statements().get(0);
- ObjectLiteral lit = (ObjectLiteral)((Assignment) stmt.getExpression()).getRightHandSide();
- ObjectLiteralField field = (ObjectLiteralField) lit.fields().get(0);
- ASTNode node = ASTNode.copySubtree(jsu.getAST(), field);
- return (ObjectLiteralField) node;
- }
-
- static JavaScriptUnit getAST(String source){
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source.toCharArray());
- ASTNode ast = parser.createAST(null);
- return (JavaScriptUnit) ast;
- }
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands
- * .ExecutionEvent)
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- IEditorPart activeEditor = HandlerUtil.getActiveEditor(event);
- if (!(activeEditor instanceof JavaEditor)) {
- return null;
- }
- doExecute((IFile) HandlerUtil.getActiveEditor(event).getEditorInput().getAdapter(IFile.class));
- return null;
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/ShowTranslationHandler.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/ShowTranslationHandler.java
deleted file mode 100644
index a24cc70..0000000
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/translation/ShowTranslationHandler.java
+++ /dev/null
@@ -1,132 +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.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.ui.JavaScriptUI;
-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.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 markup editor's current translated source in the JavaScript editor
- *
- * Invoke with M1+M2+8
- *
- * @author nitin
- */
-public class ShowTranslationHandler extends AbstractHandler {
-
- /**
- *
- */
- public ShowTranslationHandler() {
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands
- * .ExecutionEvent)
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- // IDE.openEditor(event.getApplicationContext(), createEditorInput(),
- // JavaUI.ID_CU_EDITOR, true);
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection instanceof IStructuredSelection) {
- List list = ((IStructuredSelection) selection).toList();
- if (!list.isEmpty()) {
- if (list.get(0) instanceof IDOMNode) {
- final IDOMModel model = ((IDOMNode) list.get(0)).getModel();
- INodeAdapter adapter = model.getDocument().getAdapterFor(IJsTranslation.class);
- if (adapter != null) {
- Job opener = new UIJob("Opening JavaScript Translation") {
- public IStatus runInUIThread(IProgressMonitor monitor) {
- JsTranslationAdapter translationAdapter = (JsTranslationAdapter) model.getDocument().getAdapterFor(IJsTranslation.class);
- final IJsTranslation translation = translationAdapter.getJsTranslation(false);
-
- // create an IEditorInput for the Java editor
- final IStorageEditorInput input = new JSTranslationEditorInput(translation, model.getBaseLocation());
- try {
- IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaScriptUI.ID_CU_EDITOR, true);
- // Now add the problems we found
- if (editor instanceof ITextEditor) {
- IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
- translation.reconcileCompilationUnit();
- List problemsList = translation.getProblems();
- IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
- AnnotationTypeLookup lookup = new AnnotationTypeLookup();
- for (int i = 0; i < problems.length; i++) {
- int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
- Position position = new Position(problems[i].getSourceStart(), length);
- Annotation annotation = null;
- String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
- if (problems[i].isError()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
- }
- else if (problems[i].isWarning()) {
- type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
- }
- annotation = new Annotation(type, false, problems[i].getMessage());
- if (annotation != null) {
- annotationModel.addAnnotation(annotation, position);
- }
- }
- }
- }
- catch (PartInitException e) {
- e.printStackTrace();
- Display.getCurrent().beep();
- }
- return Status.OK_STATUS;
- }
- };
- opener.setSystem(false);
- opener.setUser(true);
- opener.schedule();
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/tests/org.eclipse.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.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 686b185..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.100.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/catalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/catalog1.xml
deleted file mode 100644
index 57a1ba7..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/catalog1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system chached="yes" property="value1" systemId="Invoice.dtd" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd"/>
- <uri chached="no" name="http://www.test.com/Invoice.dtd" property="value2" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml b/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml
deleted file mode 100644
index b9ea12a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public id="idvalue1" publicId="Kroelleboelle" uri="http://tempuri.org"/>
- <system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <uri name="urn:fishy:fish" uri="http://www.example.org/"/>
- <public id="idvalue2" publicId="Sleepy" uri="http://tempuri.org"/>
- <system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <nextCatalog catalog="catalog.xml"/>
- <delegatePublic catalog="tom.xml" publicIdStartString="-//OASIS//"/>
- <delegateSystem catalog="fritz.xml" systemIdStartString="http:"/>
- <delegateURI catalog="garfield.xml" uriStartString="urn:x-foods:lasagna"/>
- <systemSuffix systemIdSuffix="schemas/goof.xml" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/schemas/2009/goof-v2.xml"/>
- <uriSuffix uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/schemas/2009/fun-v2.xml" uriSuffix="schemas/goof.xml"/>
- <rewriteSystem rewritePrefix="http://cache.some-repository.com/schemes/" systemIdStartString="http://www.original-repository.com/schemes/"/>
- <rewriteURI rewritePrefix="urn:funny:" uriStartString="urn:x-funny:"/>
-</catalog>
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/delegateAndRewrite/catalog11.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog11.xml
deleted file mode 100644
index d1cbbd8..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog11.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:catalog
- prefer="system"
- xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- xmlns:custom="urn:x-test:schema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:oasis:names:tc:entity:xmlns:xml:catalog ../xsd/xmlcatalog11.xsd ">
-
- <!-- The original ones -->
- <cat:public id="idvalue0" publicId="" uri="http://tempuri.org"/>
- <cat:public id="idvalue1" publicId="Kroelleboelle" uri="http://tempuri.org"/>
- <cat:system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <cat:uri name="urn:fishy:fish" uri="http://www.example.org/"/>
- <cat:nextCatalog catalog="catalog.xml" custom:custom1="yes"/>
-
- <!-- The "newer" ones (partial support from WTP 3.1) -->
- <cat:delegatePublic catalog="tom.xml" publicIdStartString="-//OASIS//"/>
- <cat:delegateSystem catalog="fritz.xml" systemIdStartString="http:"/>
- <cat:delegateURI catalog="garfield.xml" uriStartString="urn:x-foods:lasagna"/>
-
- <cat:rewriteSystem
- systemIdStartString="http://www.original-repository.com/schemes/"
- rewritePrefix="http://cache.some-repository.com/schemes/" />
- <cat:rewriteURI
- uriStartString="urn:x-funny:"
- rewritePrefix="urn:funny:" />
-
- <cat:systemSuffix
- systemIdSuffix="schemas/goof.xml"
- uri="../schemas/2009/goof-v2.xml" />
-
- <cat:uriSuffix
- uriSuffix="schemas/goof.xml"
- uri="../schemas/2009/fun-v2.xml" />
-
- <cat:group prefer="public">
- <cat:public id="idvalue2" publicId="Sleepy" uri="http://tempuri.org" />
- <cat:system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- </cat:group>
-
-</cat: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/data/xsd/xmlcatalog11.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/xmlcatalog11.xsd
deleted file mode 100644
index 6082d1d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/xmlcatalog11.xsd
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:er="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- targetNamespace="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- elementFormDefault="qualified">
-
- <!-- $Id: xmlcatalog11.xsd,v 1.1 2010/03/08 20:44:30 jmoller Exp $ -->
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"/>
-
- <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:uriSuffix"/>
- <xs:element ref="er:systemSuffix"/>
- <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="uriStartString"
- 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="systemSuffix">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdSuffix"
- 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="uriSuffix">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriSuffix"
- 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="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:uriSuffix"/>
- <xs:element ref="er:systemSuffix"/>
- <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="systemSuffix" type="er:systemSuffix"/>
- <xs:element name="uriSuffix" type="er:uriSuffix"/>
- <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/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 4c75c79..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
+++ /dev/null
@@ -1,29 +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>
- <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 00dd0cd..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.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());
-
-
- }
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadComplexCatalog() throws Exception {
-
- //read catalog
- String catalogFile = "/data/delegateAndRewrite/catalog11.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog11", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // test public entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC).size());
-
- // test system entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM).size());
-
- // test uri entries
- assertEquals(1, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI).size());
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog.xml", nextCatalogEntry.getCatalogLocation());
- }
-
-
- 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 20fd703..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.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());
- }
-
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadAndWriteComplexCatalog() throws Exception {
-
- //read catalog
- String catalogFile = "/data/delegateAndRewrite/catalog11.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog11", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // write catalog so we can read it back in
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- String resultCatalogFile = path.append("/catalog11-x.xml").toFile().toURI().toString();
- catalog.setLocation(resultCatalogFile);
-
-
-
- // write catalog
- catalog.save();
-
- // read catalog file from the saved location and test its content
- catalog = (Catalog) getCatalog("catalog2", catalog.getLocation());
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // test public entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC).size());
-
- // test system entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM).size());
-
- // test uri entries
- assertEquals(1, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI).size());
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog.xml", nextCatalogEntry.getCatalogLocation());
- }
-
-}
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.ui.tests/.classpath b/tests/org.eclipse.wst.xml.ui.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.cvsignore b/tests/org.eclipse.wst.xml.ui.tests/.cvsignore
deleted file mode 100644
index 7c7ccdb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-
-build.xml
-temp.folder
-xmluitests.jar
-javaCompiler.xmluitests.jar.args
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.project b/tests/org.eclipse.wst.xml.ui.tests/.project
deleted file mode 100644
index 3f3e68f..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d560f6f..0000000
--- a/tests/org.eclipse.wst.xml.ui.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.xml.ui.tests; singleton:=true
-Bundle-Version: 1.0.400.qualifier
-Bundle-ClassPath: xmluitests.jar
-Bundle-Activator: org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.ui.internal.validation;x-internal:=true,
- org.eclipse.wst.xml.ui.tests,
- org.eclipse.wst.xml.ui.tests.breakpoints,
- org.eclipse.wst.xml.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core,
- org.eclipse.ui.views,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.validation,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.ui.tests/about.html b/tests/org.eclipse.wst.xml.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests/build.properties b/tests/org.eclipse.wst.xml.ui.tests/build.properties
deleted file mode 100644
index 4d50253..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/build.properties
+++ /dev/null
@@ -1,21 +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,\
- xmluitests.jar,\
- META-INF/,\
- plugin.properties,\
- about.html,\
- testresources/,\
- icons/
-jars.compile.order = xmluitests.jar
-source.xmluitests.jar = src/
-output.xmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif b/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif
deleted file mode 100644
index a831fe7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
deleted file mode 100644
index 6053dd5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-providerName=Eclipse.org
-
-Bundle-Name.0 = XML UI Tests
-view.name.0 = Embedded XML Structured Text Viewer
-
-contentTypeTestXML99.ct=Test XML sub-content-type
-contentTypeTestXML99.editor=Test XML sub-content-type editor
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
deleted file mode 100644
index fbe55cd..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
+++ /dev/null
@@ -1,78 +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.xml.ui.tests.viewer.ViewerTestXML"
- id="org.eclipse.wst.xml.ui.tests.viewer.ViewerTestXML">
- </view>
- </extension>
-
- <!-- test for breakpoint error handling -->
- <extension
- point="org.eclipse.wst.sse.ui.breakpoint">
- <breakpointContribution
- id="org.eclipse.wst.xml.ui.providers.test">
- <provider
- contentTypes="org.eclipse.wst.xml.core.xmlsource,org.eclipse.core.runtime.xml"
- class="org.eclipse.wst.xml.ui.tests.breakpoints.BreakpointErrorProvider"
- id="org.eclipse.wst.xml.ui.tests.breakpoints.BreakpointErrorProvider">
- </provider>
- </breakpointContribution>
- </extension>
-
- <extension point="org.eclipse.wst.sse.ui.extendedEditorActions">
- <editorContribution
- targetID="org.eclipse.wst.sse.ui.StructuredTextEditor"
- id="org.eclipse.wst.xml.ui.tests.actions">
- <action
- popupmenuPath="group.editor"
- class="org.eclipse.wst.xml.ui.tests.breakpoints.EnableWarningAction"
- menubarPath="edit/MenuAdditions"
- icon="icons/brkp_obj.gif"
- id="org.eclipse.wst.xml.ui.tests.breakpoints.EnableWarningAction">
- </action>
- </editorContribution>
- </extension>
- <extension
- id="xml.ui.tests1"
- name="%Bundle-Name.0"
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.wst.xml.ui.tests.TestSourceValidationFramework$TestStructuredTextEditor"
- contributorClass="org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML"
- default="false"
- filenames="*.xml99"
- icon="icons/sourceEditor.gif"
- id="org.eclipse.wst.xml.ui.tests.TestSourceValidationFramework$TestStructuredTextEditor"
- name="%contentTypeTestXML99.editor"
- symbolicFontName="org.eclipse.wst.sse.ui.textfont">
- </editor>
- </extension>
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-extensions="xml99"
- priority="low"
- name="%contentTypeTestXML99.ct"
- id="xml99source"
- base-type="org.eclipse.core.runtime.xml">
- </content-type>
- </extension>
- <extension point="org.eclipse.wst.sse.core.commentElementHandler">
- <handler-custom
- commenttype="xml"
- class="org.eclipse.wst.xml.ui.tests.commentelement.CommentElementHandlerForFoo">
- <startwith prefix="$"></startwith>
- </handler-custom>
- </extension>
- <extension point="org.eclipse.wst.sse.ui.editorConfiguration">
- <provisionalConfiguration
- type="sourceReconcilingListener" target="org.eclipse.core.runtime.xml" class="org.eclipse.wst.xml.ui.tests.XMLCodeFoldingTest"/>
- </extension>
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg
deleted file mode 100644
index 52cbee5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg
deleted file mode 100644
index 525c6b1..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg
deleted file mode 100644
index 53c864d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg
deleted file mode 100644
index c815d6b..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg
deleted file mode 100644
index 29d21b5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg
deleted file mode 100644
index 12453f7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml b/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml
deleted file mode 100644
index 86e6a3a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg
deleted file mode 100644
index 74cd0ea..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg
deleted file mode 100644
index c4bf549..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg
deleted file mode 100644
index 65f1eb2..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg
deleted file mode 100644
index 400bb01..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg
deleted file mode 100644
index cea036f..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg
deleted file mode 100644
index c43acc9..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg
deleted file mode 100644
index aa28866..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg
deleted file mode 100644
index d637222..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg
deleted file mode 100644
index 93d241b..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif b/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif
deleted file mode 100644
index 8063afb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg
deleted file mode 100644
index e0fccad..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
deleted file mode 100644
index b0057c9..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
+++ /dev/null
@@ -1,212 +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.wst.xml.ui.internal.validation;
-
-import java.util.ArrayList;
-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.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-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;
-import org.eclipse.wst.xml.ui.tests.ProjectUtil;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-/**
- * Test the XML delegating source validator.
- *
- */
-public class TestDelegatingSourceValidatorForXML extends TestCase
-{
- DelegatingSourceValidatorForXML sourceValidator = new DelegatingSourceValidatorForXML();
-
- /**
- * Test that files that contain non-8bit chars are validated
- * correctly. i.e. Do not produce incorrect validation messages.
- */
- public void testNon8BitChars()
- {
- String projName = "Project";
- String fileName1 = "international-instance.xml";
- String fileName2 = "international.xsd";
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- if (!project.isAccessible()) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(projName + "/" + fileName1));
- if (file != null && !file.exists()) {
- try {
- file.create(FileLocator.openStream(XMLUITestsPlugin.getDefault().getBundle(), new Path("/testresources/Non8BitChars/international-instance.xml"), false), true, new NullProgressMonitor());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(projName + "/" + fileName2));
- if (file != null && !file.exists()) {
- try {
- file.create(FileLocator.openStream(XMLUITestsPlugin.getDefault().getBundle(), new Path("/testresources/Non8BitChars/international.xsd"), false), true, new NullProgressMonitor());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- WorkbenchContext context = new WorkbenchContext();
- List fileList = new ArrayList();
- fileList.add("/" + projName + "/" + fileName1);
- context.setValidationFileURIs(fileList);
- TestReporter reporter = new TestReporter();
- try{
- sourceValidator.validate(context, reporter);
- }
- catch(ValidationException e){
- e.printStackTrace();
- }
-
- assertFalse("Messages were reported on valid file 1.", reporter.isMessageReported());
-
- WorkbenchContext context2 = new WorkbenchContext();
- List fileList2 = new ArrayList();
- fileList2.add("/" + projName + "/" + fileName2);
- context2.setValidationFileURIs(fileList2);
- TestReporter reporter2 = new TestReporter();
- try{
- sourceValidator.validate(context2, reporter2);
- }
- catch(ValidationException e){
- e.printStackTrace();
- }
-
- assertFalse("Messages were reported on valid file 2.", reporter2.isMessageReported());
- }
-
- /**
- * Regression test for Bug 285285
- *
- * @see org.eclipse.wst.xml.ui.internal.validation.TestDelegatingSourceValidatorForXML#testRemoveAndAddBackCommentEndTag
- * @see org.eclipse.wst.html.ui.tests.validation.TestHTMLValidator#testRemoveAndAddBackCommentEndTag
- * @see org.eclipse.jst.jsp.ui.tests.validation.JSPHTMLValidatorTest#testRemoveAndAddBackCommentEndTag
- */
- public void testRemoveAndAddBackCommentEndTag() throws Exception{
- String projectName = "RemoveAndAddBackCommentEndTag";
- IProject project = ProjectUtil.createProject(projectName, XMLUITestsPlugin.getDefault().getStateLocation().append(getName()), null);
-
- IFile testFile = null;
- IStructuredModel model = null;
-
- try {
- //get test file
- ProjectUtil.copyBundleEntriesIntoWorkspace("testresources/RemoveAndAddBackCommentEndTag", projectName);
- testFile = project.getFile("Test1.xml");
- assertTrue("Test file " + testFile + " does not exist", testFile.exists());
-
- //get the document
- model = StructuredModelManager.getModelManager().getModelForEdit(testFile);
- IStructuredDocument document = model.getStructuredDocument();
-
- //set up for validator
- WorkbenchContext context = new WorkbenchContext();
- List fileList = new ArrayList();
- fileList.add(testFile.getFullPath().toPortableString());
- context.setValidationFileURIs(fileList);
-
- //validate clean file
- TestReporter reporter = new TestReporter();
- sourceValidator.validate(context, reporter);
- assertFalse("There should be no validation errors on " + testFile, reporter.isMessageReported());
-
- //need to dynamically find where the --> is because
- //its different on unix vs windows because of line endings
- String contents = document.get();
- int endCommentIndex = contents.indexOf("-->");
-
- //remove -->
- document.replace(endCommentIndex, 3, "");
-
- //validate file with error
- reporter = new TestReporter();
- sourceValidator.validate(context, reporter);
- assertTrue("There should be validation errors on " + testFile, reporter.isMessageReported());
-
- //replace -->
- document.replace(endCommentIndex, 0, "-->");
-
- //validate clean file
- reporter = new TestReporter();
- sourceValidator.validate(context, reporter);
- assertFalse("There should be no validation errors on " + testFile, reporter.isMessageReported());
- } catch(ValidationException e) {
- fail("Could not validate test file " + testFile + ": " + e.getMessage());
- } finally {
- if(model != null) {
- model.releaseFromEdit();
- }
- }
- project.delete(true, null);
- }
-
- /**
- * A <code>IReporter</code> for testing validators
- */
- private class TestReporter implements IReporter {
- private boolean messageReported = false;
-
- public TestReporter(){}
-
- public void addMessage(IValidator origin, IMessage message) {
- messageReported = true;
- }
-
- public boolean isMessageReported() {
- return messageReported;
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {}
-
- public List getMessages() {
- return null;
- }
-
- public boolean isCancelled() {
- return false;
- }
-
- public void removeAllMessages(IValidator origin, Object object) {}
-
- public void removeAllMessages(IValidator origin) {}
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {}
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java
deleted file mode 100644
index 8ce609d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.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.ui.internal.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests MarkupValidator
- */
-public class TestMarkupValidator extends TestCase {
- private MarkupValidator fValidator;
- private IReporter fReporter;
- private IStructuredDocument fDocument;
-
- /**
- * Validates document
- *
- * @param contents
- * contents to set in document
- * @return true if there was a validation error false otherwise
- */
- private boolean validateError(String contents) {
- fDocument.set(contents);
- fValidator.validate(new Region(0, fDocument.getLength()), null, fReporter);
- return fReporter.getMessages().isEmpty();
- }
-
- protected void setUp() throws Exception {
- // just create once
- if (fValidator == null)
- fValidator = new MarkupValidator();
- if (fReporter == null)
- fReporter = new IncrementalReporter(null);
- if (fDocument == null)
- fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor("onfire.xml", "", null);
-
- fValidator.connect(fDocument);
- }
-
- protected void tearDown() throws Exception {
- fValidator.disconnect(fDocument);
- }
-
- public void testAttributesInEndTag() {
- // test for error
- assertTrue("Should get attributes in end tag error", !validateError("<stop></stop drop=\"roll\">"));
-
- // test for no error
- assertTrue("Should not get attributes in end tag error", validateError("<stop></stop>"));
- }
-
- public void testClosingBracket() {
- // test for error
- assertTrue("Should get closing bracket error", !validateError("<stop </stop>"));
-
- // test for no error
- assertTrue("Should not get closing bracket error", validateError("<stop></stop>"));
- }
-
- public void testEmptyTag() {
- // test for error
- assertTrue("Should get empty tag error", !validateError("<>"));
-
- // test for no error
- assertTrue("Should not get empty tag error", validateError("<stop></stop>"));
- }
-
- public void testAttributeValue() {
- // test for error
- assertTrue("Should get attribute has no value error", !validateError("<stop drop></stop>"));
- assertTrue("Should get attribute missing value error", !validateError("<stop drop=></stop>"));
-
- // test for no error
- assertTrue("Should not get attribute missing value error", validateError("<stop drop=\"roll\"></stop>"));
- }
-
- public void testSpaceBeforeName() {
- // test for error
- assertTrue("Should get tag has space before name error", !validateError("< stop></stop>"));
-
- // test for no error
- assertTrue("Should not get tag has space before name error", validateError("<stop></stop>"));
- }
-
- public void testQuotesForAttributeValues() {
- // test for error
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\"></stop>"));
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\"roll></stop>"));
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\'></stop>"));
- assertTrue("Should get missing quotes error", !validateError("<stop drop=roll></stop>"));
-
- // test for no error
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\"\"></stop>"));
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\"roll\"></stop>"));
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\'\'></stop>"));
- assertTrue("Should not get missing quotes error", validateError("<stop drop=\'roll\'></stop>"));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java
deleted file mode 100644
index 08ef4a4..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/AbstractXMLUITest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- * David Carver - copied over from XSL UI Tests for XML UI Tests
- * IBM Corporation - make use of (copy of JSP UI Tests') ProjectUtil to skip
- * file-system calls
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/*
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class AbstractXMLUITest extends TestCase
-{
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static final String PROJECT_FILES = "testresources";
- private static final String TEST_PROJECT_NAME = "AbstractXMLUITest_testresources";
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (!fTestProjectInitialized)
- {
- ProjectUtil.createProject(TEST_PROJECT_NAME, null, null);
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, TEST_PROJECT_NAME);
-
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace()
- {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java
deleted file mode 100644
index 2871e3a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/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.xml.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.xml.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.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java
deleted file mode 100644
index 7969c63..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/ProjectUtil.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-/**
- * Some utilities for creating projects, and copying files into the workspace.
- * Copied from JSP UI tests.
- */
-public class ProjectUtil {
-
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = XMLUITestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = XMLUITestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return file;
- }
-
- /**
- * @param rootEntry - avoid trailing separators
- * @param fullTargetPath
- */
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @param entryname
- * path relative to TEST plugin starting w/ a "/" (eg.
- * "/testfiles/bugnumber/struts-logic.tld")
- * @param fullPath
- * path relative to junit test workpace (eg.
- * "/myruntimeproj/struts-logic.tld")
- * @return
- */
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return file[0];
- }
-
- public static IProject createProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
deleted file mode 100644
index 8776f72..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
+++ /dev/null
@@ -1,70 +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.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.doubleclick.XMLDoubleClickStrategy;
-import org.eclipse.wst.xml.ui.internal.taginfo.XMLTagInfoHoverProcessor;
-import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for xml content type
- */
-public class TestEditorConfigurationXML extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), StructuredTextViewerConfigurationXML.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), XMLContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-
- public void testGetDocumentationTextHover() {
- Object[] hovers = ExtendedConfigurationBuilder.getInstance().getConfigurations(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IXMLPartitions.XML_DEFAULT).toArray();
- assertTrue("no documentation text hover for " + IXMLPartitions.XML_DEFAULT, hovers.length > 0);
-// // check for over-qualified subclasses
-// assertEquals("unexpected documentation text hover for " + IXMLPartitions.XML_DEFAULT, o.getClass(), XMLTagInfoHoverProcessor.class);
- Class required = XMLTagInfoHoverProcessor.class;
- boolean requiredFound = false;
- for (int i = 0; i < hovers.length; i++) {
- if(required.equals(hovers[i].getClass()))
- requiredFound = true;
- }
- assertTrue(required.getName() + " not loaded", requiredFound);
- }
-
- public void testGetDoubleClickStrategy() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOUBLECLICKSTRATEGY, IXMLPartitions.XML_DEFAULT);
- assertNotNull("no doubleclick strategy for " + IXMLPartitions.XML_DEFAULT, o);
- // check for over-qualified subclasses
- assertEquals("unexpected doubleclick strategy for " + IXMLPartitions.XML_DEFAULT, o.getClass(), XMLDoubleClickStrategy.class);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestNewXMLGenerator.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestNewXMLGenerator.java
deleted file mode 100644
index 6570417..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestNewXMLGenerator.java
+++ /dev/null
@@ -1,144 +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.ui.tests;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.ui.internal.wizards.NewXMLGenerator;
-
-public class TestNewXMLGenerator extends TestCase {
-
- static String PLUGIN_ABSOLUTE_PATH;
-
- static final String SCHEMA_1 = "Schema1"; //$NON-NLS-1$
- static final String SCHEMA_2 = "Schema2"; //$NON-NLS-1$
- static final String ROOT_ELEMENT_1 = "GolfCountryClub"; //$NON-NLS-1$
- static final String ROOT_ELEMENT_2 = "BillInfo"; //$NON-NLS-1$
-
- /**
- * Sets up the test.
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /**
- * Test generation with no options selected.
- */
- public void testNXG_bare() {
- runOneTest(0, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with optional attributes included.
- */
- public void testNXG_optAttr() {
- runOneTest(DOMContentBuilder.BUILD_OPTIONAL_ATTRIBUTES, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with optional elements included.
- */
- public void testNXG_optElem() {
- runOneTest(DOMContentBuilder.BUILD_OPTIONAL_ELEMENTS, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with elements set to initial first value.
- */
- public void testNXG_optFirst() {
- runOneTest(DOMContentBuilder.BUILD_FIRST_CHOICE | DOMContentBuilder.BUILD_FIRST_SUBSTITUTION, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with text nodes.
- */
- public void testNXG_optTextNodes() {
- runOneTest(DOMContentBuilder.BUILD_TEXT_NODES, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with all options selected.
- */
- public void testNXG_all() {
- runOneTest(DOMContentBuilder.BUILD_OPTIONAL_ATTRIBUTES | DOMContentBuilder.BUILD_OPTIONAL_ELEMENTS |
- DOMContentBuilder.BUILD_FIRST_CHOICE | DOMContentBuilder.BUILD_FIRST_SUBSTITUTION | DOMContentBuilder.BUILD_TEXT_NODES, ROOT_ELEMENT_1, SCHEMA_1);
- }
-
- /**
- * Test generation with a separate schema in which namespaces must be qualified.
- */
- public void testNXG_nsQualified(){
- runOneTest(DOMContentBuilder.BUILD_OPTIONAL_ATTRIBUTES | DOMContentBuilder.BUILD_OPTIONAL_ELEMENTS |
- DOMContentBuilder.BUILD_FIRST_CHOICE | DOMContentBuilder.BUILD_FIRST_SUBSTITUTION | DOMContentBuilder.BUILD_TEXT_NODES, ROOT_ELEMENT_2, SCHEMA_2);
- }
-
- /**
- * Runs a generic generate + comparison test.
- * @param buildPolicy Integer representing the build policy for this generation.
- * @param rootElement Desired root element.
- * @param xsdUri URI of the desired XML schema.
- */
- private void runOneTest(int buildPolicy, String rootElement, String xsdUriFile) {
- try {
- // generic setup
- PLUGIN_ABSOLUTE_PATH = XMLUITestsPlugin.getInstallURL();
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/" + xsdUriFile + ".xsd"; //$NON-NLS-3$
- String[] errorInfo = new String[2];
- CMDocument cmd = NewXMLGenerator.createCMDocument(uri, errorInfo);
- NewXMLGenerator generator = new NewXMLGenerator(uri, cmd);
-
- String id = xsdUriFile + "-" + rootElement + "-" + buildPolicy;
-
- String fileNameResult = PLUGIN_ABSOLUTE_PATH + "testresources/Tested-" + id + ".xml"; //$NON-NLS-2$
- File nFile = new File(fileNameResult);
- if (!nFile.exists()) {
- nFile.createNewFile();
- }
-
- String fileNameCompare = PLUGIN_ABSOLUTE_PATH + "testresources/Compare-" + id + ".xml"; //$NON-NLS-2$
-
- generator.setBuildPolicy(buildPolicy);
- generator.setRootElementName(rootElement);
- generator.setDefaultSystemId(xsdUriFile + ".xsd"); //$NON-NLS-1$
- generator.createNamespaceInfoList();
- generator.createXMLDocument(fileNameResult);
-
- XMLDiff differ = new XMLDiff();
- assertTrue("The XML files are not identical.", differ.diff(fileNameCompare, fileNameResult, "XML")); //$NON-NLS-2$
-
- // if we've made it this far, delete the output file
- remove(nFile);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param file
- */
- private void remove(File file) {
- if(file.isDirectory()) {
- File[] children = file.listFiles();
- for (int i = 0; i < children.length; i++) {
- remove(children[i]);
- }
- }
- file.delete();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
deleted file mode 100644
index 047a896..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
+++ /dev/null
@@ -1,148 +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.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.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-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.ui.internal.tabletree.XMLMultiPageEditorPart;
-import org.w3c.dom.NodeList;
-
-/**
- * Test misc editor functions with an open xml editor.
- */
-public class TestOpenEditorXML extends TestCase {
- private final String PROJECT_NAME = "TestOpenEditorXML";
- private final String FILE_NAME = "testStructuredTextEditorXML.xml";
-
- private static IEditorPart fEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- public TestOpenEditorXML() {
- super("TestStructuredTextEditorXML");
- }
-
- protected void setUp() throws Exception {
- // only create project and file once
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
-
- assertTrue("Input file not accessible: " + fFile.getFullPath(), fFile.isAccessible());
-
- // editor is opened each time
- if (fIsSetup && fEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fEditor = IDE.openEditor(page, fFile, true, true);
- assertTrue("Unable to open structured text editor " + fEditor, (fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor));
- }
- }
-
- protected void tearDown() throws Exception {
- // editor is closed each time
- if (fEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fEditor, false);
- assertTrue("Unable to close editor", true);
- fEditor = null;
- }
- }
-
- private void createProject(String projName) throws CoreException {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- /**
- * Test setting text in document of open editor.
- */
- public void testSetDocument() {
- IDocument document = (IDocument) fEditor.getAdapter(IDocument.class);
- try {
- document.set("<hello></hello>");
- }
- catch (Exception e) {
- assertTrue("Unable to set text in editor: " + e, false);
- }
- }
-
- /**
- * Test structured document is reloaded on resource change
- *
- */
- public void testBug151069() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- // set h1 to readonly
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IDOMModel model = null;
- try {
- model = (IDOMModel) modelManager.getExistingModelForEdit(doc);
- if (model != null) {
- NodeList nl = model.getDocument().getElementsByTagName("h1");
- IDOMElement h1 = (IDOMElement) nl.item(0);
- h1.setEditable(false, true);
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
-
- String newContent = "new content";
- ((IDocumentExtension4) doc).set(newContent, fFile.getModificationStamp());
- assertEquals("Set contents in document with read only regions failed", newContent, doc.get());
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
deleted file mode 100644
index 1371740..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
+++ /dev/null
@@ -1,161 +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.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.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.properties.ConfigurablePropertySheetPage;
-import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension;
-import org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration;
-
-public class TestPropertySheetConfiguration extends TestCase {
- private final String PROJECT_NAME = "TestPropertySheetConfiguration";
- private final String FILE_NAME = "testPropertySheetConfiguration.xml";
-
- private static StructuredTextEditor fEditor;
- private static IEditorPart fMainEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- public TestPropertySheetConfiguration() {
- super("TestPropertySheetConfiguration");
- }
-
- protected void setUp() throws Exception {
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
- // editor is opened each time
- if (fIsSetup && fMainEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fMainEditor = IDE.openEditor(page, fFile, true, true);
- if (fMainEditor instanceof StructuredTextEditor)
- fEditor = (StructuredTextEditor) fMainEditor;
- else if (fMainEditor != null) {
- Object adapter = fMainEditor.getAdapter(ITextEditor.class);
- if (adapter instanceof StructuredTextEditor)
- fEditor = (StructuredTextEditor) adapter;
- }
- if (fEditor == null)
- assertTrue("Unable to open structured text editor " + ((fMainEditor != null) ? fMainEditor.getClass().getName() : ""), false);
- }
- }
-
- protected void tearDown() throws Exception {
- // editor is closed each time
- if (fMainEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fMainEditor, false);
- assertTrue("Unable to close editor", true);
- fMainEditor = null;
- 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();
- }
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- public void testPropertySourceRemoval() throws BadLocationException {
- IDocument document = (IDocument) fEditor.getAdapter(IDocument.class);
- // set up the editor document
- document.replace(0, 0, "<test><myproperty props=\"yes\" /></test>");
-
- // set current selection in editor
- ISelection setSelection = new TextSelection(9, 0);
- fEditor.getSelectionProvider().setSelection(setSelection);
-
- // get current selection in editor
- Object item = null;
- ISelection selection = fEditor.getSelectionProvider().getSelection();
- if (selection instanceof IStructuredSelection) {
- item = ((IStructuredSelection) selection).getFirstElement();
-
- IPropertySheetPage propertySheet = (IPropertySheetPage) fEditor.getAdapter(IPropertySheetPage.class);
- assertTrue("No ConfigurablePropertySheetPage found", propertySheet instanceof ConfigurablePropertySheetPage);
- if (propertySheet instanceof ConfigurablePropertySheetPage) {
- ConfigurablePropertySheetPage cps = (ConfigurablePropertySheetPage) propertySheet;
- PropertySheetConfiguration config = cps.getConfiguration();
- assertNotNull("No property sheet configuration found", config);
-
- IPropertySourceProvider provider = config.getPropertySourceProvider(cps);
- assertNotNull("No property sheet provider found", provider);
-
- IPropertySource source = provider.getPropertySource(item);
- if (source instanceof IPropertySourceExtension) {
- boolean canRemove = ((IPropertySourceExtension) source).isPropertyRemovable("props");
- assertTrue("Current property cannot be removed", canRemove);
- if (canRemove) {
- ((IPropertySourceExtension) source).removeProperty("props");
- assertTrue("Current property cannot be removed", true);
- // force return here, to avoid last fall through
- // failing assert
- return;
- }
- }
- }
- }
- // if we get to here, always fail, since something went wrong.
- assertTrue("testPropertySourceRemoval test did not take expected path", false);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java
deleted file mode 100644
index 69fc3bb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java
+++ /dev/null
@@ -1,223 +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.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-
-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.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-
-/**
- * Tests reconciler in an open editor.
- */
-public class TestReconcilerXML extends TestCase {
- private final String PROJECT_NAME = "TestReconcilerXML";
- private final String FILE_NAME = "TestReconcilerXMLfile.xml";
- final private String ANNOTATION_ERROR = "org.eclipse.wst.sse.ui.temp.error"; //$NON-NLS-1$
- final private String ANNOTATION_WARNING = "org.eclipse.wst.sse.ui.temp.warning"; //$NON-NLS-1$
-
- private static IEditorPart fEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- private boolean fReconcilerPref;
-
- public TestReconcilerXML() {
- super("TestReconcilerXML");
- }
-
- protected void setUp() throws Exception {
- // only create project and file once
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
-
- // editor is opened each time
- if (fIsSetup && fEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fEditor = IDE.openEditor(page, fFile, true, true);
- if (!((fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor)))
- assertTrue("Unable to open structured text editor", false);
- }
-
- // turn on reconciling
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- fReconcilerPref = store.getBoolean(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- if (!fReconcilerPref)
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, true);
- }
-
- protected void tearDown() throws Exception {
- // restore reconciling preference
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, fReconcilerPref);
-
- // editor is closed each time
- if (fEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fEditor, 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();
- }
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- /**
- * Tests reconciler by verifying no errors/warnings found with well-formed
- * xml.
- */
- public void testWellFormed() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify well-formed xml
- try {
- Thread.sleep(5000);
- Iterator iter = annoModel.getAnnotationIterator();
- // make sure the only problem we find is the lack of a specified grammar
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- assertTrue("testReconciler: Unexpected initial annotations" + anno.getText(), anno.getText().indexOf("No grammar constraints") > -1);
- }
- }
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Tests reconciler by verifying error/warning found with ill-formed xml.
- * (missing close bracket)
- */
- public void testIllFormedNoCloseBracket() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify ill-formed xml
- try {
- doc.replace(6, 6, "<body ");
- Thread.sleep(5000);
- boolean errorFound = false;
- Iterator iter = annoModel.getAnnotationIterator();
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- errorFound = true;
- }
- }
- assertTrue("testReconciler: Did not find expected errors in: " + doc.get(), errorFound);
- }
- catch (BadLocationException e) {
- e.printStackTrace();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Tests reconciler by verifying error/warning found with ill-formed xml.
- * (missing attribute value)
- */
- public void testIllFormedNoAttrValue() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify ill-formed xml
- try {
- doc.replace(6, 6, "<body hello>");
- Thread.sleep(5000);
- boolean errorFound = false;
- Iterator iter = annoModel.getAnnotationIterator();
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- errorFound = true;
- }
- }
- assertTrue("testReconciler: Did not find expected errors in: " + doc.get(), errorFound);
- }
- catch (BadLocationException e) {
- e.printStackTrace();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java
deleted file mode 100644
index ae78e61..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java
+++ /dev/null
@@ -1,285 +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.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.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.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.eclipse.wst.sse.ui.internal.reconcile.DocumentRegionProcessor;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ValidatorMetaData;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ValidatorStrategy;
-
-/**
- * Tests reconciler in an open editor. The location of this class is awkward
- * in that it refers to content types declared in plugins that aren't required
- * to be present.
- */
-public class TestSourceValidationFramework extends TestCase {
- /**
- * THIS SUBCLASS IS FOR TESTING ONLY
- */
- public static class TestStructuredTextEditor extends StructuredTextEditor {
- public SourceViewerConfiguration textViewerConfiguration = null;
-
- protected void setSourceViewerConfiguration(SourceViewerConfiguration config) {
- super.setSourceViewerConfiguration(config);
- textViewerConfiguration = config;
- }
- }
-
- private static final String PROJECT_NAME = "TestSourceValidationFramework";
-
- private static final String SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
- private boolean fPreviousReconcilerPref;
-
- public TestSourceValidationFramework() {
- super("TestSourceValidationFramework");
- }
-
- private IFile ensureFileIsAccessible(String filePath, byte[] contents) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.isAccessible()) {
- try {
- byte[] bytes = contents;
- if (bytes == null) {
- bytes = new byte[0];
- }
- blankFile.create(new ByteArrayInputStream(bytes), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- private IContentType[] detectContentTypes(String fileName) {
- IContentType[] types = null;
- IFile file = ensureFileIsAccessible(PROJECT_NAME + SEPARATOR + fileName, null);
-
- types = Platform.getContentTypeManager().findContentTypesFor(file.getName());
- if (types.length == 0) {
- IContentDescription d = null;
- try {
- // optimized description lookup, might not succeed
- d = file.getContentDescription();
- if (d != null) {
- types = new IContentType[]{d.getContentType()};
- }
- }
- catch (CoreException e) {
- /*
- * should not be possible given the accessible and file type
- * check above
- */
- }
- }
- if (types == null) {
- types = Platform.getContentTypeManager().findContentTypesFor(file.getName());
- }
- return types;
- }
-
- private String[] detectContentTypeIDs(String fileName) {
- IContentType[] types = detectContentTypes(fileName);
- String[] ids = new String[types.length];
- for (int i = 0; i < types.length; i++) {
- ids[i] = types[i].getId();
- }
- return ids;
- }
-
- private boolean identicalContents(Object o1[], Object o2[]) {
- if (o1.length == 0 && o2.length == 0)
- return true;
-
- Object[] array1 = new Object[o1.length];
- Object[] array2 = new Object[o2.length];
- System.arraycopy(o1, 0, array1, 0, o1.length);
- System.arraycopy(o2, 0, array2, 0, o2.length);
- Arrays.sort(array1);
- Arrays.sort(array2);
- return Arrays.equals(array1, array2);
- }
-
-
- private void ensureProjectIsAccessible(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- if (!project.exists())
- project.create(description, new NullProgressMonitor());
- if (!project.isAccessible())
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private List getSourceValidatorIDs(String fileName) throws Exception {
- List validatorIds = new ArrayList(1);
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
-
- IFile file = ensureFileIsAccessible(PROJECT_NAME + SEPARATOR + fileName, null);
- IEditorPart editor = IDE.openEditor(page, file, TestStructuredTextEditor.class.getName(), true);
-
- ITextEditor textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
- TestStructuredTextEditor testTextEditor = (TestStructuredTextEditor) textEditor;
- IReconciler reconciler = testTextEditor.textViewerConfiguration.getReconciler(testTextEditor.getTextViewer());
-
- assertNotNull(reconciler);
- assertTrue("unexpected IReconciler implementation: " + reconciler.getClass(), reconciler instanceof DocumentRegionProcessor);
-
- Class reconcilerClass = reconciler.getClass();
- Method method = null;
- while (reconcilerClass != Object.class && method == null) {
- Method[] methods = reconcilerClass.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getName().equals("getValidatorStrategy")) {
- method = methods[i];
- }
- }
- reconcilerClass = reconcilerClass.getSuperclass();
- }
-
- assertNotNull("no getValidatorStrategy method found on " + reconciler.getClass(), method);
- method.setAccessible(true);
- ValidatorStrategy strategy = (ValidatorStrategy) method.invoke(reconciler, new Object[0]);
- assertNotNull(strategy);
- Field fMetaData = strategy.getClass().getDeclaredField("fMetaData");
- assertNotNull("validator metadata field \"fMetaData\" not found on strategy " + strategy.getClass(), fMetaData);
- fMetaData.setAccessible(true);
- List metadata = (List) fMetaData.get(strategy);
- assertNotNull(metadata);
- for (int i = 0; i < metadata.size(); i++) {
- validatorIds.add(((ValidatorMetaData) metadata.get(i)).getValidatorId());
- }
-
- page.closeEditor(editor, false);
-
- return validatorIds;
- }
-
- protected void setUp() throws Exception {
- ensureProjectIsAccessible(PROJECT_NAME);
-
- // turn on reconciling
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- fPreviousReconcilerPref = store.getBoolean(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- if (!fPreviousReconcilerPref) {
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, true);
- }
- }
-
- protected void tearDown() throws Exception {
- // restore reconciling preference
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, fPreviousReconcilerPref);
- }
-
- public void testSourceValidationEnablementWithInheritedValidators() throws Exception {
- Object[] xmlValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml").toArray();
- assertTrue("No XML source validators found", xmlValidatorIDs.length > 0);
- Object[] xml99ValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml99").toArray();
- assertTrue("No XML99 source validators found", xml99ValidatorIDs.length > 0);
-
- Arrays.sort(xmlValidatorIDs);
- Arrays.sort(xml99ValidatorIDs);
-
- assertEquals("validator lists should be the same length", xmlValidatorIDs.length, xml99ValidatorIDs.length);
- for (int i = 0; i < xmlValidatorIDs.length; i++) {
- assertEquals("validator IDs should be the same [" + i + "]", xmlValidatorIDs[i], xml99ValidatorIDs[i]);
- }
- }
-
- public void testSourceValidationEnablementWithUniqueValidators() throws Exception {
- String[] xmlContentTypes = detectContentTypeIDs("testValidatorConfigurations.xml");
- String[] xsdContentTypes = detectContentTypeIDs("testValidatorConfigurations.xsd");
-
- /*
- * If the current configuration does not include a distinct XSD
- * content type, skip the rest
- */
- if (!identicalContents(xmlContentTypes, xsdContentTypes)) {
- List xmlValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml");
- assertTrue("No XML source validators found", !xmlValidatorIDs.isEmpty());
- List xsdValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xsd");
- assertTrue("No XSD source validators found", !xsdValidatorIDs.isEmpty());
- for (int i = 0; i < xmlValidatorIDs.size(); i++) {
- assertTrue("XML Validator found on XSD input", !xsdValidatorIDs.contains(xmlValidatorIDs.get(i)));
- }
- }
- else {
- String message = "No distinct XSD content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
- }
-
- public void testSourceValidationEnablementWithUnrelatedContentTypes() throws Exception {
- String[] dtdContentTypes = detectContentTypeIDs("testValidatorConfigurations.dtd");
- String[] jspContentTypes = detectContentTypeIDs("testValidatorConfigurations.jsp");
- if (dtdContentTypes.length == 0) {
- String message = "No DTD content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
- if (jspContentTypes.length == 0) {
- String message = "No JSP content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
-
-
- if (dtdContentTypes.length > 0 && jspContentTypes.length > 0 && !identicalContents(dtdContentTypes, jspContentTypes)) {
- List dtdValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.dtd");
- assertTrue("No DTD source validators found", !dtdValidatorIDs.isEmpty());
- List jspValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.jsp");
- assertTrue("No JSP source validators found", !jspValidatorIDs.isEmpty());
- int dtdValidatorCount = dtdValidatorIDs.size();
- dtdValidatorIDs.removeAll(jspValidatorIDs);
- assertEquals("validators found running on both CSS and DTD", dtdValidatorCount, dtdValidatorIDs.size());
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java
deleted file mode 100644
index 105c829..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSpellcheckDelegateAdapaterFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.spelling.ISpellcheckDelegate;
-import org.eclipse.wst.xml.ui.internal.spelling.SpellcheckDelegateAdapterFactory;
-
-/**
- * Tests for the <code>SpellcheckDelegateAdapaterFactory</code>
- */
-public class TestSpellcheckDelegateAdapaterFactory extends TestCase {
- /**
- * Default constructor
- */
- public TestSpellcheckDelegateAdapaterFactory() {
- super("Test Spellcheck Delegate AdapaterFactory");
- }
-
- /**
- * Constructor
- *
- * @param name the name to give to this test run
- */
- public TestSpellcheckDelegateAdapaterFactory(String name) {
- super(name);
- }
-
- /**
- * Test the <code>SpellcheckDelegateAdapaterFactory</code>
- * @throws CoreException
- * @throws IOException
- */
- public void testSpellcheckDelegateAdapaterFactory() throws IOException, CoreException {
- String projectName = "TestSpellcheckDelegateAdapaterFactory";
- IProject project = ProjectUtil.createProject(projectName, null, null);
-
- IStructuredModel structuredModel = null;
-
- try {
- //get test file
- ProjectUtil.copyBundleEntriesIntoWorkspace("testresources/spellcheck", projectName);
- IFile testFile = project.getFile("spellcheck_comment_element.xml");
- assertTrue("Test file " + testFile + " does not exist", testFile.exists());
-
- //get delegate
- structuredModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(testFile);
- SpellcheckDelegateAdapterFactory factory = new SpellcheckDelegateAdapterFactory();
- ISpellcheckDelegate delegate = (ISpellcheckDelegate)factory.getAdapter(structuredModel, ISpellcheckDelegate.class);
- assertNotNull("Could not get spellcheck delegate", delegate);
-
- //run tests
- boolean shouldSpellcheckCommentElement = delegate.shouldSpellcheck(54, structuredModel);
- assertFalse("Should not be spellchecking comment elements", shouldSpellcheckCommentElement);
-
- boolean shouldSpellcheckComment = delegate.shouldSpellcheck(80, structuredModel);
- assertTrue("Should be spellchecking comment regions", shouldSpellcheckComment);
- } finally {
- project.delete(true, null);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index f15e411..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.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.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-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 = XMLUIPlugin.getInstance();
- } catch (Exception e) {
- plugin = null;
- }
- assertNotNull("xml editor plugin could not be instantiated", plugin);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java
deleted file mode 100644
index e785125..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-
-/**
- * <p>Tests that code folding annotations are correctly added/removed from XML Documents</p>
- * <p>All of these tests use the same project and when possible the same open documents</p>
- *
- * @see org.eclipse.wst.xml.ui.tests.XMLCodeFoldingTest Similar Test - XML Code Folding Test
- * @see org.eclipse.wst.css.ui.tests.viewer.CSSCodeFoldingTest Similar Test - CSS Code Folding Test
- * @see org.eclipse.wst.dtd.ui.tests.viewer.DTDCodeFoldingTest Similar Test - DTD Code Folding Test
- */
-public class XMLCodeFoldingTest extends TestCase implements ISourceReconcilingListener {
- /** max amount of time to wait for */
- private static final int MAX_WAIT_TIME = 15000;
-
- /** amount of time to wait for */
- private static final int WAIT_TIME = 200;
-
- /**
- * The name of the project that all of these tests will use
- */
- private static final String PROJECT_NAME = "XMLCodeFoldingTest";
-
- /**
- * The location of the testing files
- */
- private static final String PROJECT_FILES = "/testresources/folding";
-
- /**
- * The project that all of the tests use
- */
- private static IProject fProject;
-
- /**
- * Used to keep track of the already open editors so that the tests don't go through
- * the trouble of opening the same editors over and over again
- */
- private static Map fFileToEditorMap = new HashMap();
-
- /** the last {@link IDocument} to be reconciled */
- private static IDocument fReconciledDoc = null;
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public XMLCodeFoldingTest() {
- super("XML Code Folding Test");
- }
-
- /**
- * <p>Constructor that takes a test name.</p>
- * <p>Use {@link #suite()}</p>
- *
- * @param name The name this test run should have.
- *
- * @see #suite()
- */
- public XMLCodeFoldingTest(String name) {
- super(name);
- }
-
- /**
- * <p>Use this method to add these tests to a larger test suite so set up
- * and tear down can be performed</p>
- *
- * @return a {@link TestSetup} that will run all of the tests in this class
- * with set up and tear down.
- */
- public static Test suite() {
- TestSuite ts = new TestSuite(XMLCodeFoldingTest.class, "XML Code Folding Test");
- return new XMLCodeFoldingTestSetup(ts);
-
- }
-
- /**
- * Reset the state between tests
- *
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
-
- fReconciledDoc = null;
- }
-
- /**
- * <p><b>TEST:</b> the initially placed folding annotations</p>
- */
- public void testInitFolding() throws Exception {
- IFile file = getFile("XMLFoldingTest1.xml");
-
- StructuredTextEditor editor = getEditor(file);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(142, 16));
- expectedPositions.add(new Position(173, 36));
- expectedPositions.add(new Position(39, 179));
- expectedPositions.add(new Position(71, 13));
- expectedPositions.add(new Position(62, 107));
- expectedPositions.add(new Position(47, 13));
- expectedPositions.add(new Position(87, 49));
-
- waitForReconcileThenVerify(editor.getTextViewer(), expectedPositions);
- }
-
- /**
- * <p><b>TEST:</b> that folding annotations are updated after node is removed</p>
- */
- public void testRemoveNode() throws Exception {
- IFile file = getFile("XMLFoldingTest1.xml");
-
- StructuredTextEditor editor = getEditor(file);
-
- try {
- StructuredTextViewer viewer = editor.getTextViewer();
- IDocument doc = viewer.getDocument();
- doc.replace(87, 49, "");
- editor.doSave(null);
-
- final List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(93, 16));
- expectedPositions.add(new Position(124, 36));
- expectedPositions.add(new Position(39, 130));
- expectedPositions.add(new Position(71, 13));
- expectedPositions.add(new Position(62, 58));
- expectedPositions.add(new Position(47, 13));
-
- waitForReconcileThenVerify(viewer, expectedPositions);
- } catch(BadLocationException e) {
- fail("Test is broken, replace location has become invalid.\n" + e.getMessage());
- }
- }
-
- /**
- * <p><b>TEST:</b> that folding annotations are updated after node is added</p>
- */
- public void testAddNode() throws Exception {
- IFile file = getFile("XMLFoldingTest2.xml");
-
- StructuredTextEditor editor = getEditor(file);
-
- try {
- StructuredTextViewer viewer = editor.getTextViewer();
- IDocument doc = viewer.getDocument();
- doc.replace(149, 0, "\n<addMe>\n\n\n</addMe>");
- editor.doSave(null);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(150, 18));
- expectedPositions.add(new Position(62, 126));
- expectedPositions.add(new Position(47, 13));
- expectedPositions.add(new Position(39, 198));
- expectedPositions.add(new Position(192, 36));
- expectedPositions.add(new Position(71, 13));
- expectedPositions.add(new Position(142, 35));
- expectedPositions.add(new Position(87, 49));
-
- waitForReconcileThenVerify(viewer, expectedPositions);
- } catch(BadLocationException e) {
- fail("Test is broken, add location has become invalid.\n" + e.getMessage());
- }
- }
-
- /**
- * <p><b>TEST:</b> that even though .xsl documents do not have a specifically specified
- * folding strategy that by the power of hierarchical content types the XML folding
- * strategy is used for the XSLT document.
- */
- public void testConfigTypeHierarchyExploration() throws Exception{
- IFile file = getFile("XSLFoldingTest1.xsl");
-
- StructuredTextEditor editor = getEditor(file);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(120, 88));
- expectedPositions.add(new Position(147, 44));
- expectedPositions.add(new Position(39, 187));
-
- waitForReconcileThenVerify(editor.getTextViewer(), expectedPositions);
- }
-
- /**
- * <p><b>TEST:</b> test the folding of comments</p>
- */
- public void testComments() throws Exception{
- IFile file = getFile("XMLFoldingCommentTest.xml");
-
- StructuredTextEditor editor = getEditor(file);
-
- List expectedPositions = new ArrayList();
- expectedPositions.add(new Position(275, 36));
- expectedPositions.add(new Position(124, 49));
- expectedPositions.add(new Position(179, 81));
- expectedPositions.add(new Position(39, 281));
- expectedPositions.add(new Position(191, 56));
- expectedPositions.add(new Position(64, 31));
- expectedPositions.add(new Position(99, 172));
- expectedPositions.add(new Position(47, 13));
- expectedPositions.add(new Position(108, 13));
-
- waitForReconcileThenVerify(editor.getTextViewer(), expectedPositions);
- }
-
- /**
- * <p>Given a file name in <code>fProject</code> attempts to get an <code>IFile</code>
- * for it, if the file doesn't exist the test fails.</p>
- *
- * @param name the name of the file to get
- * @return the <code>IFile</code> associated with the given <code>name</code>
- */
- private static IFile getFile(String name) {
- IFile file = fProject.getFile(name);
- assertTrue("Test file " + file + " can not be found", file.exists());
-
- return file;
- }
-
- /**
- * <p>Given a <code>file</code> get an editor for it. If an editor has already
- * been retrieved for the given <code>file</code> then return the same already
- * open editor.</p>
- *
- * <p>When opening the editor it will also standardized the line
- * endings to <code>\n</code></p>
- *
- * @param file open and return an editor for this
- * @return <code>StructuredTextEditor</code> opened from the given <code>file</code>
- */
- private StructuredTextEditor getEditor(IFile file) {
- StructuredTextEditor editor = (StructuredTextEditor)fFileToEditorMap.get(file);
-// editor.getTextViewer().get
-
- if(editor == null) {
- try {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorPart editorPart = IDE.openEditor(page, file, true, true);
- if(editorPart instanceof XMLMultiPageEditorPart) {
- XMLMultiPageEditorPart xmlEditorPart = (XMLMultiPageEditorPart)editorPart;
- editor = (StructuredTextEditor)xmlEditorPart.getAdapter(StructuredTextEditor.class);
- standardizeLineEndings(editor);
- } else if(editorPart instanceof StructuredTextEditor) {
- editor = ((StructuredTextEditor)editorPart);
- } else {
- fail("Unable to open structured text editor");
- }
-
- if(editor != null) {
- fFileToEditorMap.put(file, editor);
- } else {
- fail("Could not open viewer for " + file);
- }
- } catch (Exception e) {
- fail("Could not open editor for " + file + " exception: " + e.getMessage());
- }
- }
-
- return editor;
- }
-
- /**
- * Waits for the dirty region reconciler to finish and then verifies that only and all
- * of the <code>expectedPositions</code> have folding annotations in the given <code>viewer</code>
- *
- * @param viewer check for annotations at the given <code>expectedPositions</code>
- * in here after the dirty region reconciler job has finished
- * @param expectedPositions check for annotations at these positions in the given <code>viewer</code>
- * after the dirty region reconciler job has finished
- * @throws InterruptedException
- */
- private void waitForReconcileThenVerify(final StructuredTextViewer viewer, final List expectedPositions) throws Exception {
- IDocument doc = viewer.getDocument();
- int time = 0;
- while(doc != fReconciledDoc && time <= MAX_WAIT_TIME) {
- Thread.sleep(WAIT_TIME);
- time += WAIT_TIME;
- }
-
- if(doc == fReconciledDoc) {
- verifyAnnotationPositions(viewer, expectedPositions);
- } else {
- Assert.fail("Document " + viewer.getDocument() + " was not reconciled with in " + MAX_WAIT_TIME +
- " so gave up waiting and in turn could not validate folding anotations (UI blocked?)");
- }
- }
-
- /**
- * Verifies that only and all of the <code>expectedPositions</code> have folding annotations
- * in the given <code>viewer</code>
- *
- * @param viewer check for annotations at the given <code>expectedPositions</code> in here
- * @param expectedPositions check for annotations at these positions in the given <code>viewer</code>
- */
- private void verifyAnnotationPositions(StructuredTextViewer viewer, List expectedPositions) {
- ProjectionAnnotationModel projectionModel = viewer.getProjectionAnnotationModel();
- Iterator annotationIter = projectionModel.getAnnotationIterator();
-
- List unexpectedPositions = new ArrayList();
- List unexpectedAnnotations = new ArrayList();
-
- while(annotationIter.hasNext()) {
- Object obj = annotationIter.next();
- if(obj instanceof ProjectionAnnotation) {
- ProjectionAnnotation annotation = (ProjectionAnnotation)obj;
- Position pos = projectionModel.getPosition(annotation);
-
- boolean found = expectedPositions.remove(pos);
- if(!found) {
- unexpectedPositions.add(pos);
- unexpectedAnnotations.add(annotation);
- }
-
- }
- }
-
- String error = "";
- if(unexpectedPositions.size() != 0) {
- error += "There were " + unexpectedPositions.size() + " unexpected positions that were found";
- for(int i = 0; i < unexpectedPositions.size(); ++i) {
- error += "\n\t" + unexpectedPositions.get(i) + "\ttype:" + ((Annotation) unexpectedAnnotations.get(i)).getType();
- }
- }
-
- if(expectedPositions.size() != 0 ) {
- error += "\nThere were " + expectedPositions.size() + " expected positions that were not found";
- for(int i = 0; i < expectedPositions.size(); ++i) {
- error += "\n\t" + expectedPositions.get(i);
- }
- }
-
- if(error.length() != 0) {
- fail(error);
- }
- }
-
- /**
- * <p>Line endings can be an issue when running tests on different OSs.
- * This function standardizes the line endings to use <code>\n</code></p>
- *
- * <p>It will get the text from the given editor, change the line endings,
- * and then save the editor</p>
- *
- * @param editor standardize the line endings of the text presented in this
- * editor.
- */
- private void standardizeLineEndings(StructuredTextEditor editor) {
- IDocument doc = editor.getTextViewer().getDocument();
- String contents = doc.get();
- contents = StringUtils.replace(contents, "\r\n", "\n");
- contents = StringUtils.replace(contents, "\r", "\n");
- doc.set(contents);
- }
-
- /**
- * <p>This inner class is used to do set up and tear down before and
- * after (respectively) all tests in the inclosing class have run.</p>
- */
- private static class XMLCodeFoldingTestSetup extends TestSetup {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static String previousWTPAutoTestNonInteractivePropValue = null;
-
- /**
- * Default constructor
- *
- * @param test do setup for the given test
- */
- public XMLCodeFoldingTestSetup(Test test) {
- super(test);
- }
-
- /**
- * <p>This is run once before all of the tests</p>
- *
- * @see junit.extensions.TestSetup#setUp()
- */
- public void setUp() throws Exception {
-
- initializeResources();
-
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- //close out the editors
- Iterator iter = fFileToEditorMap.values().iterator();
- while(iter.hasNext()) {
- StructuredTextEditor editor = (StructuredTextEditor)iter.next();
- editor.doSave(null);
- editor.close(false);
- }
-
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
-
- fProject.delete(true, new NullProgressMonitor());
- }
-
- /**
- * Set up the project and workbench, this should only be done once
- */
- private static void initializeResources() {
- fProject = ProjectUtil.createProject(PROJECT_NAME, null, null);
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, PROJECT_NAME);
- }
- }
-
- /**
- * ignore
- * @see org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener#aboutToBeReconciled()
- */
- public void aboutToBeReconciled() {
- //ignore
- }
-
- /**
- * keep track of last document reconciled
- *
- * @see org.eclipse.wst.sse.ui.reconcile.ISourceReconcilingListener#reconciled(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.source.IAnnotationModel, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void reconciled(IDocument document, IAnnotationModel model,
- boolean forced, IProgressMonitor progressMonitor) {
- fReconciledDoc = document;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLDiff.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLDiff.java
deleted file mode 100644
index 5a4e485..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLDiff.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.ui.tests;
-
-import java.util.List;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * @author Kihup Boo
- */
-public class XMLDiff
-{
- private List errorMessages = new ArrayList();
- private boolean DIFF_ELEMENT_NODE_ONLY = false;
- private String fileType = "";
- public boolean diff(String file1, String file2, String fileType) throws ParserConfigurationException, SAXException, IOException
- {
- return diff(file1,file2, fileType, false);
- }
-
- public boolean diff(String file1, String file2, String fileType, boolean elementOnly) throws ParserConfigurationException, SAXException, IOException
- {
- Document doc1 = getDocument(file1);
- Document doc2 = getDocument(file2);
- DIFF_ELEMENT_NODE_ONLY = elementOnly;
- return diff(doc1,doc2, fileType);
- }
-
- public boolean diff(Document doc1, Document doc2, String fileType)
- {
- Element root1 = doc1.getDocumentElement();
- Element root2 = doc2.getDocumentElement();
- this.fileType = fileType;
- return compareNodes(root1,root2);
- }
-
- private Document getDocument(String uri) throws ParserConfigurationException, SAXException, IOException
- {
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = builder.parse(uri);
- return doc;
- }
-
- private boolean compareNodes(Node node1, Node node2)
- {
- if (DIFF_ELEMENT_NODE_ONLY)
- {
- // Compare only element nodes in the children.
- filterNonElementNodes(node1);
- filterNonElementNodes(node2);
- }
-
- if (node1.getNodeType() != node2.getNodeType()
- || node1.getNodeName() != node2.getNodeName())
- {
- errorMessages.add(this.fileType + ": Type or name different: " + node1.getNodeName() + " " + node2.getNodeName() + ".");
- println("Node type or node name is different:");
- println("Node 1: " + node1.getNodeName());
- println("Node 2: " + node2.getNodeName());
- return false;
- }
-
- if (!compareAttributes(node1,node2))
- return false;
-
- NodeList nodeList1 = node1.getChildNodes();
- NodeList nodeList2 = node2.getChildNodes();
- if (nodeList1.getLength() != nodeList2.getLength())
- {
- errorMessages.add(this.fileType + ": Number of children different: " + node1.getNodeName() + ".");
- println("The number of children different:");
- //println("Node 1: " + nodeList1.getLength());
- //println("Node 2: " + nodeList2.getLength());
- println("Node 1: " + node1.getNodeName());
- println("Node 2: " + node2.getNodeName());
- return false;
- }
-
- boolean result = true;
- int length = nodeList1.getLength();
- for (int i=0; i<length; i++)
- {
- result = compareNodes(nodeList1.item(i),nodeList2.item(i));
- if (!result)
- return false;
- }
- return true;
- }
-
- private void filterNonElementNodes(Node node)
- {
- Node firstChild = node.getFirstChild();
- while (firstChild.getNodeType() != Node.ELEMENT_NODE)
- {
- node.removeChild(firstChild);
- firstChild = node.getFirstChild();
- }
-
- Node sibling = firstChild.getNextSibling();
- Node deleteMe = null;
- while (sibling != null)
- {
- if (sibling.getNodeType() != Node.ELEMENT_NODE)
- {
- deleteMe = sibling;
- sibling = sibling.getNextSibling();
- node.removeChild(deleteMe);
- }
-
- }
- }
-
- private boolean compareAttributes(Node node1, Node node2)
- {
- NamedNodeMap nodeMap1 = node1.getAttributes();
- NamedNodeMap nodeMap2 = node2.getAttributes();
-
- if (nodeMap1 == null || nodeMap2 == null)
- {
- if (nodeMap1 == null && nodeMap2 == null)
- return true;
- else
- return false;
- }
-
- if (nodeMap1.getLength() != nodeMap2.getLength())
- {
- errorMessages.add(this.fileType + ": Number of attributes different: " + node1.getNodeName() + ".");
- println("The number of attributes is different:");
- println("Node 1: " + node1.getNodeName());
- println("Node 2: " + node2.getNodeName());
- return false;
- }
-
- Node attrNode1 = null;
- Node attrNode2 = null;
- int length = nodeMap1.getLength();
- for (int i=0; i<length; i++)
- {
- attrNode1 = nodeMap1.item(i);
- attrNode2 = nodeMap2.getNamedItem(attrNode1.getNodeName());
- if (attrNode2 == null)
- {
- errorMessages.add(this.fileType + ": Attribute not found: " + node1.getNodeName() + ".");
- println("The attribute is not found in Node 2: " + attrNode1.getNodeName());
- println("Node 1: " + node1.getNodeName());
- println("Node 2: " + node2.getNodeName());
- return false;
- }
- else if (!attrNode1.getNodeValue().equals(attrNode2.getNodeValue()))
- {
- errorMessages.add(this.fileType + ": Attribute values different: " + attrNode1.getNodeValue() + " " + attrNode2.getNodeValue() + ".");
- println("The attribute values are different:");
- println("Node 1: " + node1.getNodeName() + "," + attrNode1.getNodeValue());
- println("Node 2: " + node2.getNodeName() + "," + attrNode2.getNodeValue());
- return false;
- }
- }
- return true;
- }
-
- private void println(String s)
- {
- //out.println(s);
- }
-
- /**
- * @return Returns the errorMessages.
- */
- public List getErrorMessages()
- {
- return errorMessages;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java
deleted file mode 100644
index a0eae4d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java
+++ /dev/null
@@ -1,115 +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.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * 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 XMLUIPreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.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, XMLUIPreferenceNames.AUTO_PROPOSE);
- bundleGetPreference(bundleName, XMLUIPreferenceNames.AUTO_PROPOSE_CODE);
- bundleGetPreference(bundleName, XMLUIPreferenceNames.USE_INFERRED_GRAMMAR);
- }
-
- 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 = XMLUIPlugin.getDefault().getPreferenceStore();
-
- pluginGetDefaultPreference(store, XMLUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
- pluginGetDefaultPreference(store, XMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<=:");
- pluginGetDefaultPreference(store, XMLUIPreferenceNames.USE_INFERRED_GRAMMAR, 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 = XMLUIPlugin.getDefault().getPreferenceStore();
-
- pluginSetPreferenceBoolean(store, XMLUIPreferenceNames.AUTO_PROPOSE);
- pluginSetPreferenceString(store, XMLUIPreferenceNames.AUTO_PROPOSE_CODE);
- pluginSetPreferenceBoolean(store, XMLUIPreferenceNames.USE_INFERRED_GRAMMAR);
- }
-
- 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.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
deleted file mode 100644
index 1035c5d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Carver (STAR) - bug 259447 - content assistance tests
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.ui.internal.validation.TestDelegatingSourceValidatorForXML;
-import org.eclipse.wst.xml.ui.internal.validation.TestMarkupValidator;
-import org.eclipse.wst.xml.ui.tests.contentassist.TestXMLContentAssistComputers;
-import org.eclipse.wst.xml.ui.tests.viewer.TestViewerConfigurationXML;
-
-
-public class XMLUITestSuite extends TestSuite {
- public static Test suite() {
- return new XMLUITestSuite();
- }
-
- public XMLUITestSuite() {
- super("XML UI Test Suite");
- addTest(XMLCodeFoldingTest.suite());
- addTest(new TestSuite(VerifyEditorPlugin.class));
- addTest(new TestSuite(XMLUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationXML.class));
- addTest(new TestSuite(TestEditorConfigurationXML.class));
- addTest(new TestSuite(TestOpenEditorXML.class));
- addTest((new TestSuite(TestPropertySheetConfiguration.class)));
- addTest(new TestSuite(TestNewXMLGenerator.class));
- addTestSuite(TestDelegatingSourceValidatorForXML.class);
- addTestSuite(TestMarkupValidator.class);
- addTestSuite(TestReconcilerXML.class);
- addTestSuite(TestSourceValidationFramework.class);
- addTest(new TestSuite(TestSpellcheckDelegateAdapaterFactory.class, "Test Spellcheck Delegate Adapter Factory"));
- addTest(TestXMLContentAssistComputers.suite());
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
deleted file mode 100644
index bbc4fcd..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Carver (STAR) - bug 259447 - content assistance tests
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.util.ResourceBundle;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XMLUITestsPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static XMLUITestsPlugin plugin;
- protected static Bundle pluginBundle;
-
- /**
- * The constructor.
- */
- public XMLUITestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- pluginBundle = context.getBundle();
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static XMLUITestsPlugin 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;
- }
-
- /**
- * 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(); //$NON-NLS-1$
- }
- catch (IOException e)
- {
- return null;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = pluginBundle.getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
deleted file mode 100644
index 91c7bbf..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
+++ /dev/null
@@ -1,64 +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.ui.tests.breakpoints;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-
-public class BreakpointErrorProvider implements IBreakpointProvider {
-
- ISourceEditingTextTools fTool;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#addBreakpoint(org.w3c.dom.Document,
- * org.eclipse.jface.text.IDocument, org.eclipse.ui.IEditorInput,
- * org.w3c.dom.Node, int, int)
- */
- public IStatus addBreakpoint(IDocument idoc, IEditorInput input, int lineNumber, int offset) throws CoreException {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enable = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if (enable)
- return new Status(IStatus.ERROR, XMLUITestsPlugin.getDefault().getBundle().getSymbolicName(), IStatus.ERROR, "Test Error!", null);
- return new Status(IStatus.OK, XMLUITestsPlugin.getDefault().getBundle().getSymbolicName(), IStatus.OK, "", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#getResource(org.eclipse.ui.IEditorInput)
- */
- public IResource getResource(IEditorInput input) {
- IResource res = (IResource) input.getAdapter(IFile.class);
- if (res == null)
- res = (IResource) input.getAdapter(IResource.class);
- return res;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#setSourceEditingTextTools(org.eclipse.wst.sse.ui.extensions.breakpoint.SourceEditingTextTools)
- */
- public void setSourceEditingTextTools(ISourceEditingTextTools tool) {
- fTool = tool;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
deleted file mode 100644
index 46a7f66..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
+++ /dev/null
@@ -1,114 +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.ui.tests.breakpoints;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.sse.ui.internal.IExtendedEditorAction;
-import org.eclipse.wst.sse.ui.internal.IExtendedSimpleEditor;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-
-public class EnableWarningAction extends Action implements IExtendedEditorAction {
- IExtendedSimpleEditor activeEditor;
-
- public EnableWarningAction() {
- super();
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- */
- public EnableWarningAction(String text) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- * @param image
- */
- public EnableWarningAction(String text, ImageDescriptor image) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- * @param style
- */
- public EnableWarningAction(String text, int style) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extension.IExtendedEditorAction#isVisible()
- */
- public boolean isVisible() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- super.run();
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean value = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- XMLUITestsPlugin.getDefault().getPreferenceStore().setValue("break-error", !value);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extension.IExtendedEditorAction#setActiveExtendedEditor(org.eclipse.wst.sse.ui.extension.IExtendedSimpleEditor)
- */
- public void setActiveExtendedEditor(IExtendedSimpleEditor targetEditor) {
- activeEditor = targetEditor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.texteditor.IUpdate#update()
- */
- public void update() {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java
deleted file mode 100644
index f497837..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/commentelement/CommentElementHandlerForFoo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.wst.xml.ui.tests.commentelement;
-
-import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
-import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory;
-import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class CommentElementHandlerForFoo implements CommentElementHandler{
-
- private static final String PREFIX = "foo"; //$NON-NLS-1$
- public Element createElement(Document document, String data, boolean isJSPTag) {
-
- TagScanner scanner = new TagScanner(data, 1);
- String name = scanner.nextName();
- if (name == null) {
- return null;
- }
- StringBuffer buffer = new StringBuffer(name.length() + 4);
- buffer.append(PREFIX);
- buffer.append(':');
- buffer.append(name);
- String tagName = buffer.toString();
-
- CommentElementFactory factory = new CommentElementFactory(document, isJSPTag, this);
- Element element = factory.create(tagName, CommentElementFactory.IS_START);
-
- // set attributes
- String attrName = scanner.nextName();
- while (attrName != null) {
- String attrValue = scanner.nextValue();
- Attr attr = document.createAttribute(attrName);
- if (attr != null) {
- if (attrValue != null)
- attr.setValue(attrValue);
- element.setAttributeNode(attr);
- }
- attrName = scanner.nextName();
- }
- return element;
- }
-
- public String generateEndTagContent(IDOMElement element) {
- return null;
- }
-
- public String generateStartTagContent(IDOMElement element) {
- StringBuffer buffer = new StringBuffer();
- buffer.append('#');
- buffer.append(element.getLocalName());
-
- NamedNodeMap attributes = element.getAttributes();
- int length = attributes.getLength();
- for (int i = 0; i < length; i++) {
- Attr attr = (Attr) attributes.item(i);
- if (attr == null) {
- continue;
- }
- buffer.append(' ');
- String attrName = attr.getNodeName();
- if (attrName != null) {
- buffer.append(attrName);
- }
- String attrValue = attr.getNodeValue();
- if (attrValue != null) {
- // attr name only for HTML boolean and JSP
- buffer.append('=');
- buffer.append(attrValue);
- }
- }
-
- return buffer.toString();
- }
-
- public boolean isCommentElement(IDOMElement element) {
- String prefix = element.getPrefix();
- if (prefix == null || !prefix.equals(PREFIX)) {
- return false;
- }
- String tagName = element.getTagName();
- if (tagName.length() <= 4) {
- return false;
- }
- return true;
- }
-
- public boolean isEmpty() {
- return true;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java
deleted file mode 100644
index 3007b72..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssist.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver - STAR - bug 259447 - intial API and implementation
- * IBM Corporation - make use of (copy of JSP UI Tests') ProjectUtil to skip
- * file-system calls
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.tests.contentassist;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
-import org.eclipse.wst.xml.ui.tests.ProjectUtil;
-
-/**
- * Tests everything about code completion and code assistance.
- *
- */
-public class TestXMLContentAssist extends TestCase {
-
- protected String projectName = null;
- protected String fileName = null;
- protected IFile file = null;
- protected IEditorPart textEditorPart = null;
- protected ITextEditor editor = null;
-
- protected XMLDocumentLoader xmlDocumentLoader = null;
- protected IStructuredDocument document = null;
- protected StructuredTextViewer sourceViewer = null;
- private IStructuredModel model;
- protected XMLContentAssistProcessor xmlContentAssistProcessor = null;
-
- public TestXMLContentAssist() {
- }
-
- /**
- * Setup the necessary projects, files, and source viewer for the tests.
- */
- protected void setUp() throws Exception {
- super.setUp();
- projectName = "TestXMLContentAssist";
- fileName = "xmlContentAssist-test1.xml";
-
- // Setup the Project and File to be used during the test.
- String xmlFilePath = setupProject();
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(
- new Path(xmlFilePath));
- if (file != null && !file.exists()) {
- Assert.fail("Unable to locate " + xmlFilePath + ".");
- }
-
- loadXMLFile();
-
- initializeSourceViewer();
- xmlContentAssistProcessor = new XMLContentAssistProcessor();
- }
-
- protected void initializeSourceViewer() {
- // some test environments might not have a "real" display
- if (Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if (PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell();
- } else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- sourceViewer = new StructuredTextViewer(parent, null, null, false,
- SWT.NONE);
- } else {
- Assert
- .fail("Unable to run the test as a display must be available.");
- }
-
- configureSourceViewer();
- }
-
- protected void configureSourceViewer() {
- sourceViewer.configure(new StructuredTextViewerConfigurationXML());
-
- sourceViewer.setDocument(document);
- }
-
- protected void loadXMLFile() throws ResourceAlreadyExists, ResourceInUse,
- IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForEdit(file);
- document = model.getStructuredDocument();
- }
-
- protected String setupProject() {
- IProjectDescription description = ResourcesPlugin.getWorkspace()
- .newProjectDescription(projectName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- } catch (CoreException e) {
-
- }
- String xmlFilePath = project.getFullPath().addTrailingSeparator().append(fileName).toString();
- // needs both the test file and schemas
- ProjectUtil.copyBundleEntriesIntoWorkspace("/testresources", project.getFullPath().toString());
- return xmlFilePath;
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- xmlContentAssistProcessor.release();
- }
-
- /**
- * Get the content completion proposals at <code>lineNumber</code>,
- * <code>columnNumber</code>.
- *
- * @param lineNumber
- * @param columnNumber
- * @return
- * @throws Exception
- */
- private ICompletionProposal[] getProposals(int offset) throws Exception {
-
- return xmlContentAssistProcessor.computeCompletionProposals(
- sourceViewer, offset);
- }
-
- public void testAttributeProposal() throws Exception {
- try {
- int offset = sourceViewer.getDocument().getLineOffset(10) + 10;
- IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(
- sourceViewer, offset);
- assertEquals("Wrong node name returned:", "Member", node
- .getNodeName());
-
- ICompletionProposal[] proposals = getProposals(offset);
- assertTrue("Length less than 1", proposals.length > 1);
- ICompletionProposal proposal = proposals[0];
- assertEquals("Wrong attribute proposal returned at ["+sourceViewer.getDocument().get(offset-9, 9)+"|"+sourceViewer.getDocument().get(offset, 9)+"]", "handicap",
- proposal.getDisplayString());
- } finally {
- model.releaseFromEdit();
- }
- }
-
- public void testChildElementProposal() throws Exception {
- try {
- int offset = sourceViewer.getDocument().getLineOffset(11) + 8;
-
- ICompletionProposal[] proposals = getProposals(offset);
- assertEquals("Unexpected number of proposals", 5, proposals.length);
- ICompletionProposal proposal = proposals[0];
- assertEquals("Wrong element proposal returned.", "ExclusiveMember",
- proposal.getDisplayString());
- } finally {
- model.releaseFromEdit();
- }
- }
-
- public void testShaftElementProposal() throws Exception {
- try {
- int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
- ICompletionProposal[] proposals = getProposals(offset);
- assertEquals("Unexpected number of proposals", 7, proposals.length);
- ICompletionProposal proposal = proposals[0];
- assertEquals("Wrong element proposal returned.", "Shaft", proposal
- .getDisplayString());
- } finally {
- model.releaseFromEdit();
- }
- }
-
- public void testXMLTemplatePositionalProposal() throws Exception {
- try {
- int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
- ICompletionProposal[] proposals = getProposals(offset);
- assertEquals("Unexpected number of proposals", 7, proposals.length);
- ICompletionProposal proposal = proposals[5];
- assertEquals("Wrong template proposal returned.",
- "comment - xml comment", proposal.getDisplayString());
- } finally {
- model.releaseFromEdit();
- }
- }
-
- public void testXMLCommentTemplateProposalExists() throws Exception {
- try {
- int offset = sourceViewer.getDocument().getLineOffset(24) + 6;
-
- ICompletionProposal[] proposals = getProposals(offset);
- assertNotNull("No proposals returned.", proposals);
- boolean foundsw = false;
- for (int cnt = 0; cnt < proposals.length; cnt++) {
- ICompletionProposal proposal = proposals[cnt];
- if (proposal.getDisplayString().equals("comment - xml comment")) {
- foundsw = true;
- }
- }
- if (foundsw == false) {
- fail("XML Template 'xml comment' was not found in the proposal list");
- }
- } finally {
- model.releaseFromEdit();
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssistComputers.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssistComputers.java
deleted file mode 100644
index df861cd..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/contentassist/TestXMLContentAssistComputers.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests.contentassist;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-import org.eclipse.wst.xml.ui.tests.ProjectUtil;
-
-public class TestXMLContentAssistComputers extends TestCase {
- /** The name of the project that all of these tests will use */
- private static final String PROJECT_NAME = "TestXMLContentAssistComputers";
-
- /** The location of the testing files */
- private static final String PROJECT_FILES = "/testresources/contentassist";
-
- /** The project that all of the tests use */
- private static IProject fProject;
-
- /**
- * Used to keep track of the already open editors so that the tests don't go through
- * the trouble of opening the same editors over and over again
- */
- private static Map fFileToEditorMap = new HashMap();
-
- /**
- * <p>Default constructor<p>
- * <p>Use {@link #suite()}</p>
- *
- * @see #suite()
- */
- public TestXMLContentAssistComputers() {
- super("Test XML Content Assist Computers");
- }
-
- /**
- * <p>Constructor that takes a test name.</p>
- * <p>Use {@link #suite()}</p>
- *
- * @param name The name this test run should have.
- *
- * @see #suite()
- */
- public TestXMLContentAssistComputers(String name) {
- super(name);
- }
-
- /**
- * <p>Use this method to add these tests to a larger test suite so set up
- * and tear down can be performed</p>
- *
- * @return a {@link TestSetup} that will run all of the tests in this class
- * with set up and tear down.
- */
- public static Test suite() {
- TestSuite ts = new TestSuite(TestXMLContentAssistComputers.class, "Test XML Content Assist Computers");
- return new TestXMLContentAssistComputersSetup(ts);
- }
-
- public void testChildElementProposals1() throws Exception {
- // default page, templates page, tags page, default page again
- int[] expectedProposalCounts = new int[] {5, 2, 3, 5};
- runProposalTest("test1.xml", 11, 8, expectedProposalCounts);
- }
-
- public void testChildElementProposals2() throws Exception {
- // default page, templates page, tags page, default page again
- int[] expectedProposalCounts = new int[] {7, 2, 5, 7};
- runProposalTest("test1.xml", 24, 6, expectedProposalCounts);
- }
-
- public void testAttributeProposals() throws Exception {
- // default page, templates page, tags page, default page again
- int[] expectedProposalCounts = new int[] {5, 4, 1, 5};
- runProposalTest("test1.xml", 10, 10, expectedProposalCounts);
- }
-
- /**
- * <p>Run a proposal test by opening the given file and invoking content assist for
- * each expected proposal count at the given line number and line character
- * offset and then compare the number of proposals for each invocation (pages) to the
- * expected number of proposals.</p>
- *
- * @param fileName
- * @param lineNum
- * @param lineRelativeCharOffset
- * @param expectedProposalCounts
- * @throws Exception
- */
- private static void runProposalTest(String fileName,
- int lineNum, int lineRelativeCharOffset,
- int[] expectedProposalCounts) throws Exception{
-
- IFile file = getFile(fileName);
- StructuredTextEditor editor = getEditor(file);
- StructuredTextViewer viewer = editor.getTextViewer();
- int offset = viewer.getDocument().getLineOffset(lineNum) + lineRelativeCharOffset;
-
- ICompletionProposal[][] pages = getProposals(viewer, offset, expectedProposalCounts.length);
-
- verifyProposalCounts(pages, expectedProposalCounts);
- }
-
- /**
- * <p>Invoke content assist on the given viewer at the given offset, for the given number of pages
- * and return the results of each page</p>
- *
- * @param viewer
- * @param offset
- * @param pageCount
- * @return
- * @throws Exception
- */
- private static ICompletionProposal[][] getProposals(StructuredTextViewer viewer, int offset, int pageCount) throws Exception {
- //setup the viewer
- StructuredTextViewerConfigurationXML configuration = new StructuredTextViewerConfigurationXML();
- ContentAssistant contentAssistant = (ContentAssistant)configuration.getContentAssistant(viewer);
- viewer.configure(configuration);
- viewer.setSelectedRange(offset, 0);
-
- //get the processor
- String partitionTypeID = viewer.getDocument().getPartition(offset).getType();
- IContentAssistProcessor processor = contentAssistant.getContentAssistProcessor(partitionTypeID);
-
- //fire content assist session about to start
- Method privateFireSessionBeginEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionBeginEvent", new Class[] {boolean.class});
- privateFireSessionBeginEventMethod.setAccessible(true);
- privateFireSessionBeginEventMethod.invoke(contentAssistant, new Object[] {Boolean.TRUE});
-
- //get content assist suggestions
- ICompletionProposal[][] pages = new ICompletionProposal[pageCount][];
- for(int p = 0; p < pageCount; ++p) {
- pages[p] = processor.computeCompletionProposals(viewer, offset);
- }
-
- //fire content assist session ending
- Method privateFireSessionEndEventMethod = ContentAssistant.class.
- getDeclaredMethod("fireSessionEndEvent", null);
- privateFireSessionEndEventMethod.setAccessible(true);
- privateFireSessionEndEventMethod.invoke(contentAssistant, null);
-
- return pages;
- }
-
- /**
- * <p>Compare the expected number of proposals per page to the actual number of proposals
- * per page</p>
- *
- * @param pages
- * @param expectedProposalCounts
- */
- private static void verifyProposalCounts(ICompletionProposal[][] pages, int[] expectedProposalCounts) {
- StringBuffer error = new StringBuffer();
- for(int page = 0; page < expectedProposalCounts.length; ++page) {
- if(expectedProposalCounts[page] != pages[page].length) {
- error.append("\nProposal page " + page + " did not have the expected number of proposals: was " +
- pages[page].length + " expected " + expectedProposalCounts[page]);
- }
- }
-
- //if errors report them
- if(error.length() > 0) {
- Assert.fail(error.toString());
- }
- }
-
- /**
- * <p>Given a file name in <code>fProject</code> attempts to get an <code>IFile</code>
- * for it, if the file doesn't exist the test fails.</p>
- *
- * @param name the name of the file to get
- * @return the <code>IFile</code> associated with the given <code>name</code>
- */
- private static IFile getFile(String name) {
- IFile file = fProject.getFile(name);
- assertTrue("Test file " + file + " can not be found", file.exists());
-
- return file;
- }
-
- /**
- * <p>Given a <code>file</code> get an editor for it. If an editor has already
- * been retrieved for the given <code>file</code> then return the same already
- * open editor.</p>
- *
- * <p>When opening the editor it will also standardized the line
- * endings to <code>\n</code></p>
- *
- * @param file open and return an editor for this
- * @return <code>StructuredTextEditor</code> opened from the given <code>file</code>
- */
- private static StructuredTextEditor getEditor(IFile file) {
- StructuredTextEditor editor = (StructuredTextEditor)fFileToEditorMap.get(file);
-
- if(editor == null) {
- try {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IEditorPart editorPart = IDE.openEditor(page, file, true, true);
- if(editorPart instanceof XMLMultiPageEditorPart) {
- XMLMultiPageEditorPart xmlEditorPart = (XMLMultiPageEditorPart)editorPart;
- editor = (StructuredTextEditor)xmlEditorPart.getAdapter(StructuredTextEditor.class);
- } else if(editorPart instanceof StructuredTextEditor) {
- editor = ((StructuredTextEditor)editorPart);
- } else {
- fail("Unable to open structured text editor");
- }
-
- if(editor != null) {
- standardizeLineEndings(editor);
- fFileToEditorMap.put(file, editor);
- } else {
- fail("Could not open editor for " + file);
- }
- } catch (Exception e) {
- fail("Could not open editor for " + file + " exception: " + e.getMessage());
- }
- }
-
- return editor;
- }
-
- /**
- * <p>Line endings can be an issue when running tests on different OSs.
- * This function standardizes the line endings to use <code>\n</code></p>
- *
- * <p>It will get the text from the given editor, change the line endings,
- * and then save the editor</p>
- *
- * @param editor standardize the line endings of the text presented in this
- * editor.
- */
- private static void standardizeLineEndings(StructuredTextEditor editor) {
- IDocument doc = editor.getTextViewer().getDocument();
- String contents = doc.get();
- contents = StringUtils.replace(contents, "\r\n", "\n");
- contents = StringUtils.replace(contents, "\r", "\n");
- doc.set(contents);
- }
-
- /**
- * <p>This inner class is used to do set up and tear down before and
- * after (respectively) all tests in the inclosing class have run.</p>
- */
- private static class TestXMLContentAssistComputersSetup extends TestSetup {
- private static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
- private static String previousWTPAutoTestNonInteractivePropValue = null;
-
- /**
- * Default constructor
- *
- * @param test do setup for the given test
- */
- public TestXMLContentAssistComputersSetup(Test test) {
- super(test);
- }
-
- /**
- * <p>This is run once before all of the tests</p>
- *
- * @see junit.extensions.TestSetup#setUp()
- */
- public void setUp() throws Exception {
- //setup properties
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
- if (noninteractive != null) {
- previousWTPAutoTestNonInteractivePropValue = noninteractive;
- } else {
- previousWTPAutoTestNonInteractivePropValue = "false";
- }
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
-
- //setup project
- fProject = ProjectUtil.createProject(PROJECT_NAME, null, null);
- ProjectUtil.copyBundleEntriesIntoWorkspace(PROJECT_FILES, PROJECT_NAME);
- }
-
- /**
- * <p>This is run once after all of the tests have been run</p>
- *
- * @see junit.extensions.TestSetup#tearDown()
- */
- public void tearDown() throws Exception {
- //close out the editors
- Iterator iter = fFileToEditorMap.values().iterator();
- while(iter.hasNext()) {
- StructuredTextEditor editor = (StructuredTextEditor)iter.next();
- editor.doSave(null);
- editor.close(false);
- }
-
- //remove project
- fProject.delete(true, new NullProgressMonitor());
-
- //restore properties
- if (previousWTPAutoTestNonInteractivePropValue != null) {
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java
deleted file mode 100644
index 3fa89bd..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java
+++ /dev/null
@@ -1,252 +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.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.sse.core.text.IStructuredPartitions;
-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;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.tests.Logger;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationXML extends TestCase {
-
- private StructuredTextViewerConfigurationXML fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationXML() {
- super("TestViewerConfigurationXML");
- }
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- // some test environments might not have a "real" display
- if(Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if(PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationXML();
- }
- 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, IXMLPartitions.XML_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 > 0);
- }
-
- /**
- * 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 > 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 is null", r);
- }
-
- public void testGetTextHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{IStructuredPartitions.DEFAULT_PARTITION, 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.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
deleted file mode 100644
index 3398345..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
+++ /dev/null
@@ -1,500 +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.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.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.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.w3c.dom.Attr;
-
-
-public class ViewerTestXML 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 = "<?xml version=\"1.0\"?>\n<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN\" \"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd\">\n";
- 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 XML";
- }
-
- 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 StructuredTextViewerConfigurationXML();
-
- // 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 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);
- }
- }
- }
- }
-
- /**
- * 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/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 StructuredTextViewerConfigurationXML());
- }
-
- /**
- * 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(ContentTypeIdForXML.ContentTypeID_XML);
- 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 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.xml.ui.tests/test.xml b/tests/org.eclipse.wst.xml.ui.tests/test.xml
deleted file mode 100644
index d928e35..0000000
--- a/tests/org.eclipse.wst.xml.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.xml.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.ui.tests.XMLUITestSuite" />
- <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.ui.tests/testresources/Compare-Schema1-GolfCountryClub-0.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-0.xml
deleted file mode 100644
index 5db150b..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-0.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
- </GolfCourse>
- <Member/>
- <Employee>
- <FirstName></FirstName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
- <Shaft></Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-1.xml
deleted file mode 100644
index 659f45a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse NumberOfHoles="18">
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
- </GolfCourse>
- <Member handicap="0"/>
- <Employee>
- <FirstName></FirstName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
- <Shaft></Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-2.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-2.xml
deleted file mode 100644
index bb12073..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
- </GolfCourse>
- <Member/>
- <Employee>
- <FirstName></FirstName>
- <MiddleName></MiddleName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
- <Shaft></Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-20.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-20.xml
deleted file mode 100644
index 53ea89e..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-20.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
- </GolfCourse>
- <Member>
- <RestrictedMember>
- <FirstName></FirstName>
- <LastName></LastName>
- <MembershipExpiry></MembershipExpiry>
- <LimitedPlay></LimitedPlay>
- </RestrictedMember>
- </Member>
- <Employee>
- <FirstName></FirstName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
- <Shaft></Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-31.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-31.xml
deleted file mode 100644
index 07c2add..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-31.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse NumberOfHoles="18">
- <Name>Name</Name>
- <Yardage>1</Yardage>
- <Par>1</Par>
- <Handicap>0.0</Handicap>
- <Slope>Slope</Slope>
- </GolfCourse>
- <Member handicap="0">
- <RestrictedMember>
- <FirstName>FirstName</FirstName>
- <MiddleName>MiddleName</MiddleName>
- <LastName>LastName</LastName>
- <MembershipExpiry>2001-01-01</MembershipExpiry>
- <LimitedPlay>Weekday Only</LimitedPlay>
- </RestrictedMember>
- </Member>
- <Employee>
- <FirstName>FirstName</FirstName>
- <MiddleName>MiddleName</MiddleName>
- <LastName>LastName</LastName>
- <EmployeeNumber>EmployeeNumber</EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName>ManufacturerName</ManufacturerName>
- <Quantity>1</Quantity>
- <ClubKind>Driver</ClubKind>
- <Loft>Loft</Loft>
- <Shaft>Regular</Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName>ManufacturerName</ManufacturerName>
- <Quantity>1</Quantity>
- <ProductDetails>ProductDetails</ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-8.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-8.xml
deleted file mode 100644
index bf5ddf2..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema1-GolfCountryClub-8.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name>Name</Name>
- <Yardage>1</Yardage>
- <Par>1</Par>
- <Handicap>0.0</Handicap>
- <Slope>Slope</Slope>
- </GolfCourse>
- <Member/>
- <Employee>
- <FirstName>FirstName</FirstName>
- <LastName>LastName</LastName>
- <EmployeeNumber>EmployeeNumber</EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName>ManufacturerName</ManufacturerName>
- <Quantity>1</Quantity>
- <ClubKind>Driver</ClubKind>
- <Loft>Loft</Loft>
- <Shaft>Regular</Shaft>
- </GolfClub>
- <BoxOfBalls>
- <ManufacturerName>ManufacturerName</ManufacturerName>
- <Quantity>1</Quantity>
- <ProductDetails>ProductDetails</ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema2-BillInfo-31.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema2-BillInfo-31.xml
deleted file mode 100644
index bfa2873..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Compare-Schema2-BillInfo-31.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:BillInfo accountType="" ammount="0.0" date="2001-01-01" xmlns:tns="http://www.example.com/PhoneBanking" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.com/PhoneBanking Schema2.xsd ">
- <tns:payee accountCode="" name=""/>
-</tns:BillInfo>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml
deleted file mode 100644
index 4f30bd8..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<multi-root xsi:noNamespaceSchemaLocation="international.xsd" xmlns="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <root>The quick brown fox jumps over the lazy dog</root>
- <뿌리성분>빠른 갈색 여우는 게으른 개에 강하한다</뿌리성분>
- <根元素>这只快棕色狐狸跳过懒惰狗</根元素>
- <root>这只快棕色狐狸跳过懒惰狗</root>
- <뿌리성분>The quick brown fox jumps over the lazy dog</뿌리성분>
- <뿌리성분>The quick brown fox jumps over the lazy dog</뿌리성분>
- <根元素>빠른 갈색 여우는 게으른 개에 강하한다</根元素>
-</multi-root>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd
deleted file mode 100644
index 87d13ca..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xml="http://www.w3.org/XML/1998/namespace">
-
- <!--<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>-->
-
- <xsd:element name="multi-root">
- <xsd:complexType>
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element ref="root" minOccurs="0"/>
- <xsd:element ref="뿌리성분" minOccurs="0"/>
- <xsd:element ref="根元素" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="root" type="prose" />
-
- <xsd:element name="뿌리성분" type="prose"/>
-
- <xsd:element name="根元素" type="prose" />
-
- <xsd:simpleType name="prose">
- <xsd:restriction base="xsd:string">
- <xsd:pattern value="The quick brown fox jumps over the lazy dog"/>
- <xsd:pattern value="这只快棕色狐狸跳过懒惰狗"/>
- <xsd:pattern value="빠른 갈색 여우는 게으른 개에 강하한다"/>
- </xsd:restriction>
- </xsd:simpleType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1.xml
deleted file mode 100644
index 2144d8d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<foo
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="Test1Schema.xsd">
-
- <bar>
- <!-- Test -->
- </bar>
-</foo>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1Schema.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1Schema.xsd
deleted file mode 100644
index bfbe391..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/RemoveAndAddBackCommentEndTag/Test1Schema.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="foo" type="xsdFoo" />
-
-
- <xsd:complexType name="xsdFoo">
- <xsd:sequence>
- <xsd:element name="bar" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema1.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema1.xsd
deleted file mode 100644
index de91138..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema1.xsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/GolfCountryClub" xmlns:tns="http://www.example.org/GolfCountryClub">
-
- <element name="GolfCountryClub">
- <complexType>
- <sequence>
- <element name="GolfCourse" type="tns:GolfCourseType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="Member" maxOccurs="unbounded" minOccurs="1">
- <complexType>
- <choice>
- <element name="RestrictedMember" type="tns:RestrictedMemberType"></element>
- <element name="RegularMember" type="tns:RegularMemberType"></element>
- <element name="ExclusiveMember" type="tns:ExclusiveMemberType">
- <annotation>
- <documentation>Life-time member</documentation>
- </annotation>
- </element>
- </choice>
- <attribute name="handicap" type="nonNegativeInteger"></attribute>
- </complexType>
- </element>
- <element name="Employee" type="tns:EmployeeType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="ProShop">
- <complexType>
- <sequence>
- <element name="GolfClub" type="tns:GolfClubType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="BoxOfBalls" maxOccurs="unbounded" minOccurs="1" type="tns:BoxOfBallsType"></element>
- </sequence>
- </complexType>
- </element>
- </sequence>
- </complexType>
- </element>
-
- <complexType name="RegularMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="MembershipExpiry" type="date"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="GolfClubType">
- <complexContent>
-
- <extension base="tns:GolfManufacturerType">
- <sequence>
- <element name="ClubKind" type="tns:ClubKindType"></element>
- <element name="Loft" type="string"></element>
- <element name="Shaft" type="tns:ShaftType"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="ClubKindType">
- <restriction base="string">
- <enumeration value="Driver"></enumeration>
- <enumeration value="Wood"></enumeration>
- <enumeration value="Iron"></enumeration>
- <enumeration value="Wedge"></enumeration>
- <enumeration value="Putter"></enumeration>
- </restriction>
- </simpleType>
-
- <simpleType name="ShaftType">
- <restriction base="string">
- <enumeration value="Regular"></enumeration>
- <enumeration value="Stiff"></enumeration>
- </restriction>
- </simpleType>
-
- <element name="GolfClub" type="tns:GolfClubType"></element>
-
- <complexType name="PersonType">
- <sequence>
- <element name="FirstName" type="string"></element>
- <element name="MiddleName" type="string" maxOccurs="1" minOccurs="0"></element>
- <element name="LastName" type="string"></element>
- </sequence>
- </complexType>
-
- <complexType name="EmployeeType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="EmployeeNumber" type="string"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="GolfCourseType">
- <sequence>
- <element name="Name" type="string">
- <annotation>
- <documentation>Name of the course</documentation>
- </annotation>
- </element>
- <element name="Yardage" type="positiveInteger"></element>
- <element name="Par" type="positiveInteger"></element>
- <element name="Handicap">
- <simpleType>
- <restriction base="float">
- <minInclusive value="0"></minInclusive>
- </restriction>
- </simpleType>
- </element>
- <element name="Slope" type="string"></element>
- </sequence>
- <attribute name="NumberOfHoles" type="positiveInteger" fixed="18"></attribute>
- </complexType>
-
- <complexType name="GolfManufacturerType">
- <sequence>
- <element name="ManufacturerName" type="string"></element>
- <element name="Quantity" type="positiveInteger"></element>
- </sequence>
- </complexType>
-
- <complexType name="BoxOfBallsType">
- <complexContent>
- <extension base="tns:GolfManufacturerType">
- <sequence>
- <element name="ProductDetails" type="string"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="ExclusiveMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="ValetParkingID" type="positiveInteger"></element>
- <element name="LockerNumber" type="positiveInteger"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="RestrictedMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="MembershipExpiry" type="date"></element>
- <element name="LimitedPlay" type="tns:LimitedPlayType"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="LimitedPlayType">
- <restriction base="string">
- <enumeration value="Weekday Only"></enumeration>
- <enumeration value="Weekend Only"></enumeration>
- <enumeration value="Anytime after twilight"></enumeration>
- </restriction>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema2.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema2.xsd
deleted file mode 100644
index f158398..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Schema2.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/PhoneBanking" xmlns:tns="http://www.example.com/PhoneBanking" elementFormDefault="qualified">
-
- <element name="AccountInfo" type="tns:AccountType"></element>
-
- <element name="Payee" type="tns:Payee"></element>
-
- <element name="PayeeList" type="tns:PayeeList"></element>
-
- <complexType name="PayeeList">
- <sequence>
- <element name="payee" type="tns:Payee" maxOccurs="unbounded" minOccurs="0"></element>
- </sequence>
- </complexType>
-
- <complexType name="Payee">
- <attribute name="name" type="string"></attribute>
- <attribute name="accountCode" type="string"></attribute>
- </complexType>
-
- <element name="AccountSummary" type="string"></element>
-
- <element name="CompletionCode" type="tns:CompletionCode"></element>
-
- <element name="VerificationCode" type="tns:VerificationCode"></element>
-
- <element name="BillInfo" type="tns:BillInfo"></element>
-
- <complexType name="AccountType">
- <attribute name="name" type="string"></attribute>
- <attribute name="accountId" type="string"></attribute>
- </complexType>
-
- <complexType name="VerificationCode">
- <attribute name="completed" type="boolean"></attribute>
- <attribute name="code" type="string"></attribute>
- </complexType>
-
- <complexType name="CompletionCode">
- <attribute name="completed" type="boolean"></attribute>
- </complexType>
-
- <complexType name="BillInfo">
- <sequence>
- <element name="payee" type="tns:Payee"></element>
- </sequence>
- <attribute name="ammount" type="double"></attribute>
- <attribute name="accountType" type="string"></attribute>
- <attribute name="date" type="date"></attribute>
- </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/Schema1.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/Schema1.xsd
deleted file mode 100644
index de91138..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/Schema1.xsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/GolfCountryClub" xmlns:tns="http://www.example.org/GolfCountryClub">
-
- <element name="GolfCountryClub">
- <complexType>
- <sequence>
- <element name="GolfCourse" type="tns:GolfCourseType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="Member" maxOccurs="unbounded" minOccurs="1">
- <complexType>
- <choice>
- <element name="RestrictedMember" type="tns:RestrictedMemberType"></element>
- <element name="RegularMember" type="tns:RegularMemberType"></element>
- <element name="ExclusiveMember" type="tns:ExclusiveMemberType">
- <annotation>
- <documentation>Life-time member</documentation>
- </annotation>
- </element>
- </choice>
- <attribute name="handicap" type="nonNegativeInteger"></attribute>
- </complexType>
- </element>
- <element name="Employee" type="tns:EmployeeType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="ProShop">
- <complexType>
- <sequence>
- <element name="GolfClub" type="tns:GolfClubType" maxOccurs="unbounded" minOccurs="1"></element>
- <element name="BoxOfBalls" maxOccurs="unbounded" minOccurs="1" type="tns:BoxOfBallsType"></element>
- </sequence>
- </complexType>
- </element>
- </sequence>
- </complexType>
- </element>
-
- <complexType name="RegularMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="MembershipExpiry" type="date"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="GolfClubType">
- <complexContent>
-
- <extension base="tns:GolfManufacturerType">
- <sequence>
- <element name="ClubKind" type="tns:ClubKindType"></element>
- <element name="Loft" type="string"></element>
- <element name="Shaft" type="tns:ShaftType"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="ClubKindType">
- <restriction base="string">
- <enumeration value="Driver"></enumeration>
- <enumeration value="Wood"></enumeration>
- <enumeration value="Iron"></enumeration>
- <enumeration value="Wedge"></enumeration>
- <enumeration value="Putter"></enumeration>
- </restriction>
- </simpleType>
-
- <simpleType name="ShaftType">
- <restriction base="string">
- <enumeration value="Regular"></enumeration>
- <enumeration value="Stiff"></enumeration>
- </restriction>
- </simpleType>
-
- <element name="GolfClub" type="tns:GolfClubType"></element>
-
- <complexType name="PersonType">
- <sequence>
- <element name="FirstName" type="string"></element>
- <element name="MiddleName" type="string" maxOccurs="1" minOccurs="0"></element>
- <element name="LastName" type="string"></element>
- </sequence>
- </complexType>
-
- <complexType name="EmployeeType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="EmployeeNumber" type="string"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="GolfCourseType">
- <sequence>
- <element name="Name" type="string">
- <annotation>
- <documentation>Name of the course</documentation>
- </annotation>
- </element>
- <element name="Yardage" type="positiveInteger"></element>
- <element name="Par" type="positiveInteger"></element>
- <element name="Handicap">
- <simpleType>
- <restriction base="float">
- <minInclusive value="0"></minInclusive>
- </restriction>
- </simpleType>
- </element>
- <element name="Slope" type="string"></element>
- </sequence>
- <attribute name="NumberOfHoles" type="positiveInteger" fixed="18"></attribute>
- </complexType>
-
- <complexType name="GolfManufacturerType">
- <sequence>
- <element name="ManufacturerName" type="string"></element>
- <element name="Quantity" type="positiveInteger"></element>
- </sequence>
- </complexType>
-
- <complexType name="BoxOfBallsType">
- <complexContent>
- <extension base="tns:GolfManufacturerType">
- <sequence>
- <element name="ProductDetails" type="string"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="ExclusiveMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="ValetParkingID" type="positiveInteger"></element>
- <element name="LockerNumber" type="positiveInteger"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="RestrictedMemberType">
- <complexContent>
- <extension base="tns:PersonType">
- <sequence>
- <element name="MembershipExpiry" type="date"></element>
- <element name="LimitedPlay" type="tns:LimitedPlayType"></element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="LimitedPlayType">
- <restriction base="string">
- <enumeration value="Weekday Only"></enumeration>
- <enumeration value="Weekend Only"></enumeration>
- <enumeration value="Anytime after twilight"></enumeration>
- </restriction>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/test1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/test1.xml
deleted file mode 100644
index 6f6f580..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/contentassist/test1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
-
- </GolfCourse>
- <Member >
-
- </Member>
- <Employee >
- <FirstName></FirstName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
-
- </GolfClub>
- <BoxOfBalls >
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingCommentTest.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingCommentTest.xml
deleted file mode 100644
index 65c5ab7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingCommentTest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <foo1></foo1>
-
- <!-- My Awesome comment!!!! -->
-
- <foo2>
- <bar1></bar1>
- <bar2 one="1"
- two="2"
- three="3">
-
- </bar2>
-
- <bar3>
-
- <!--
-
-
- My Awesome comment!!!!
-
-
-
- -->
-
- </bar3>
-
- </foo2>
-
- <!--
- My Awesome comment!!!!
- -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest1.xml
deleted file mode 100644
index a58a31d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <foo1></foo1>
- <foo2>
- <bar1></bar1>
- <bar2 one="1"
- two="2"
- three="3">
-
- </bar2>
-
- <bar3>
- </bar3>
-
- </foo2>
-
- <!--
- My Awesome comment!!!!
- -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest2.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest2.xml
deleted file mode 100644
index a58a31d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XMLFoldingTest2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <foo1></foo1>
- <foo2>
- <bar1></bar1>
- <bar2 one="1"
- two="2"
- three="3">
-
- </bar2>
-
- <bar3>
- </bar3>
-
- </foo2>
-
- <!--
- My Awesome comment!!!!
- -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XSLFoldingTest1.xsl b/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XSLFoldingTest1.xsl
deleted file mode 100644
index 92d4bdf..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/folding/XSLFoldingTest1.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
- <!--
- TODO: Auto-generated template
- -->
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml
deleted file mode 100644
index 329638a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/spellcheck/spellcheck_comment_element.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <!--$foo bar baz -->
-
- <!-- Spell check me: foo baz -->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml
deleted file mode 100644
index c895cfc..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/xmlContentAssist-test1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:GolfCountryClub xmlns:tns="http://www.example.org/GolfCountryClub" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/GolfCountryClub Schema1.xsd ">
- <GolfCourse>
- <Name></Name>
- <Yardage></Yardage>
- <Par></Par>
- <Handicap></Handicap>
- <Slope></Slope>
-
- </GolfCourse>
- <Member >
-
- </Member>
- <Employee >
- <FirstName></FirstName>
- <LastName></LastName>
- <EmployeeNumber></EmployeeNumber>
- </Employee>
- <ProShop>
- <GolfClub>
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ClubKind></ClubKind>
- <Loft></Loft>
-
- </GolfClub>
- <BoxOfBalls >
- <ManufacturerName></ManufacturerName>
- <Quantity></Quantity>
- <ProductDetails></ProductDetails>
- </BoxOfBalls>
- </ProShop>
-</tns:GolfCountryClub>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.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 51b8ee4..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.500.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.2,
- 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 5ccd6cd..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import 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("XML Validation Test Suite");
- 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);
- addTestSuite(XIncludeTest.class);
- addTestSuite(HonourAllSchemaLocationsTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/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/HonourAllSchemaLocationsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
deleted file mode 100644
index 29e6b8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the "honour all schema locations" feature.
- */
-public class HonourAllSchemaLocationsTest extends BaseTestCase
-{
- public void testHonoursAllSchemaLocations()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- public void testCanTurnOffHonourAllSchemaLocations()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- keys.add(null);
- keys.add("cvc-complex-type.2.4.d"); //$NON-NLS-1$
- int numErrors = 2;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- private String getTestFile()
- {
- return FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/HonourAllSchemaLocations/A-instance.xml"; //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/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/XIncludeTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
deleted file mode 100644
index 719ab54..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the XInclude feature.
- */
-public class XIncludeTest extends BaseTestCase
-{
- public void testSupportsXInclude()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, true);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- public void testCanTurnOffXInclude()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, false);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- keys.add("cvc-complex-type.2.4.a");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- private String getTestFile()
- {
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/XInclude/master.xml";
- return testfile;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/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/HonourAllSchemaLocations/A-instance.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
deleted file mode 100644
index 8aa7395..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nsA:A xmlns:nsA="urn:nsA" xmlns:p="urn:nsB" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:nsA A.xsd ">
- <p:B1>p:B1</p:B1>
- <p:B2>p:B2</p:B2>
-</nsA:A>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
deleted file mode 100644
index 0a43e77..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsA" elementFormDefault="qualified"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:nsB="urn:nsB" xmlns:nsA="urn:nsA">
-
- <import namespace="urn:nsB" schemaLocation="B1.xsd"/>
- <import namespace="urn:nsB" schemaLocation="B2.xsd"/>
- <element name="A">
- <complexType>
- <sequence>
- <element ref="nsB:B1"></element>
- <element ref="nsB:B2"></element>
- </sequence>
- </complexType>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
deleted file mode 100644
index 68a85a4..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="B1" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
deleted file mode 100644
index c4ece00..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="B2" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/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/XInclude/body.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
deleted file mode 100644
index 4c85730..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="master.xsd"/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
deleted file mode 100644
index 7fbae72..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<master xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="master.xsd">
- <!-- <body/> -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="body.xml"/>
-</master>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
deleted file mode 100644
index 034f57a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="master">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="body" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="body"/>
-</xs:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.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 17530cb..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.201.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.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 26df813..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
- xsdcoretests.jar,\
- plugin.properties,\
- about.html,\
- testresources/,\
- test.xml
-source.xsdcoretests.jar = src/
-output.xsdcoretests.jar = bin/
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 12b77b5..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,436 +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.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.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.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);
-
- }
-
- public void testForBug176420() {
- // Obtain the model from /testresources/samples/testSchemaForBug176420.xsd
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/testSchemaForBug176420.xsd");
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- // Obtain the enumerated values of the root element
- CMNode cmNode = document.getElements().item(0);
- String[] enumeratedValues = ((CMElementDeclaration)cmNode).getDataType().getEnumeratedValues();
-
- // Verify that all 12 enumerated values are included
- assertEquals(12, enumeratedValues.length);
- }
-
- private void testLocalAttrDocumentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("localAttr");
- assertNotNull("Missing localAttr attribute.");
-
- 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());
- }
-
-
-}
\ 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/testSchemaForBug176420.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
deleted file mode 100644
index 4bcaf57..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/testSchemaForBug176420"
- xmlns:tns="http://www.example.org/testSchemaForBug176420"
- elementFormDefault="qualified">
- <simpleType name="numbersType">
- <restriction base="string">
- <enumeration value="1"/>
- <enumeration value="2"/>
- <enumeration value="3"/>
- <enumeration value="4"/>
- </restriction>
- </simpleType>
- <simpleType name="lettersType">
- <restriction base="string">
- <enumeration value="a"/>
- <enumeration value="b"/>
- <enumeration value="c"/>
- <enumeration value="d"/>
- </restriction>
- </simpleType>
- <simpleType name="unionType">
- <union memberTypes="tns:lettersType tns:numbersType tns:union2Type" />
- </simpleType>
- <element name="element" type="tns:unionType"></element>
- <simpleType name="numbers2Type">
- <restriction base="string">
- <enumeration value="4"/>
- <enumeration value="5"/>
- <enumeration value="6"/>
- </restriction>
- </simpleType>
- <simpleType name="letters2Type">
- <restriction base="string">
- <enumeration value="d"/>
- <enumeration value="e"/>
- <enumeration value="f"/>
- </restriction>
- </simpleType>
- <simpleType name="union2Type">
- <union memberTypes="tns:letters2Type tns:numbers2Type"/></simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.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 30faa1c..0000000
--- a/tests/org.eclipse.wst.xsd.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.xsd.validation.tests
-Bundle-Version: 1.0.501.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",
- 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
-Bundle-ActivationPolicy: lazy
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 c6cfeaf..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ /dev/null
@@ -1,17 +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/
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 de3ac3b..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 in the Problems View 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 30aec09..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 in the Problems View 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 dc1a38f..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 in the Problems View 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 b4e4a0e..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 in the Problems View 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 b41e209..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 in the Problems View 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 e59820e..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 in the Problems View 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 d669e7d..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 in the Problems View 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 6990fde..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 in the Problems View 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 fd4c414..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 in the Problems View 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 4461175..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 in the Problems View 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 1657405..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 in the Problems View 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 fef8319..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 in the Problems View 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 d9584c8..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 in the Problems View 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 361d757..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 in the Problems View 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 884d8a5..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 in the Problems View 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 0adf522..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 in the Problems View 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 7f89ee8..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 in the Problems View 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 93a75e0..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 in the Problems View 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 1200096..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 in the Problems View 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 8d185d6..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 in the Problems View 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 e0b0559..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 in the Problems View 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>
