This commit was manufactured by cvs2svn to create tag 'v200907151830'.
diff --git a/features/org.eclipse.wst.common_tests.feature/.cvsignore b/features/org.eclipse.wst.common_tests.feature/.cvsignore
deleted file mode 100644
index e304b65..0000000
--- a/features/org.eclipse.wst.common_tests.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.common_tests.feature_1.0.0.bin.dist.zip
-org.eclipse.wst.common_tests.feature_1.0.1.200602150104.bin.dist.zip
diff --git a/features/org.eclipse.wst.common_tests.feature/.project b/features/org.eclipse.wst.common_tests.feature/.project
deleted file mode 100644
index 6069a82..0000000
--- a/features/org.eclipse.wst.common_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common_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.common_tests.feature/build.properties b/features/org.eclipse.wst.common_tests.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.common_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.common_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.common_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_tests.feature/epl-v10.html b/features/org.eclipse.wst.common_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.common_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.common_tests.feature/feature.properties b/features/org.eclipse.wst.common_tests.feature/feature.properties
deleted file mode 100644
index a09aa74..0000000
--- a/features/org.eclipse.wst.common_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Common Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST common tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.common_tests.feature/feature.xml b/features/org.eclipse.wst.common_tests.feature/feature.xml
deleted file mode 100644
index 8350a93..0000000
--- a/features/org.eclipse.wst.common_tests.feature/feature.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_tests.feature"
- label="%featureName"
- version="3.1.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.common.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.tests.collector"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.tests.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.snippets.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.internet.cache.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.project.facet.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.project.facet.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.tests.validation"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.common.tests.validation.guard"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_tests.feature/license.html b/features/org.eclipse.wst.common_tests.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.common_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.wst.common.tests.collector/.classpath b/tests/org.eclipse.wst.common.tests.collector/.classpath
deleted file mode 100644
index 4a382ec..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="collector"/>
- <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.common.tests.collector/.cvsignore b/tests/org.eclipse.wst.common.tests.collector/.cvsignore
deleted file mode 100644
index 4d7b745..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-javaCompiler.runtime_collector.jar.args
diff --git a/tests/org.eclipse.wst.common.tests.collector/.project b/tests/org.eclipse.wst.common.tests.collector/.project
deleted file mode 100644
index 7441769..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.collector</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.common.tests.collector/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.common.tests.collector/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 542da41..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Jun 03 02:20:21 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-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.common.tests.collector/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a4d0dc..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %org.eclipse.wst.common.tests.collector
-Bundle-SymbolicName: org.eclipse.wst.common.tests.collector; singleton:=true
-Bundle-Version: 1.1.0
-Bundle-ClassPath: runtime/collector.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="[3.8.2,4.0.0)",
- org.eclipse.ui,
- org.eclipse.core.runtime.compatibility
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.common.tests.collector/about.html b/tests/org.eclipse.wst.common.tests.collector/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.common.tests.collector/build.properties b/tests/org.eclipse.wst.common.tests.collector/build.properties
deleted file mode 100644
index e6b007b..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
- runtime/collector.jar,\
- about.html,\
- META-INF/,\
- plugin.properties
-source.runtime/collector.jar = collector/
-output.runtime/collector.jar = bin/
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
deleted file mode 100644
index b43f8ec..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SuiteHelper {
-
- private Hashtable allTests = new Hashtable();
-
- public SuiteHelper(TestSuite suite) {
- addTest(suite);
- }
-
- private void addTest(Test test) {
- if (test instanceof TestSuite) {
- Enumeration tests = ((TestSuite) test).tests();
- while (tests.hasMoreElements()) {
- Test t = (Test) tests.nextElement();
- allTests.put(t.toString(), t);
- }
- return;
- }
- allTests.put(test.toString(), test);
- }
-
- public String[] getAllTests() {
- ArrayList testList = new ArrayList();
- Enumeration enumeration = allTests.keys();
- while (enumeration.hasMoreElements()) {
- testList.add(enumeration.nextElement());
- }
- Collections.sort(testList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- String[] strArray = new String[testList.size()];
- for (int i = 0; i < strArray.length; i++) {
- strArray[i] = (String) testList.get(i);
- }
-
- return strArray;
- }
-
- public TestSuite buildSuite(String[] completeTests, String[] partialTests) {
- TestSuite suite = new TestSuite();
- for (int i = 0; i < completeTests.length; i++) {
- suite.addTest((Test) allTests.get(completeTests[i]));
- }
- for (int i = 0; i < partialTests.length; i++) {
- suite.addTest(getTest(partialTests[i]));
- }
- return suite;
- }
-
- public String[] getTestMethods(String testName) {
- ArrayList methodList = new ArrayList();
- Test test = (Test) allTests.get(testName);
- if (test instanceof TestSuite) {
- Enumeration testsEnum = ((TestSuite) test).tests();
- while (testsEnum.hasMoreElements()) {
- Test t = (Test) testsEnum.nextElement();
- methodList.add(t.toString());
- }
- }
-
- Collections.sort(methodList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- String[] strArray = new String[methodList.size()];
- for (int i = 0; i < strArray.length; i++) {
- strArray[i] = (String) methodList.get(i);
- }
-
- return strArray;
- }
-
- private Test getSubTest(TestSuite suite, String testName) {
- if (null != suite) {
- Enumeration tests = suite.tests();
- while (tests.hasMoreElements()) {
- Test t = (Test) tests.nextElement();
- if (t.toString().equals(testName)) {
- return t;
- }
- }
- }
- return null;
- }
-
- /**
- * Returns a TestSuite to run
- */
- private Test getTest(String testName) {
- int firstIndex = testName.indexOf("."); //$NON-NLS-1$
- String suiteName = testName.substring(0, firstIndex);
- String subTestName = testName.substring(firstIndex + 1);
-
- //check the obvious suite first
- TestSuite suite = (TestSuite) allTests.get(suiteName);
- Test test = getSubTest(suite, subTestName);
- if (test != null) {
- return test;
- }
- //otherwise check all suites
- Enumeration keys = allTests.keys();
- while (keys.hasMoreElements()) {
- String key = (String) keys.nextElement();
- if (testName.startsWith(key)) {
- suite = (TestSuite) allTests.get(key);
- subTestName = testName.substring(key.length() + 1);
- test = getSubTest(suite, subTestName);
- if (test != null) {
- return test;
- }
- }
- }
-
- return null;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
deleted file mode 100644
index 3bab38e..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SuiteTestRunner extends TestRunner {
-
- private TestSuite suite;
-
- /**
- * PluginTestRunner constructor comment.
- */
- public SuiteTestRunner(TestSuite suiteToRun) {
- super();
- suite = suiteToRun;
- }
-
- /**
- * Only return the specified suite
- */
- public Test getTest(String suiteClassName) {
- return suite;
- }
-
- /**
- * called by the gui
- */
- public void launch() {
- start();
- }
-
- public void start() {
- String name = "dynamic test"; //$NON-NLS-1$
- fFrame = createUI(name);
- fFrame.pack();
- fFrame.setVisible(true);
- setSuite(name);
- runSuite();
- }
-
- /*
- * @see TestRunner#terminate()
- */
- public void terminate() {
- fFrame.dispose();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
deleted file mode 100644
index 2b2bd28..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestCollectorActionDelegate implements IWorkbenchWindowActionDelegate {
-
- /**
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() {
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) {
- }
-
- /**
- * @see org.eclipse.ui.IActionDelegate#run(IAction)
- */
- public void run(IAction action) {
- Shell shell = new Shell();
- GridLayout gridLayout = new GridLayout();
- shell.setLayout(gridLayout);
- shell.setText("Test Collector"); //$NON-NLS-1$
- TestCollectorGUI testCollectorGUI = new TestCollectorGUI(shell, SWT.NULL);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- testCollectorGUI.setLayoutData(gridData);
-
- shell.setSize(500, 500);
- shell.open();
- }
-
-
- /**
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
deleted file mode 100644
index 606252f..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Created on Mar 6, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.tests.collector;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class TestCollectorGUI extends Composite implements ModifyListener {
-
- private static final String PLUGIN_ID = "org.eclipse.wst.common.tests.collector"; //$NON-NLS-1$
- private static final String SUITES_EXT_PT = "suites"; //$NON-NLS-1$
-// private static final String NAME = "name"; //$NON-NLS-1$
-// private static final String CLASS = "class"; //$NON-NLS-1$
-
- private Composite innerPanes = null;
- private Combo combo = null;
-
- private Hashtable testSuites = new Hashtable();
-
- /**
- * @param parent
- * @param style
- */
- public TestCollectorGUI(Composite parent, int style) {
- super(parent, style);
-
- loadConfiguration();
-
- createPartControl();
- }
-
- private void loadConfiguration() {
- IExtensionPoint suiteExtPt = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, SUITES_EXT_PT);
- IExtension[] suitesExtensions = suiteExtPt.getExtensions();
-
- for (int i = 0; i < suitesExtensions.length; i++) {
- IExtension extension = suitesExtensions[i];
- IConfigurationElement[] tests = extension.getConfigurationElements();
- for (int j = 0; j < tests.length; j++) {
- try {
- IConfigurationElement element = tests[j];
- String suiteName = element.getAttribute("name"); //$NON-NLS-1$
- testSuites.put(suiteName, element);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- public void createPartControl() {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- setLayout(gridLayout);
-
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 1;
-
- combo = new Combo(this, SWT.READ_ONLY);
- Enumeration keys = testSuites.keys();
- ArrayList arrayList = new ArrayList();
- while (keys.hasMoreElements()) {
- arrayList.add(keys.nextElement());
- }
-
- Collections.sort(arrayList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- for (int i = 0; i < arrayList.size(); i++) {
- combo.add((String) arrayList.get(i));
- }
- combo.setLayoutData(gridData);
- combo.addModifyListener(this);
- if (combo.getItemCount() > 0) {
- combo.select(0);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (e.getSource() == combo) {
- updateCombo(e);
- }
- }
-
- private void updateCombo(ModifyEvent e) {
- if (null != innerPanes) {
- innerPanes.dispose();
- }
- try {
- String testName = combo.getText();
- IConfigurationElement element = (IConfigurationElement) testSuites.get(testName);
- TestSuite suite = (TestSuite) element.createExecutableExtension("class"); //$NON-NLS-1$
- innerPanes = new TestCollectorInnerPanes(this, SWT.NULL, new SuiteHelper(suite));
- } catch (Exception ex) {
- innerPanes = new Composite(this, SWT.NULL);
- innerPanes.setLayout(new GridLayout());
- innerPanes.setBackground(getBackground());
- Label errorLabel = new Label(innerPanes, SWT.NONE);
- errorLabel.setText(ex.getMessage());
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- errorLabel.setLayoutData(gridData);
- }
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- innerPanes.setLayoutData(gridData);
- layout();
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
deleted file mode 100644
index f62d96b..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestCollectorInnerPanes extends Composite {
-
- private Table testClassTable;
- private Table testMethodTable;
-
- private Button launchTestButton;
-
- private SuiteHelper pluginTestLoader;
-
- private HashSet partialSetHash = new HashSet();
- private Hashtable shortToFullHashtable = new Hashtable();
- private Hashtable fullToShortHashtable = new Hashtable();
-
- public TestCollectorInnerPanes(Composite parent, int style, SuiteHelper loader) {
- super(parent, style);
- pluginTestLoader = loader;
- createPartControl();
- }
-
- public void createPartControl() {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginWidth = 0;
- gridLayout.marginHeight = 0;
- setLayout(gridLayout);
- GridData gridData = null;
-
- Group tableGroup = new Group(this, SWT.NULL);
- GridLayout tableGroupLayout = new GridLayout();
- tableGroupLayout.makeColumnsEqualWidth = true;
- tableGroupLayout.numColumns = 1;
- tableGroupLayout.marginWidth = 0;
- tableGroupLayout.marginHeight = 0;
- tableGroup.setLayout(tableGroupLayout);
- tableGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- SashForm splitView = new SashForm(tableGroup, SWT.HORIZONTAL);
- splitView.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-
- gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 2;
- splitView.setLayoutData(gridData);
-
- Composite leftComposite = new Composite(splitView, SWT.NONE);
- GridLayout leftLayout = new GridLayout();
- leftLayout.numColumns = 1;
- leftComposite.setLayout(leftLayout);
- Label label2 = new Label(leftComposite, SWT.NULL);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- label2.setLayoutData(gridData);
- label2.setText("Test Suites"); //$NON-NLS-1$
-
- Composite rightComposite = new Composite(splitView, SWT.NONE);
- GridLayout rightLayout = new GridLayout();
- rightLayout.numColumns = 1;
- rightComposite.setLayout(rightLayout);
- Label label3 = new Label(rightComposite, SWT.NULL);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- label3.setLayoutData(gridData);
- label3.setText("Tests"); //$NON-NLS-1$
-
- testClassTable = new Table(leftComposite, SWT.CHECK);
- testClassTable.setBackground(getBackground());
- gridData = new GridData(GridData.FILL_BOTH);
- testClassTable.setLayoutData(gridData);
- String[] allTests = pluginTestLoader.getAllTests();
- for (int i = 0; i < allTests.length; i++) {
- TableItem tableItem = new TableItem(testClassTable, SWT.NULL);
- tableItem.setText(allTests[i]);
- }
- testClassTable.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- TableItem item = (TableItem) e.item;
- String testName = item.getText();
- updateMethodTable(testName, pluginTestLoader.getTestMethods(testName));
- testClassTable.setSelection(new TableItem[] { item });
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- });
-
- Label label = new Label(leftComposite, SWT.SEPARATOR | SWT.HORIZONTAL);
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- final Button selectAllCheckbox = new Button(leftComposite, SWT.CHECK);
- selectAllCheckbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- selectAllCheckbox.setText("Select All"); //$NON-NLS-1$
- selectAllCheckbox.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- boolean checked = selectAllCheckbox.getSelection();
- TableItem [] items = testClassTable.getItems();
- for(int i=0;i<items.length; i++){
- items[i].setChecked(checked);
- }
- }
- });
-
- testMethodTable = new Table(rightComposite, SWT.CHECK);
- testMethodTable.setBackground(getBackground());
- gridData = new GridData(GridData.FILL_BOTH);
- testMethodTable.setLayoutData(gridData);
-
- launchTestButton = new Button(this, SWT.PUSH);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalAlignment = GridData.CENTER;
- gridData.horizontalSpan = 2;
- launchTestButton.setLayoutData(gridData);
- launchTestButton.setText("Run Tests"); //$NON-NLS-1$
- launchTestButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- SuiteTestRunner runner = new SuiteTestRunner(buildSuite());
- runner.launch();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- private void storeMethodsTable() {
- TableItem[] items = testMethodTable.getItems();
- for (int i = 0; null != items && i < items.length; i++) {
- String partialTestName = (String)shortToFullHashtable.get(items[i].getText());
- if (items[i].getChecked() && !partialSetHash.contains(partialTestName)) {
- partialSetHash.add(partialTestName);
- } else if (!items[i].getChecked() && partialSetHash.contains(partialTestName)) {
- partialSetHash.remove(partialTestName);
- }
- }
- }
-
- private void updateMethodTable(String testName, String[] methodArray) {
- storeMethodsTable();
- testMethodTable.removeAll();
- shortToFullHashtable.clear();
- fullToShortHashtable.clear();
-
- for (int i = 0; null != methodArray && i < methodArray.length; i++) {
- String partialTestName = testName + "." + methodArray[i]; //$NON-NLS-1$
- int endIndex = methodArray[i].indexOf('(');
- String methodName = endIndex > 0 ? methodArray[i].substring(0, endIndex) : methodArray[i];
- shortToFullHashtable.put(methodName, partialTestName);
- fullToShortHashtable.put(partialTestName, methodName);
- TableItem tableItem = new TableItem(testMethodTable, SWT.NULL);
- tableItem.setText(methodName);
- tableItem.setChecked(partialSetHash.contains(partialTestName));
- }
-
- }
-
- private TestSuite buildSuite() {
- ArrayList completeTests = new ArrayList();
- TableItem[] items = testClassTable.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i].getChecked()) {
- completeTests.add(items[i].getText());
- }
- }
-
- String[] completeArray = new String[completeTests.size()];
- for (int i = 0; i < completeArray.length; i++) {
- completeArray[i] = (String) completeTests.get(i);
- }
-
- ArrayList partialTests = new ArrayList();
- storeMethodsTable();
- Iterator iterator = partialSetHash.iterator();
- while (iterator.hasNext()) {
- partialTests.add(iterator.next());
- }
-
- String[] partialArray = new String[partialTests.size()];
- for (int i = 0; i < partialArray.length; i++) {
- partialArray[i] = (String) partialTests.get(i);
- }
-
- return pluginTestLoader.buildSuite(completeArray, partialArray);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.properties b/tests/org.eclipse.wst.common.tests.collector/plugin.properties
deleted file mode 100644
index 144de79..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-org.eclipse.wst.common.tests.collector=org.eclipse.wst.common.tests.collector
-suites=suites
-Test_Collector=Test Collector
-WTP_Tests=WTP Tests
-Open=Open
-Test_Collector=Test Collector
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.xml b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
deleted file mode 100644
index 28986ff..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="suites" name="%suites" schema="schema/suites.exsd"/>
-
-
-
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%Test_Collector"
- visible="true"
- id="testCollector">
- <menu
- label="%WTP_Tests"
- path="additions"
- id="org.eclipse.wst.common.tests.collector.testsMenu">
- <separator
- name="group1">
- </separator>
- </menu>
- <action
- label="%Open"
- tooltip="%Test_Collector"
- class="org.eclipse.wst.common.tests.collector.TestCollectorActionDelegate"
- menubarPath="org.eclipse.wst.common.tests.collector.testsMenu/group1"
- id="org.eclipse.wst.common.tests.collector.testsAction">
- </action>
- </actionSet>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd b/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
deleted file mode 100644
index dfec3c5..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.tests.collector">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.tests.collector" id="suites" name="suites"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="suite"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="suite">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/.classpath b/tests/org.eclipse.wst.common.tests.validation.guard/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/.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.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/.project b/tests/org.eclipse.wst.common.tests.validation.guard/.project
deleted file mode 100644
index 0e255c9..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.validation.guard</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.common.tests.validation.guard/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.common.tests.validation.guard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 73e4b8d..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Mar 29 07:53:31 EDT 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.common.tests.validation.guard/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d5fefe..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.common.tests.validation.guard;singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.wst.common.tests.validation.guard.Activator
-Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.validation;bundle-version="[1.1.103,1.3.0)",
- org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/build.properties b/tests/org.eclipse.wst.common.tests.validation.guard/build.properties
deleted file mode 100644
index 30b2fc4..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/plugin.properties b/tests/org.eclipse.wst.common.tests.validation.guard/plugin.properties
deleted file mode 100644
index 0b223e4..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-Name.0 = Validation Framework Guard Test cases
-Bundle-Vendor.0 = Eclipse.org
-
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/plugin.xml b/tests/org.eclipse.wst.common.tests.validation.guard/plugin.xml
deleted file mode 100644
index 84daa2b..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="T3A" name="T3A">
- <validator
- build="false"
- class="org.eclipse.wst.common.tests.validation.guard.T3A"
- manual="false">
- </validator>
- </extension>
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="T3B" name="T3B">
- <validator class="org.eclipse.wst.common.tests.validation.guard.T3B">
- <include>
- <rules>
- <facet
- id="a.bogus.facet">
- </facet>
- </rules>
- </include>
- </validator>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/Activator.java b/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/Activator.java
deleted file mode 100644
index e512afe..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.wst.common.tests.validation.guard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The purpose of this plug-in is to ensure that it never gets loaded. If it does it means that we are
- * activating validators too early.
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.common.tests.validation.guard";
-
- // The shared instance
- private static Activator plugin;
-
- public Activator() {
- RuntimeException re = new RuntimeException("This plug-in should never be loaded. If it is it means that we are loading " +
- "validators too early, and causing unneccessary plug-in activation.");
- handleException(re);
- }
-
- /*
- * (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;
- }
-
- /**
- * Write this exception to the log.
- * <p>
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param e the throwable, this can be null in which case it is a nop.
- */
- public void handleException(Throwable e){
- if (e == null)return;
- Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3A.java b/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3A.java
deleted file mode 100644
index 7146182..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3A.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.wst.common.tests.validation.guard;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A test validator that we never expect to be activated. The reason we never expect it to be validated is that by
- * default it is turned off. The user can still explicitly turn it on, in which case it will run, and that would not
- * be considered an error.
- * @author karasiuk
- *
- */
-public class T3A extends AbstractValidator {
-
- private boolean _invoked;
-
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- if (!_invoked){
- _invoked = true;
- throw new RuntimeException("The T3A validator should never be activated or called. If this validator was manually turned on " +
- "though the preferences, then this is not a real error.");
- }
-
- return null;
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3B.java b/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3B.java
deleted file mode 100644
index bb649ae..0000000
--- a/tests/org.eclipse.wst.common.tests.validation.guard/src/org/eclipse/wst/common/tests/validation/guard/T3B.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.common.tests.validation.guard;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A test validator that we never expect to be activated. The reason we never expect it to be validated is that it has a bogus facet filter.
- * @author karasiuk
- *
- */
-public class T3B extends AbstractValidator {
-
- private boolean _invoked;
-
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- if (!_invoked){
- _invoked = true;
- throw new RuntimeException("The T3B validator should never be activated or called. If this validator was manually chnaged " +
- "though the preferences, and the bogus filter was removed, then this isn't a real error.");
- }
-
- return null;
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/.classpath b/tests/org.eclipse.wst.common.tests.validation/.classpath
deleted file mode 100644
index 389f521..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="validators"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.validation/.project b/tests/org.eclipse.wst.common.tests.validation/.project
deleted file mode 100644
index e05c75d..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.validation</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.common.tests.validation/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.common.tests.validation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7952069..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 20 07:23:01 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-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.common.tests.validation/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.common.tests.validation/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3982d6b..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun Apr 20 07:23:01 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/tests/org.eclipse.wst.common.tests.validation/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index 92b2768..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.common.tests.validation;singleton:=true
-Bundle-Version: 1.0.103.qualifier
-Bundle-Activator: org.eclipse.wst.common.tests.validation.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.validation,
- org.junit;bundle-version="[3.8.2,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation.tests.testcase
diff --git a/tests/org.eclipse.wst.common.tests.validation/about.html b/tests/org.eclipse.wst.common.tests.validation/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.common.tests.validation/build.properties b/tests/org.eclipse.wst.common.tests.validation/build.properties
deleted file mode 100644
index 077a48c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/,\
- validators/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- test.xml,\
- about.html
diff --git a/tests/org.eclipse.wst.common.tests.validation/plugin.properties b/tests/org.eclipse.wst.common.tests.validation/plugin.properties
deleted file mode 100644
index 86e98e1..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-Name.0 = Validation Framework Test cases
-Bundle-Vendor.0 = Eclipse.org
-
-Test1.Validator.Name=Test1 Validator
-Test2.Validator.Name=Test2 Validator
-Test3.Validator.Name=Test3 Validator
-Test4.Validator.Name=Test4 Validator
-Test5.Validator.Name=Test5 Validator
-Test5D.Validator.Name=Test5D Validator
-Test6.Validator.Name=Test6 Validator
-Test7.Validator.Name=Test7 Validator
-
-Message.bad=Really bad things
-Message.sortof=Sort of bad things
-Message.nice=Nice things
-Message.long=A line that is a bit long, just to see how it looks
diff --git a/tests/org.eclipse.wst.common.tests.validation/plugin.xml b/tests/org.eclipse.wst.common.tests.validation/plugin.xml
deleted file mode 100644
index 5a5c189..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/plugin.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="Test1" name="%Test1.Validator.Name">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="test1">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="Test2" name="%Test2.Validator.Name">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator2"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="jsp">
- </fileext>
- <file name="somefile.txt" type="file"/>
- <fileext
- ext="jspx">
- </fileext>
- <fileext
- ext="java">
- </fileext>
- <fileext
- ext="test2">
- </fileext>
- </rules>
- </include>
- <include>
- <rules>
- <projectNature id="org.eclipse.sample" />
- <facet id="com.ibm.vf.test.facet2"/>
- </rules>
- </include>
- <include>
- <rules>
- <contentType
- id="com.ibm.vf.test.contentType2">
- </contentType>
- </rules>
- </include>
- <exclude>
- <rules>
- <facet
- id="org.eclipse.wst.wid.facet">
- </facet>
- </rules>
- </exclude>
- <messageCategory id="bad" label="%Message.bad" severity="error"/>
- <messageCategory id="sortof" label="%Message.sortof" severity="warning"/>
- <messageCategory id="nice" label="%Message.nice" severity="ignore"/>
- <messageCategory id="long" label="%Message.long" severity="ignore"/>
-
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="Test3" name="%Test3.Validator.Name">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator3"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="html">
- </fileext>
- <fileext
- ext="htm">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="Test4" name="%Test4.Validator.Name">
- <validator build="false"
- class="org.eclipse.wst.validation.tests.TestValidator4"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="test4">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension id="Test5" name="%Test5.Validator.Name" point="org.eclipse.wst.validation.validatorV2">
- <validator build="false" class="org.eclipse.wst.validation.tests.TestValidator5" manual="false">
- <include>
- <rules>
- <fileext
- ext="test5">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorDelegates">
- <delegate
- class="org.eclipse.wst.validation.tests.TestValidator5D"
- name="%Test5D.Validator.Name"
- target="org.eclipse.wst.validation.tests.TestValidator5">
- </delegate>
- </extension>
- <extension
- id="Test6"
- name="%Test6.Validator.Name"
- point="org.eclipse.wst.validation.validatorV2">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator6"
- manual="false">
- <include>
- <rules>
- <contentType id="org.eclipse.core.runtime.xml"></contentType>
- <contentType id="org.eclipse.wst.xml.core.xmlsource"></contentType>
- <contentType id="org.eclipse.wst.xml.core.xslsource"></contentType>
- <contentType id="org.eclipse.jst.jsp.core.tldsource"></contentType>
- </rules>
- </include>
- <exclude>
- <rules>
- <file
- caseSensitive="true"
- name=".project"
- type="file">
- </file>
- </rules>
- </exclude>
- </validator>
- </extension>
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="Test7" name="%Test7.Validator.Name">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator7"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="test1">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="Test8" name="Test8">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.TestValidator8"
- manual="false">
- <include>
- <rules>
- <file name="file.specific" type="file"/>
- <file name="source/full.specific" type="full"/>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="T1A" name="T1A Validator">
- <validator
- build="false"
- class="org.eclipse.wst.validation.tests.T1AValidator"
- manual="false">
- <include>
- <rules>
- <fileext
- ext="test1">
- </fileext>
- </rules>
- </include>
- <group
- id="org.eclipse.wst.common.tests.validation.t1group">
- </group>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T1B" name="T1B Validator">
- <validator build="false" class="org.eclipse.wst.validation.tests.T1B"
- markerId="org.eclipse.wst.common.tests.validation.t1bmarker">
- <include>
- <rules>
- <fileext
- ext="t1b">
- </fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T1C" name="T1C">
- <validator build="false" class="org.eclipse.wst.validation.tests.T1C" manual="false">
- <include>
- <rules>
- <fileext
- ext="t1c">
- </fileext>
- </rules>
- </include>
- <exclude>
- <rules>
- <file
- caseSensitive="false"
- name="ignore"
- type="folder">
- </file>
- </rules>
- </exclude>
- <group
- id="org.eclipse.wst.common.tests.validation.t1group">
- </group>
- </validator>
- </extension>
-
- <extension id="t2a" name="T2A" point="org.eclipse.wst.validation.validator">
- <validator>
- <helper
- class="org.eclipse.wst.validation.tests.T2AHelper">
- </helper>
- <run
- class="org.eclipse.wst.validation.tests.T2A"
- enabled="false">
- </run>
- </validator>
- </extension>
- <extension
- id="t2b"
- name="T2B"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <helper
- class="org.eclipse.wst.validation.tests.T2AHelper">
- </helper>
- <run
- class="org.eclipse.wst.validation.tests.T2B"
- enabled="true">
- </run>
- </validator>
- </extension>
- <extension
- id="t1bmarker"
- name="T1B Message"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.core.resources.problemmarker">
- </super>
- <persistent
- value="true">
- </persistent>
- </extension>
- <extension
- point="org.eclipse.wst.validation.validatorGroup">
- <group
- id="t1group">
- <listener
- class="org.eclipse.wst.validation.tests.T1Group">
- </listener>
- </group>
- </extension>
- <extension id="exclude1" point="org.eclipse.wst.validation.exclude">
- <validator
- id="org.eclipse.wst.common.tests.validation.T1A">
- <exclude>
- <rules>
- <projectNature
- id="org.eclipse.jst.j2ee.ModuleCoreNature">
- </projectNature>
- </rules>
- </exclude>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T4A" name="T4A">
- <validator build="false" class="org.eclipse.wst.validation.tests.T4A" manual="false">
- <include>
- <rules>
- <fileext ext="test1"></fileext>
- <facet id="jst.java" version="5.0"/>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T4B" name="T4B">
- <validator build="false" class="org.eclipse.wst.validation.tests.T4B" manual="false">
- <include>
- <rules>
- <fileext ext="test1"></fileext>
- <facet id="jst.java" version="6.0"/>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T5A" name="T5A">
- <validator build="false" class="org.eclipse.wst.validation.tests.T5A" manual="false">
- <include>
- <rules>
- <pattern regex=".*/second/third/.*"></pattern>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T5B" name="T5B">
- <validator build="false" class="org.eclipse.wst.validation.tests.T5B" manual="false">
- <include>
- <rules>
- <pattern regex=".*/secondx/third/.*"></pattern>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T5C" name="T5C">
- <validator build="false" class="org.eclipse.wst.validation.tests.T5C" manual="false">
- <include>
- <rules>
- <fileext ext="test1"></fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension id="exclude2" point="org.eclipse.wst.validation.exclude">
- <validator id="org.eclipse.wst.common.tests.validation.T5C">
- <exclude>
- <rules>
- <pattern regex=".*/second/third/.*"></pattern>
- </rules>
- </exclude>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T6A" name="T6A">
- <validator build="false" class="org.eclipse.wst.validation.tests.T6A">
- <include>
- <rules>
- <fileext ext="t6a"></fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
- <extension point="org.eclipse.wst.validation.validatorV2" id="T7A" name="T7A">
- <validator build="false" class="org.eclipse.wst.validation.tests.T7A">
- <include>
- <rules>
- <fileext ext="t7a"></fileext>
- </rules>
- </include>
- </validator>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/common/tests/validation/Activator.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/common/tests/validation/Activator.java
deleted file mode 100644
index 5a0e0c4..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/common/tests/validation/Activator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.wst.common.tests.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.common.tests.validation";
-
- // The shared instance
- private static Activator plugin;
-
- private BundleContext _context;
-
- public BundleContext getContext() {
- return _context;
- }
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- _context = context;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Write this exception to the log.
- * <p>
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param e the throwable, this can be null in which case it is a nop.
- */
- public void handleException(Throwable e){
- if (e == null)return;
- Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/FileNames.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/FileNames.java
deleted file mode 100644
index af06105..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/FileNames.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-/**
- * Store file names in a single place so that they are easy to find.
- * @author karasiuk
- *
- */
-public interface FileNames {
- String disabled = "disabled";
-
- String firstTest2x = "first.test2x";
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestEnvironment.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestEnvironment.java
deleted file mode 100644
index aaeaced..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestEnvironment.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ValConstants;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-
-public class TestEnvironment {
-
- public static final boolean DEBUG = true;
-
- private IWorkspace _workspace;
- private HashMap<String, IProject> _projects = new HashMap<String, IProject>(20);
-
- public TestEnvironment() throws CoreException {
- _workspace = ResourcesPlugin.getWorkspace();
- if (DEBUG){
- _workspace.getRoot().delete(true, true, null);
- }
- }
-
- public IPath addFolder(IPath root, String folderName) throws CoreException {
- IPath path = root.append(folderName);
- createFolder(path);
- return path;
- }
-
- public void incrementalBuild() throws CoreException{
- getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- }
-
- /**
- * Run an incremental build and wait for it to finish.
- * @param monitor
- * @throws CoreException
- */
- public void incrementalBuildAndWait(IProgressMonitor monitor) throws CoreException, InterruptedException {
- getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
- Thread.sleep(2000);
- ValidationFramework.getDefault().join(monitor);
- }
-
- /**
- * Start a full build.
- */
- public void fullBuild2(IProgressMonitor monitor) throws CoreException{
- getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
- }
-
- /**
- * Do a full build, and wait until all the validation has finished.
- * @param monitor
- */
- public void fullBuild(IProgressMonitor monitor) throws CoreException, InterruptedException {
- fullBuild2(monitor);
- Thread.sleep(1000);
- ValidationFramework.getDefault().join(monitor);
- Thread.sleep(2000); // we need to sleep here to give the "finished" job a chance to run.
- }
-
- /**
- * Do a clean build, and wait until all the validation has finished.
- * @param monitor
- */
- public void cleanBuild(IProgressMonitor monitor) throws CoreException, InterruptedException {
- getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
- Thread.sleep(1000);
- ValidationFramework.getDefault().join(monitor);
- }
-
- private IFolder createFolder(IPath path) throws CoreException {
- if (path.segmentCount() <= 1)return null;
-
- IFolder folder = _workspace.getRoot().getFolder(path);
- if (!folder.exists()){
- folder.create(true, true, null);
- }
- return folder;
- }
-
- public IProject createProject(String name) throws CoreException {
- final IProject project = _workspace.getRoot().getProject(name);
- IWorkspaceRunnable create = new IWorkspaceRunnable() {
-
- public void run(IProgressMonitor monitor) throws CoreException {
- project.create(monitor);
- project.open(monitor);
- ValidatorManager.addProjectBuildValidationSupport(project);
- }
- };
-
- _workspace.run(create, null);
- _projects.put(name, project);
-
- return project;
- }
-
- public void dispose() throws CoreException {
- if (DEBUG)return;
- for (Iterator<IProject> it=_projects.values().iterator(); it.hasNext();){
- IProject project = it.next();
- project.delete(true, null);
- }
- }
-
- public IFile addFile(IPath folder, String fileName, String contents) throws CoreException, UnsupportedEncodingException {
- IPath filePath = folder.append(fileName);
- return createFile(filePath, contents.getBytes("UTF8"));
- }
-
- private IFile createFile(IPath filePath, byte[] contents) throws CoreException {
- IFile file = _workspace.getRoot().getFile(filePath);
- ByteArrayInputStream in = new ByteArrayInputStream(contents);
- if (file.exists())file.setContents(in, true, false, null);
- else file.create(in, true, null);
- return file;
- }
-
- public IWorkspace getWorkspace(){
- return _workspace;
- }
-
- public IProject findProject(String name) {
- IProject project = _workspace.getRoot().getProject(name);
- if (project.exists())return project;
- return null;
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the ones that are not part of
- * these tests.
- *
- * @param validatorPrefix The start of the validator class name, but without the package name. For example "T5".
- */
- public static void enableOnlyTheseValidators(String validatorPrefix) throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- String name = "org.eclipse.wst.validation.tests." + validatorPrefix;
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().startsWith(name);
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the validators except this one.
- *
- * @param name Fully qualified class name of the validator to turn on. For example
- * org.eclipse.wst.validation.tests.TestValidator
- */
- public static void enableOnlyThisValidator(String name) throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().equals(name);
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- public void turnoffAutoBuild() throws CoreException {
- IWorkspaceDescription wd = _workspace.getDescription();
- if (wd.isAutoBuilding()){
- wd.setAutoBuilding(false);
- _workspace.setDescription(wd);
- }
-
- }
-
- public void turnOnAutoBuild() throws CoreException {
- IWorkspaceDescription wd = _workspace.getDescription();
- if (!wd.isAutoBuilding()){
- wd.setAutoBuilding(true);
- _workspace.setDescription(wd);
- }
- }
-
- /**
- * Answer the number of validation errors on this resource.
- *
- * @param resource
- * The resource being checked.
- * @return the number of problem markers that have the error severity.
- */
- public int getErrors(IResource resource) {
- int errors = 0;
- try {
- IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, false, IResource.DEPTH_ZERO);
- for (IMarker marker : markers){
- int severity = marker.getAttribute(IMarker.SEVERITY, -1);
- if (severity == IMarker.SEVERITY_ERROR)errors++;
- }
- }
- catch (CoreException e){
- //eat it
- }
- return errors;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite1.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite1.java
deleted file mode 100644
index bad6c7c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite1.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.IDependencyIndex;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.Deserializer;
-import org.eclipse.wst.validation.internal.Serializer;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.ValConstants;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.tests.Misc;
-import org.eclipse.wst.validation.tests.TestValidator;
-import org.eclipse.wst.validation.tests.TestValidator2;
-import org.eclipse.wst.validation.tests.TestValidator4;
-import org.eclipse.wst.validation.tests.TestValidator5D;
-import org.eclipse.wst.validation.tests.TestValidator6;
-import org.eclipse.wst.validation.tests.TestValidator7;
-import org.eclipse.wst.validation.tests.ValCounters;
-
-public class TestSuite1 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _testProject;
-
- private IFile _mapTest1;
-
- public static Test suite() {
- return new TestSuite(TestSuite1.class);
- }
-
- public TestSuite1(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _testProject = _env.findProject("TestProject");
- if (_testProject != null)return;
- _env.turnoffAutoBuild();
- enableOnlyTestValidators();
- _testProject = _env.createProject("TestProject");
- IPath folder = _env.addFolder(_testProject.getFullPath(), "source");
- _env.addFile(folder, "first.test1", "include map.test1\n" +
- "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
- _env.addFile(folder, "second.test1", "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
- _mapTest1 = _env.addFile(folder, "map.test1",
- "# will hold future mappings\n\n" +
- "# syntax: map target replacement\n" +
- "# for example map t1error error - would replace all t1error tokens with error");
- _env.addFile(folder, "first.test2", "# sample file");
- _env.addFile(folder, "third.test4",
- "# Doesn't really matter\n" +
- "# We just want to make the build a bit slower.");
- _env.addFile(folder, "fourth.test4", "# Doesn't really matter");
- _env.addFile(folder, "fifth.test5", "# Doesn't really matter");
- _env.addFile(folder, "forFun.xml", "<fun>times</fun>");
-
- _env.addFile(_testProject.getFullPath(), "file.specific", "# This should be validated by Test2");
- _env.addFile(folder, "file.specific", "# This should be validated by Test2");
-
- _env.addFile(_testProject.getFullPath(), "full.specific", "# This should not be validated by Test2");
- _env.addFile(folder, "full.specific", "# This should be validated by Test2");
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the ones that are not part of
- * these tests.
- */
- private static void enableOnlyTestValidators() throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().startsWith("org.eclipse.wst.validation.tests.Test");
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- protected void tearDown() throws Exception {
- _env.dispose();
- super.tearDown();
- }
-
- public void testIndex(){
- ValidationFramework vf = ValidationFramework.getDefault();
- IDependencyIndex index = vf.getDependencyIndex();
- assertNotNull(index);
- }
-
- public void testIndex2() throws CoreException, InterruptedException {
- ValidationFramework vf = ValidationFramework.getDefault();
- IDependencyIndex index = vf.getDependencyIndex();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
- IResource r = root.findMember("TestProject/source/map.test1");
- IProject p = r.getProject();
- p.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- ValidationFramework.getDefault().join(null);
-
- r = root.findMember("TestProject/source/first.test1");
- assertFalse(index.isDependedOn(r));
- }
-
- public void testGetValidators(){
- ValidationFramework vf = ValidationFramework.getDefault();
- IResource resource = _env.getWorkspace().getRoot().findMember("TestProject/source/first.test1");
- Validator[] validators = vf.getValidatorsFor(resource, false, false);
- assertTrue(validators.length > 0);
-
- String id = TestValidator.id();
- int count = 0;
- for (int i =0; i<validators.length; i++){
- if (validators[i].getId().equals(id))count++;
- }
- assertEquals(1, count);
- }
-
- public void testTest1() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite-02: testTest1 starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationFramework vf = ValidationFramework.getDefault();
- IProject[] projects = {_testProject};
- /*
- * After the validation we expect first.test1 to have 1 error, 1 warning and 1 info. And for
- * second.test1 to have 1 error, 1 warning and 1 info.
- */
- ValidationResults vr = vf.validate(projects, true, false, monitor);
-
- IResource resource = _env.getWorkspace().getRoot().findMember("TestProject/source/first.test1");
- checkFirstPass(resource, vr);
-
- // add a first build so that we know that only the map file has changed
- _env.incrementalBuild();
- Thread.sleep(2000);
- vf.join(monitor);
-
- ByteArrayInputStream in = new ByteArrayInputStream("map t1error error\nmap t1warning warning".getBytes());
- _mapTest1.setContents(in, true, true, monitor);
-
- Thread.sleep(2000); // we need to sleep here to give the "finished" job a chance to run.
- TestValidator4.getCounters().reset();
- TestValidator5D.getCounters().reset();
- _env.incrementalBuild();
- Thread.sleep(2000);
- vf.join(monitor);
-
- ValCounters vc = TestValidator4.getCounters();
- Tracing.log("TestSuite-03: testTest1: " + vc.toString());
- assertEquals(vc.startingCount, vc.finishedCount);
- assertEquals(vc.startingProjectCount, vc.finishedProjectCount);
- assertEquals(vc.startingCount, 1);
- assertEquals(vc.finishedCount, 1);
-
- vc = TestValidator5D.getCounters();
- assertEquals(vc.startingCount, vc.finishedCount);
- assertEquals(vc.startingProjectCount, vc.finishedProjectCount);
- assertEquals(vc.startingCount, 1);
- assertEquals(vc.finishedCount, 1);
-
- assertTrue("We expect the delegating validator Test5D to be called at least once",
- TestValidator5D.getCalledCount()>0);
-
- checkSecondPass(resource);
- Tracing.log("TestSuite-04:testTest1 finished");
- }
-
- public void testTest2() {
- ValidationFramework vf = ValidationFramework.getDefault();
- IResource test2 = _testProject.findMember("source/first.test2");
- assertNotNull(test2);
- Validator[] vals = vf.getValidatorsFor(test2, true, true);
- for (Validator v : vals){
- String id = v.getId();
- if (id.equals(TestValidator.id()))fail("first.test2 should not be validated by the test1 validator");
- }
-
- IResource test1 = _testProject.findMember("source/first.test1");
- assertNotNull(test1);
- vals = vf.getValidatorsFor(test1, true, true);
- boolean found = false;
- for (Validator v : vals){
- String id = v.getId();
- if (id.equals(TestValidator.id()))found = true;
- }
- assertTrue(found);
- }
-
- /**
- * Count the number of test validators.
- */
- public void testCountValidators(){
- int count = 0;
- for (Validator v : ValManager.getDefault().getValidators()){
- int i = v.getId().indexOf(".Test");
- if (i != -1)count++;
- }
- assertEquals("Expected number of Test validators", 8, count);
- }
-
- /**
- * Test if we can get a message that was defined through the extension point.
- */
- public void testMessages() {
- ValidationFramework vf = ValidationFramework.getDefault();
- Validator v = vf.getValidator(TestValidator2.id(), null);
- assertNotNull("We expected to find TestValidator2", v);
- MessageSeveritySetting ms = v.getMessage("bad");
- assertNotNull("We expected to find a message for 'bad'", ms);
- assertEquals(MessageSeveritySetting.Severity.Error, ms.getCurrent());
- assertEquals(4, v.getMessageSettings().size());
- }
-
- public void testSerialize(){
- Serializer s = new Serializer(20);
- s.put(true);
- s.put(false);
- s.put("Hi there");
- s.put(25);
- String test = s.toString();
-
- Deserializer d = new Deserializer(test);
- assertTrue(d.getBoolean());
- assertFalse(d.getBoolean());
- assertEquals("Hi there", d.getString());
- assertTrue(d.hasNext());
- assertEquals(25, d.getInt());
- assertFalse(d.hasNext());
- }
-
- public void testSuspend() throws CoreException, InterruptedException {
- ValidationFramework vf = ValidationFramework.getDefault();
- Validator v = vf.getValidator(TestValidator6.id(), null);
- TestValidator6 t6 = (TestValidator6)v.asV2Validator().getValidator();
-
- v = vf.getValidator(TestValidator7.id(), null);
- TestValidator7 t7 = (TestValidator7)v.asV2Validator().getValidator();
- t7.reset();
-
- long start = System.currentTimeMillis();
- _env.fullBuild2(null);
- Thread.sleep(1000);
- vf.join(null);
- long first = System.currentTimeMillis();
- long valBuild = first-start;
- assertTrue("We expect the build to take longer than 3s, but it completed in " + valBuild + "ms", valBuild > 3000);
-
- IResource projectFile = _testProject.findMember(".project");
- assertFalse("We should not be validating the .product file", t6.getSet().contains(projectFile));
-
- assertEquals("We expected the validation to be suspended after the first call", 1, t7.getSet().size());
-
- vf.suspendAllValidation(true);
- _env.fullBuild2(null);
- Thread.sleep(1000);
- vf.join(null);
- long second = System.currentTimeMillis();
- vf.suspendAllValidation(false);
- long novalBuild = second - first;
- assertTrue("We except the build to go faster with validation turned off, but it was " + (novalBuild-valBuild) +
- " ms faster" , novalBuild < valBuild);
- assertEquals("We expected the validation to be suspended after the first call", 1, t7.getSet().size());
-
- }
-
- private void checkFirstPass(IResource resource, ValidationResults vr) throws CoreException {
- assertEquals("Expected number of error messages", 5, vr.getSeverityError());
- assertEquals("Expected number of warning messages", 2, vr.getSeverityWarning());
- assertEquals("Expected number of info messages", 2, vr.getSeverityInfo());
-
- assertEquals("Expected number of messages", 9, vr.getMessages().length);
-
- IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, false, IResource.DEPTH_ZERO);
- int errors =0, warnings=0, info=0;
- for (IMarker marker : markers){
- int severity = marker.getAttribute(IMarker.SEVERITY, -1);
- switch (severity){
- case IMarker.SEVERITY_ERROR: errors++;
- break;
- case IMarker.SEVERITY_WARNING: warnings++;
- break;
- case IMarker.SEVERITY_INFO: info++;
- break;
- }
- }
- assertTrue("We expect there to be exactly one error message, but errors=" + errors, errors == 1);
- assertTrue("We expect there to be exactly one warning message, but warnings="+warnings, warnings == 1);
- assertTrue("We expect there to be exactly one info message, but info="+info, info == 1);
- }
-
- private void checkSecondPass(IResource resource) throws CoreException {
- IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, false, IResource.DEPTH_ZERO);
- int errors =0, warnings=0, info=0;
- for (int i=0; i<markers.length; i++){
- int severity = markers[i].getAttribute(IMarker.SEVERITY, -1);
- switch (severity){
- case IMarker.SEVERITY_ERROR: errors++;
- break;
- case IMarker.SEVERITY_WARNING: warnings++;
- break;
- case IMarker.SEVERITY_INFO: info++;
- break;
- }
- }
- if (Tracing.isLogging()){
- Tracing.log("TestSuite-01: checkSecondPass: " + Misc.listMarkers(resource));
- }
- assertTrue("We expect there to be exactly two error messages, but errors=" + errors, errors == 2);
- assertTrue("We expect there to be exactly two warning messages, but warnings="+warnings, warnings == 2);
- assertTrue("We expect there to be exactly one info message, but info="+info, info == 1);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite2.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite2.java
deleted file mode 100644
index 8f5b29c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite2.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ValConstants;
-import org.eclipse.wst.validation.tests.T1B;
-import org.eclipse.wst.validation.tests.T1Group;
-import org.osgi.framework.Bundle;
-
-public class TestSuite2 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _testProject;
-
- private IFile _firstTest1;
- private IFile _secondTest1;
- private IFile _firstT1B;
-
- private IFile _firstTest2x;
-
- private IFile _firstT1C;
-
- public static Test suite() {
- return new TestSuite(TestSuite2.class);
- }
-
- public TestSuite2(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _testProject = _env.findProject("TestProject");
- if (_testProject != null)return;
- _env.turnoffAutoBuild();
- adjustEnabledValidators();
- _testProject = _env.createProject("TestProject");
- IPath folder = _env.addFolder(_testProject.getFullPath(), "source");
- _firstTest1 = _env.addFile(folder, "first.test1", "include map.test1\ninfo - information\nwarning - warning\nerror - error\n\n" +
- "t1error - extra error\nt1warning - extra warning");
- _secondTest1 = _env.addFile(folder, "second.test1", "info - information\nwarning - warning\nerror - error\n\n" +
- "t1error - extra error\nt1warning - extra warning");
- _firstT1B = _env.addFile(folder, "first.t1b", "include map.test1\ninfo - information\nwarning - warning\nerror - error\n\n" +
- "t1error - extra error\nt1warning - extra warning");
-
- _env.addFile(folder, "map.test1", "# will hold future mappings");
- _env.addFile(folder, "first.test2", "# sample file");
- _firstTest2x = _env.addFile(folder, FileNames.firstTest2x, "# a file that will be validated as a side effect of running the T1A validator");
- _env.addFile(folder, "third.test4", "# Doesn't really matter\nWe just want to make the build a bit slower.");
- _env.addFile(folder, "fourth.test4", "# Doesn't really matter");
- _env.addFile(folder, "fifth.test5", "# Doesn't really matter");
-
- IPath ignore = _env.addFolder(_testProject.getFullPath(), "ignore");
- IPath nested = _env.addFolder(ignore, "nested");
- _firstT1C = _env.addFile(nested, "first.t1c", "error - error");
-
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the ones that are not part of
- * these tests.
- */
- private static void adjustEnabledValidators() throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().startsWith("org.eclipse.wst.validation.tests.T1");
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- protected void tearDown() throws Exception {
- _env.dispose();
- super.tearDown();
- }
-
- public void testFullBuild() throws CoreException, InterruptedException {
- ValidationFramework vf = ValidationFramework.getDefault();
-// Listener listener = new Listener(_firstTest2x);
-// IWorkspace workspace = ResourcesPlugin.getWorkspace();
- try {
-// workspace.addResourceChangeListener(listener);
- IProgressMonitor monitor = new NullProgressMonitor();
- _env.fullBuild2(monitor);
-
- vf.join(monitor);
- Thread.sleep(1000);
-
- T1Group.getGroup().reset();
- _env.turnOnAutoBuild();
-
-
- _firstTest1.touch(monitor);
- Thread.sleep(50);
- _secondTest1.touch(monitor);
- vf.join(monitor);
- Thread.sleep(1000);
-
- checkClear();
- checkT1B();
- checkGuardValidators();
-
- checkT1C();
- checkGroup();
- }
- finally {
-// workspace.removeResourceChangeListener(listener);
- }
- }
-
- private void checkGroup() {
- T1Group group = T1Group.getGroup();
- assertNotNull("The validation group listener T1Group was never created", group);
- assertEquals("The starting count must equal the finishing count", group.getStarting(), group.getFinishing());
- assertEquals("Number of times the group should be signalled", 2, group.getStarting());
- }
-
- private void checkT1B() throws CoreException {
- IMarker[] markers = _firstT1B.findMarkers(T1B.MarkerId, false, IResource.DEPTH_ZERO);
- assertEquals("Number of T1B markers", 3, markers.length);
- }
-
- private void checkT1C() throws CoreException {
- IMarker[] markers = _firstT1C.findMarkers(null, false, IResource.DEPTH_ZERO);
- assertEquals("Number of T1C markers", 0, markers.length);
- }
-
- /**
- * Check if the clear function worked.
- */
- private void checkClear() throws CoreException {
- IMarker[] markers = _firstTest2x.findMarkers(ValConstants.ProblemMarker, false, IResource.DEPTH_ZERO);
- assertEquals(1, markers.length);
- }
-
- private void checkGuardValidators(){
- Bundle b = Platform.getBundle("org.eclipse.wst.common.tests.validation.guard");
- if (b != null){
- int state = b.getState();
- if (state == Bundle.ACTIVE){
- fail("The guard plug-in should never be activated.");
- }
- }
- }
-
- public static class Listener implements IResourceChangeListener {
-
- private IResource _interested;
-
- public Listener(IResource resource){
- _interested = resource;
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- IMarkerDelta[] markers = event.findMarkerDeltas(ValConstants.ProblemMarker, false);
- for (IMarkerDelta marker : markers){
- IResource resource = marker.getResource();
- if (_interested.equals(resource)){
- // added=1, removed=2, changed=4
-// int kind = marker.getKind();
-// Map map = marker.getAttributes();
-// int len = map.size();
- }
- }
- }
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite3.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite3.java
deleted file mode 100644
index d78ca12..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite3.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.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.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.Tracing;
-
-public class TestSuite3 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _testProject;
-
- private IResource _folder;
- private IFile _firstTest1;
-
- public static Test suite() {
- return new TestSuite(TestSuite3.class);
- }
-
- public TestSuite3(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _testProject = _env.findProject("TestProject");
- if (_testProject != null)return;
- _env.turnoffAutoBuild();
- enableOnlyTestValidators();
- _testProject = _env.createProject("TestProject");
- IPath folder = _env.addFolder(_testProject.getFullPath(), "source");
- ResourcesPlugin.getWorkspace().getRoot().findMember(folder);
- _env.addFile(folder, "first.test1", "include map.test1\n" +
- "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
- _env.addFile(folder, "second.test1", "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
- _env.addFile(folder, "map.test1",
- "# will hold future mappings\n\n" +
- "# syntax: map target replacement\n" +
- "# for example map t1error error - would replace all t1error tokens with error");
- _env.addFile(folder, "first.test2", "# sample file");
- _env.addFile(folder, "third.test4",
- "# Doesn't really matter\n" +
- "# We just want to make the build a bit slower.");
- _env.addFile(folder, "fourth.test4", "# Doesn't really matter");
- _env.addFile(folder, "fifth.test5", "# Doesn't really matter");
-
- folder = _env.addFolder(_testProject.getFullPath(), FileNames.disabled);
- _folder = ResourcesPlugin.getWorkspace().getRoot().findMember(folder);
- _firstTest1 = _env.addFile(folder, "first.test1", "include map.test1\n" +
- "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
-
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the ones that are not part of
- * these tests.
- */
- private static void enableOnlyTestValidators() throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().startsWith("org.eclipse.wst.validation.tests.Test");
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- protected void tearDown() throws Exception {
- _env.dispose();
- super.tearDown();
- }
-
- public void testTest1() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite3-01: testTest1 starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationFramework vf = ValidationFramework.getDefault();
-
- vf.disableValidation(_folder);
- _env.fullBuild(monitor);
- IMarker[] markers = _firstTest1.findMarkers(null, true, IResource.DEPTH_ZERO);
- assertEquals("The file should not have been validated.", 0, markers.length);
-
- vf.enableValidation(_folder);
- _env.fullBuild(monitor);
- markers = _firstTest1.findMarkers(null, true, IResource.DEPTH_ZERO);
- assertTrue("The file should have some markers", markers.length > 0);
-
- vf.disableValidation(_folder);
- _env.fullBuild(monitor);
- markers = _firstTest1.findMarkers(null, true, IResource.DEPTH_ZERO);
- assertEquals("The file should not have been validated.", 0, markers.length);
-
- Tracing.log("TestSuite3-02:testTest1 finished");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite4.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite4.java
deleted file mode 100644
index e627d4b..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite4.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.internal.Tracing;
-
-public class TestSuite4 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _project;
-
- public static Test suite() {
- return new TestSuite(TestSuite4.class);
- }
-
- public TestSuite4(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- IFacetedProjectWorkingCopy project = FacetedProjectFramework.createNewProject();
- project.setProjectName("FacetProject");
- IProjectFacet pf = ProjectFacetsManager.getProjectFacet("jst.java");
- IProjectFacetVersion ipv = pf.getVersion("5.0");
- Set<IProjectFacetVersion> set = new HashSet<IProjectFacetVersion>(1);
- set.add(ipv);
- project.setProjectFacets(set);
- project.commitChanges(null);
- _project = project.getProject();
-
- IPath folder = _env.addFolder(_project.getFullPath(), "source");
- ResourcesPlugin.getWorkspace().getRoot().findMember(folder);
- _env.addFile(folder, "first.test1",
- "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
-
- enableOnlyT4Validators();
- }
-
- /**
- * Since other plug-ins can add and remove validators, turn off all the ones that are not part of
- * these tests.
- */
- private static void enableOnlyT4Validators() throws InvocationTargetException {
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings ws = vf.getWorkspaceSettings();
- for (IMutableValidator v : ws.getValidators()){
- boolean enable = v.getValidatorClassname().startsWith("org.eclipse.wst.validation.tests.T4");
- v.setBuildValidation(enable);
- v.setManualValidation(enable);
- }
- vf.applyChanges(ws, true);
- }
-
- protected void tearDown() throws Exception {
- _project.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
- /**
- * Ensure that the facet version expressions are working. We define two validators T4A and T4B. The first one operates on Java 5
- * and the second on Java 6. Since we have created a project that has been set to Java 5, we only expect the T4A validator
- * to be called.
- */
- public void testFacetVersions() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite4-01: testFacetVersions starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationFramework vf = ValidationFramework.getDefault();
- IProject[] projects = new IProject[1];
- projects[0] = _project;
- ValidationResults vr = vf.validate(projects, true, false, monitor);
- int errors = vr.getSeverityError();
- assertEquals("Number of errors", 1, errors);
-
- Tracing.log("TestSuite4-02:testFacetVersions finished");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite5.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite5.java
deleted file mode 100644
index 4d45b47..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite5.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-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.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.internal.Tracing;
-
-/** Test the new pattern rule. */
-public class TestSuite5 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _project;
-
- public static Test suite() {
- return new TestSuite(TestSuite5.class);
- }
-
- public TestSuite5(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _project = _env.createProject("TestSuite5");
-
- IPath first = _env.addFolder(_project.getFullPath(), "first");
- IPath second = _env.addFolder(first, "second");
- IPath third = _env.addFolder(second, "third");
- _env.addFile(third, "sample.test1",
- "info - information\n" +
- "warning - warning\n" +
- "error - error\n\n" +
- "t1error - extra error\n" +
- "t1warning - extra warning");
-
- TestEnvironment.enableOnlyTheseValidators("T5");
- }
-
- protected void tearDown() throws Exception {
- _project.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
- /**
- * Ensure that the pattern filters are working.
- */
- public void testPatterns() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite5-01: testFacetVersions starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationFramework vf = ValidationFramework.getDefault();
- IProject[] projects = new IProject[1];
- projects[0] = _project;
- ValidationResults vr = vf.validate(projects, true, false, monitor);
- int errors = vr.getSeverityError();
- assertEquals("Number of errors", 1, errors);
-
- Tracing.log("TestSuite5-02:testFacetVersions finished");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite6.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite6.java
deleted file mode 100644
index ccdd829..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite6.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.tests.T6A;
-
-/** Test what happens when a dependent resource is deleted. */
-public class TestSuite6 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _project;
- private IFile _sample;
- private IFile _master;
-
- public static Test suite() {
- return new TestSuite(TestSuite6.class);
- }
-
- public TestSuite6(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _env.turnoffAutoBuild();
- _project = _env.createProject("TestSuite6");
-
- IPath first = _env.addFolder(_project.getFullPath(), "first");
- _sample = _env.addFile(first, "sample.t6a", "include master.t6a");
- _master = _env.addFile(first, "master.t6a", "# a dummy file");
-
- TestEnvironment.enableOnlyThisValidator("org.eclipse.wst.validation.tests.T6A");
- }
-
- protected void tearDown() throws Exception {
- _project.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
- /**
- * Ensure that the validator gets called when a dependent resource is deleted.
- */
- public void testDelete() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite6-01: testDelete starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- T6A.resetCounters();
-
- _env.incrementalBuildAndWait(monitor);
- assertEquals("We do not expect any errors by this point", 0, _env.getErrors(_sample));
-
- _master.delete(true, monitor);
- _env.incrementalBuildAndWait(monitor);
- assertEquals("The missing depenency should have been reported.", 1, _env.getErrors(_sample));
- assertEquals("The simple version of the validate method should never be called", 0, T6A.getCountSimple());
- assertTrue("The complex method must be called at least once", T6A.getCountComplex() > 0);
-
- Tracing.log("TestSuite6-02:testDelete finished");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite7.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite7.java
deleted file mode 100644
index 892350e..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite7.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-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.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.tests.T7A;
-import org.eclipse.wst.validation.tests.T7A.ValEntryPoint;
-
-/** Test the order of validation events. */
-public class TestSuite7 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _projectA;
- private IProject _projectB;
-
- public static Test suite() {
- return new TestSuite(TestSuite7.class);
- }
-
- public TestSuite7(String name){
- super(name);
- }
-
-
- protected void setUp() throws Exception {
- super.setUp();
- TestEnvironment.enableOnlyThisValidator("org.eclipse.wst.validation.tests.T7A");
- _env = new TestEnvironment();
- _projectA = _env.createProject("TestSuite7a");
- _projectB = _env.createProject("TestSuite7b");
- makeFiles(_projectA);
- makeFiles(_projectB);
-
- }
-
- private void makeFiles(IProject project) throws Exception{
- IPath first = _env.addFolder(project.getFullPath(), "some-folder");
- _env.addFile(first, "first.t7a", "# a dummy file");
- _env.addFile(first, "second.t7a", "# a dummy file");
-
- }
-
- protected void tearDown() throws Exception {
- _projectA.delete(true, null);
- _projectB.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
- /**
- * Test the order of a clean build.
- */
- public void testClean() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite7-01: testClean starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- _env.turnOnAutoBuild();
- _env.cleanBuild(monitor);
- T7A.resetList();
-
- _env.cleanBuild(monitor);
- ValEntryPoint[] array = T7A.getArray();
- int start = 0;
- int finish = 0;
- for (ValEntryPoint vep : array){
- switch (vep.getType()){
- case Starting:
- if (start == 0)assertNull("First starting entry must be null", vep.getResource());
- start++;
- break;
- case Finishing:
- finish++;
- break;
- case Normal:
- assertEquals("All normal validation events must be two levels deep", 2, start-finish);
- }
- }
- assertEquals("Starting must equal finishing", start, finish);
- assertNull("Last entry must be null", array[array.length-1].getResource());
-
- Tracing.log("TestSuite7-02:testClean finished");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite8.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite8.java
deleted file mode 100644
index 6f3993b..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite8.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.validation.IMutableValidator;
-import org.eclipse.wst.validation.MutableProjectSettings;
-import org.eclipse.wst.validation.MutableWorkspaceSettings;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Test the transient settings support. That is the ability to change validator settings without changing
- * the property files.
- */
-public class TestSuite8 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _project;
-
-
- public static Test suite() {
- return new TestSuite(TestSuite8.class);
- }
-
- public TestSuite8(String name){
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _env.turnoffAutoBuild();
- _project = _env.createProject("TestSuite8");
- IPath first = _env.addFolder(_project.getFullPath(), "some-folder");
- _env.addFile(first, "first.t6a", "error - one error line");
- }
-
- protected void tearDown() throws Exception {
- _project.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
-
- /**
- * Test the transient settings support. That is the ability to change validator settings without changing
- * the property files.
- */
- public void testPrefs() throws CoreException, UnsupportedEncodingException, InterruptedException, InvocationTargetException {
- Tracing.log("TestSuite8-01: testClean starting");
-
- Bundle bundle = Platform.getBundle("org.eclipse.core.runtime");
- IPath path = Platform.getStateLocation(bundle);
- path = path.append(".settings/"+ValidationPlugin.PLUGIN_ID+".prefs");
- File file = path.toFile();
- long lastModified = file.lastModified();
-
- ValidationFramework vf = ValidationFramework.getDefault();
- MutableWorkspaceSettings mws = vf.getWorkspaceSettings();
- IMutableValidator[] validators = mws.getValidators();
- assertTrue("There must be sime validators defined", validators.length > 0);
- for (IMutableValidator val : validators){
- val.setBuildValidation(false);
- val.setManualValidation(true);
- }
- vf.applyChanges(mws, false);
- assertEquals("The global preference file should not have changed", lastModified, file.lastModified());
-
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationResults vr = vf.validate(new IProject[]{_project}, true, false, monitor);
- assertEquals("We expect exactly one error", 1, vr.getSeverityError());
-
- mws = vf.getWorkspaceSettings();
- validators = mws.getValidators();
- for (IMutableValidator val : validators){
- assertEquals("We expected " + val.getName() + " to have build turned off", false, val.isBuildValidation());
- assertEquals("We expected " + val.getName() + " to have manual turned on", true, val.isManualValidation());
-
- val.setBuildValidation(true);
- val.setManualValidation(false);
- }
- vf.applyChanges(mws, true);
- assertTrue("The global preference file should have changed", lastModified < file.lastModified());
-
- vr = vf.validate(new IProject[]{_project}, true, false, monitor);
- assertEquals("The validator is off, there should be no errors", 0, vr.getSeverityError());
-
- projectTest();
-
- Tracing.log("TestSuite8-02:testClean finished");
- }
-
- private void projectTest() throws CoreException {
- long lastModified = lastModifiedForProject();
-
- ValidationFramework vf = ValidationFramework.getDefault();
-
- MutableProjectSettings mps = vf.getProjectSettings(_project);
- assertFalse("By default, projects can not override workspace settings", mps.getOverride());
-
- mps.setOverride(true);
- vf.applyChanges(mps, false);
-
- IMutableValidator[] validators = mps.getValidators();
- assertTrue("There must be sime validators defined", validators.length > 0);
- for (IMutableValidator val : validators){
- val.setBuildValidation(false);
- val.setManualValidation(true);
- }
- vf.applyChanges(mps, false);
- assertEquals("The project preference file should not have changed", lastModified, lastModifiedForProject());
-
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationResults vr = vf.validate(new IProject[]{_project}, true, false, monitor);
- assertEquals("We expect exactly one error", 1, vr.getSeverityError());
-
- mps = vf.getProjectSettings(_project);
- validators = mps.getValidators();
- for (IMutableValidator val : validators){
- assertEquals("We expected " + val.getName() + " to have build turned off", false, val.isBuildValidation());
- assertEquals("We expected " + val.getName() + " to have manual turned on", true, val.isManualValidation());
-
- val.setBuildValidation(true);
- val.setManualValidation(false);
- }
- vf.applyChanges(mps, true);
- assertTrue("The project preference file should have changed", lastModified < lastModifiedForProject());
-
- vr = vf.validate(new IProject[]{_project}, true, false, monitor);
- assertEquals("The validator is off, there should be no errors", 0, vr.getSeverityError());
-
- }
-
- private long lastModifiedForProject(){
- long lastModified = 0;
- IResource prefs = _project.findMember(".settings/" + ValidationPlugin.PLUGIN_ID + ".prefs");
- if (prefs != null){
- File pf = prefs.getLocation().toFile();
- lastModified = pf.lastModified();
- }
- return lastModified;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite9.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite9.java
deleted file mode 100644
index c7a4d3c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/TestSuite9.java
+++ /dev/null
@@ -1,79 +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.validation.tests.testcase;
-
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResults;
-import org.eclipse.wst.validation.internal.Tracing;
-
-/** Tests for derived resources. */
-public class TestSuite9 extends TestCase {
-
- private TestEnvironment _env;
- private IProject _project;
-
- public static Test suite() {
- return new TestSuite(TestSuite9.class);
- }
-
- public TestSuite9(String name){
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- _env = new TestEnvironment();
- _project = _env.createProject("TestSuite9");
-
- IPath first = _env.addFolder(_project.getFullPath(), "first");
- IFile file = _env.addFile(first, "test.xml",
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<root>");
- file.setDerived(true);
-
- TestEnvironment.enableOnlyThisValidator("org.eclipse.wst.xml.core.internal.validation.eclipse.Validator");
- }
-
- protected void tearDown() throws Exception {
- _project.delete(true, null);
- _env.dispose();
- super.tearDown();
- }
-
- /**
- * Ensure that the framework ignores derived resources.
- */
- public void testIgnoresDerivedResources() throws CoreException, UnsupportedEncodingException, InterruptedException {
- Tracing.log("TestSuite9-01: testIgnoresDerivedResources starting");
- IProgressMonitor monitor = new NullProgressMonitor();
- ValidationFramework vf = ValidationFramework.getDefault();
- IProject[] projects = new IProject[1];
- projects[0] = _project;
- ValidationResults vr = vf.validate(projects, true, false, monitor);
- int errors = vr.getSeverityError();
- assertEquals("Number of errors", 0, errors);
-
- Tracing.log("TestSuite9-02: testIgnoresDerivedResources finished");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/ValidationTestSuite.java b/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/ValidationTestSuite.java
deleted file mode 100644
index faf32e7..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/src/org/eclipse/wst/validation/tests/testcase/ValidationTestSuite.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.wst.validation.tests.testcase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ValidationTestSuite extends TestSuite {
-
- public ValidationTestSuite() {
- super();
- TestSuite suite = (TestSuite)ValidationTestSuite.suite();
- for (int i = 0; i < suite.testCount(); i++) {
- addTest(suite.testAt(i));
- }
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.wst.validation.tests.testcase");
- suite.addTest(TestSuite1.suite());
- suite.addTest(TestSuite2.suite());
- suite.addTest(TestSuite3.suite());
- suite.addTest(TestSuite4.suite());
- suite.addTest(TestSuite5.suite());
- suite.addTest(TestSuite6.suite());
- suite.addTest(TestSuite7.suite());
- suite.addTest(TestSuite8.suite());
- suite.addTest(TestSuite9.suite());
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/test.xml b/tests/org.eclipse.wst.common.tests.validation/test.xml
deleted file mode 100644
index 1dd64fc..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/test.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!--==============================================================-->
- <!-- 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}\.."/> -->
-
- <!--==============================================================-->
- <!-- Set the environment properties. -->
- <!--==============================================================-->
- <property name="plugin-name" value="org.eclipse.wst.common.tests.validation"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.2.0/library.xml"/>
- <property name="extraVMargs" value="-Xmx768M"/>
-
- <!--===============================================================-->
- <!-- This target initializes all of the tests that will 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.*.xml"/>
- </delete>
- </target>
-
- <!--==============================================================-->
- <!-- This target defines the tests that need to run. -->
- <!--==============================================================-->
- <target name="suite">
- <property name="workspace" value="${eclipse-home}/wst_vf"/>
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.validation.tests.testcase.ValidationTestSuite"/>
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
- </target>
-
- <!--==================================================================-->
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <!--==================================================================-->
- <target name="cleanup">
- </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.*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
-
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/Misc.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/Misc.java
deleted file mode 100644
index b9ecacb..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/Misc.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Some miscellaneous helper methods.
- * @author karasiuk
- *
- */
-public class Misc {
-
- private static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
-
- public static void close(InputStream in){
- if (in == null)return;
- try {
- in.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static void close(OutputStream out) {
- if (out == null)return;
- try {
- out.close();
- }
- catch (IOException e){
- // eat it
- }
- }
-
- public static String listMarkers(IResource resource){
- StringBuffer b = new StringBuffer(2000);
- b.append("Markers on ");
- b.append(resource.getName());
- b.append(' ');
- try {
- IMarker[] markers = resource.findMarkers(null, true, IResource.DEPTH_ZERO);
- for (IMarker m : markers){
- Object o = m.getAttribute(IMarker.MESSAGE);
- if (o != null){
- b.append(o);
- }
- o = m.getAttribute(IMarker.SEVERITY);
- if (o != null){
- b.append(", Severity=");
- b.append(o);
- }
- b.append("; ");
- }
- }
- catch (CoreException e){
-
- }
- return b.toString();
- }
-
- public static String timestampIt(String line){
- Date date = new Date();
- long thread = Thread.currentThread().getId();
- return _df.format(date) + " " + thread + " " + line;//$NON-NLS-1$//$NON-NLS-2$
- }
-
- public static void niy(String msg){
- if (msg == null)msg = "Sorry, this function is not implemented yet"; //$NON-NLS-1$
- throw new RuntimeException(msg);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1AValidator.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1AValidator.java
deleted file mode 100644
index 4a87c4c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1AValidator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.tests.testcase.FileNames;
-
-/**
- * Test validating a side file.
- * @author karasiuk
- *
- */
-public class T1AValidator extends AbstractValidator {
-
- public static String id(){
- return Activator.PLUGIN_ID +".T1A";
- }
-
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- Tracing.log("T1AValidator-01: is validating: " + resource.getName());
- ValidationResult vr = new ValidationResult();
- clearTest(resource.getProject(), vr);
- return vr;
- }
-
-
- private void clearTest(IProject project, ValidationResult vr) {
- IResource resource = project.findMember("source/" + FileNames.firstTest2x);
- try {
- ValidationFramework.getDefault().clearMessages(resource, id());
- }
- catch (CoreException e){
- throw new RuntimeException(e);
- }
- String msg = Tracing.timestampIt("Side effect validation from T1A");
- ValidatorMessage vm = ValidatorMessage.create(msg, resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 1);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(vm);
- vr.setValidated(new IResource[]{resource});
- }
-
- public String getId(){
- return id();
- }
-
- public String getName(){
- return "T1AValidator";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1B.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1B.java
deleted file mode 100644
index 2fe0703..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1B.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-
-/**
- * Used to test custom markers.
- * @author karasiuk
- *
- */
-public class T1B extends TestValidator {
-
- public static final String MarkerId = Activator.PLUGIN_ID+".t1bmarker";
-
- public static String id(){
- return Activator.PLUGIN_ID +".T1B";
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- ValidationResult vr = super.validate(resource, kind, state, monitor);
-
- for (ValidatorMessage vm : vr.getMessages()){
- vm.setType(MarkerId);
- }
- return vr;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1C.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1C.java
deleted file mode 100644
index 0c7ee62..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1C.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * A validator that is used to test the folder filters.
- *
- * It looks at files with a file extension of t1c.
- * @author karasiuk
- *
- */
-public class T1C extends TestValidator {
-
- public static String id(){
- return Activator.PLUGIN_ID +".T1C";
- }
-
- @Override
- public String getId() {
- return id();
- }
-
- @Override
- public String getName() {
- return "T1C";
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1Group.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1Group.java
deleted file mode 100644
index 3ff9dc5..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T1Group.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.IValidatorGroupListener;
-import org.eclipse.wst.validation.ValidationState;
-
-public class T1Group implements IValidatorGroupListener {
-
- private int _starting;
- private int _finishing;
- private static T1Group _me;
-
- public static T1Group getGroup(){
- return _me;
- }
-
- public T1Group(){
- if (_me != null)throw new IllegalStateException("Only one instance can be constructed.");
- _me = this;
- }
-
- public void validationFinishing(IResource resource,
- IProgressMonitor monitor, ValidationState state) {
- _starting++;
-
- }
-
- public void validationStarting(IResource resource,
- IProgressMonitor monitor, ValidationState state) {
- _finishing++;
-
- }
-
- public int getStarting() {
- return _starting;
- }
-
- public int getFinishing() {
- return _finishing;
- }
-
- public void reset() {
- _starting = 0;
- _finishing = 0;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2A.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2A.java
deleted file mode 100644
index 9da9a43..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2A.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * A V1 validator that is off by default.
- * @author karasiuk
- *
- */
-public class T2A implements IValidator {
-
- public void cleanup(IReporter reporter) {
- }
-
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
- String[] uris = helper.getURIs();
- if (uris != null)Tracing.log("T2A-01: number of urs = " + uris.length);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2AHelper.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2AHelper.java
deleted file mode 100644
index 3ed44f1..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2AHelper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-
-public class T2AHelper extends WorkbenchContext {
-
- public String[] getURIs() {
- return null;
- }
-
- public Object loadModel(String symbolicName) {
- logit("T2AHelper#loadModule: " + symbolicName);
- return null;
- }
-
- public Object loadModel(String symbolicName, Object[] parms) {
- logit("T2AHelper#loadModule2: " + symbolicName);
- return null;
- }
-
- private void logit(String line){
- Tracing.log(line);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2B.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2B.java
deleted file mode 100644
index ad4b47a..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T2B.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.validation.internal.Tracing;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * A V1 validator that is on by default.
- * @author karasiuk
- *
- */
-public class T2B implements IValidator {
-
- public void cleanup(IReporter reporter) {
- }
-
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
- String[] uris = helper.getURIs();
- if (uris != null)Tracing.log("T2B-01: number of URIs = " + uris.length);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4A.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4A.java
deleted file mode 100644
index 9d08d58..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4A.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * This validator is used to test facet versions. It should be called on projects that have a version 5 java facet.
- * @author karasiuk
- *
- */
-public class T4A extends TestValidator {
-
- public String getName() {
- return "T4A";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T4A";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4B.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4B.java
deleted file mode 100644
index 8f9f7e1..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T4B.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * This validator is used to test facet versions. It should be called on projects that have a version 6 java facet.
- * @author karasiuk
- *
- */
-public class T4B extends TestValidator {
-
- public String getName() {
- return "T4B";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T4B";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5A.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5A.java
deleted file mode 100644
index 093e3fa..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5A.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * This validator is used to test pattern filters.
- * @author karasiuk
- *
- */
-public class T5A extends TestValidator {
-
- public String getName() {
- return "T5A";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T5A";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5B.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5B.java
deleted file mode 100644
index ee400f2..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5B.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * This validator is used to test pattern filters.
- * @author karasiuk
- *
- */
-public class T5B extends TestValidator {
-
- public String getName() {
- return "T5B";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T5B";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5C.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5C.java
deleted file mode 100644
index 5ea735c..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T5C.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.wst.common.tests.validation.Activator;
-
-/**
- * This validator is used to test pattern filters. This validator would normally validate *.test1 files, but an exclusion rule
- * has been added (via the exclude extension point) to not validate /second/third/ files.
- * @author karasiuk
- *
- */
-public class T5C extends TestValidator {
-
- public String getName() {
- return "T5C";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T5C";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T6A.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T6A.java
deleted file mode 100644
index 7cff037..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T6A.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.ValidationEvent;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * This validator is used to test the new validate entry point that includes dependency information
- * @author karasiuk
- *
- */
-public class T6A extends TestValidator {
-
- private static AtomicInteger _countSimple = new AtomicInteger();
- private static AtomicInteger _countComplex = new AtomicInteger();
-
- public static void resetCounters(){
- _countSimple.set(0);
- _countComplex.set(0);
- }
-
- public static int getCountSimple(){
- return _countSimple.get();
- }
-
- public static int getCountComplex(){
- return _countComplex.get();
- }
-
- public String getName() {
- return "T6A";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".T6A";
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- _countSimple.incrementAndGet();
- return super.validate(resource, kind, state, monitor);
- }
-
- @Override
- public ValidationResult validate(ValidationEvent event, ValidationState state, IProgressMonitor monitor) {
- _countComplex.incrementAndGet();
- return super.validate(event.getResource(), event.getKind(), state, monitor);
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T7A.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T7A.java
deleted file mode 100644
index c8236c3..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/T7A.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A validator that tests the order of the validate calls.
- * @author karasiuk
- *
- */
-public final class T7A extends AbstractValidator {
-
- private static List<ValEntryPoint> _list = new LinkedList<ValEntryPoint>();
-
- public static void resetList(){
- _list.clear();
- }
-
- public static List<ValEntryPoint> getList(){
- return _list;
- }
-
- public static ValEntryPoint[] getArray(){
- ValEntryPoint[] array = new ValEntryPoint[_list.size()];
- _list.toArray(array);
- return array;
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- _list.add(new ValEntryPoint(EntryType.Starting, project));
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- _list.add(new ValEntryPoint(EntryType.Finishing, project));
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- _list.add(new ValEntryPoint(EntryType.Normal, resource));
- return null;
- }
-
- @Override
- public void clean(IProject project, ValidationState state, IProgressMonitor monitor) {
- _list.add(new ValEntryPoint(EntryType.Clean, project));
- }
-
- /**
- * An immutible object that records an entry into the validator.
- * @author karasiuk
- *
- */
- public final static class ValEntryPoint {
- private final EntryType _type;
- private final IResource _resource;
-
- public ValEntryPoint(EntryType type, IResource resource){
- _type = type;
- _resource = resource;
- }
-
- @Override
- public String toString() {
- String resource = _resource == null ? "null" : _resource.getName();
- return "ValEntryPoint: " + _type + " " + resource;
- }
-
- public EntryType getType() {
- return _type;
- }
-
- public IResource getResource() {
- return _resource;
- }
- }
-
- public enum EntryType {Starting, Normal, Finishing, Clean}
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator.java
deleted file mode 100644
index 9f701b9..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-
-/**
- * Simple test validator.
- * <p>
- * This validator processes a file looking for certain magic tokens:
- * <ul>
- * <li>include fileName - open the file with name fileName and process it as an include
- * <li>error - create an error marker for this line
- * <li>warning - create a warning marker for this line
- * <li>info - create an info marker for this line
- * </ul>
- * </p>
- * <p>
- * Include files contain the magic token map. For example the line "map t1error error" will
- * cause occurrences of t1error to be mapped to error.
- * </p>
- * @author karasiuk
- *
- */
-public class TestValidator extends AbstractValidator {
-
- private static final String SimpleName = "Test1";
-
- public static String id(){
- return Activator.PLUGIN_ID +"." + SimpleName;
- }
-
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- ValidationResult vr = new ValidationResult();
- InputStream in = null;
- try {
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- in = file.getContents();
- BufferedReader rdr = new BufferedReader(new InputStreamReader(in));
- process(vr, rdr, resource, state);
- }
- }
- catch (Exception e){
- Activator.getDefault().handleException(e);
- }
- finally {
- Misc.close(in);
- }
-
- return vr;
- }
-
- public String getId(){
- return id();
- }
-
- private void process(ValidationResult vr, BufferedReader rdr, IResource resource, ValidationState state) throws IOException, CoreException {
- String line = null;
- int count = 0;
- Map<String, String> map = null;
- while (null != (line = rdr.readLine())){
- count++;
- int severity = -1;
- String[] tokens = line.split("\\s");
- if (tokens.length == 0)continue;
- String token = tokens[0];
- severity = findSeverity(token, severity);
- if (severity == -1 && map != null){
- String renamed = map.get(token);
- severity = findSeverity(renamed, severity);
- }
-
- if (severity != -1){
- ValidatorMessage message = ValidatorMessage.create(line + "(by " + getName() +")", resource);
- message.setAttribute(IMarker.LINE_NUMBER, count);
- message.setAttribute(IMarker.SEVERITY, severity);
- vr.add(message);
- }
-
- if (token.equals("include")){
- map = new HashMap<String, String>(10);
- String msg = processInclude(vr, tokens, resource, map);
- if (msg != null){
- ValidatorMessage message = ValidatorMessage.create(msg, resource);
- message.setAttribute(IMarker.LINE_NUMBER, count);
- message.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(message);
- }
- }
- }
-
- }
-
- private int findSeverity(String token, int dft){
- if (token == null)return dft;
- if (token.equals("error"))return IMarker.SEVERITY_ERROR;
- if (token.equals("warning"))return IMarker.SEVERITY_WARNING;
- if (token.equals("info"))return IMarker.SEVERITY_INFO;
- return dft;
- }
-
- private String processInclude(ValidationResult vr, String[] tokens, IResource resource, Map<String, String> map) throws IOException, CoreException{
- IContainer parent = resource.getParent();
- IFile file = parent.getFile(new Path(tokens[1]));
- if (!file.exists())return "Could not find file: " + file;
-
- InputStream in = null;
- try {
- in = file.getContents();
- BufferedReader rdr = new BufferedReader(new InputStreamReader(in));
- String line = null;
- while(null != (line = rdr.readLine())){
- String[] p = line.split("\\s");
- if (p.length == 3 && "map".equals(p[0])){
- map.put(p[1], p[2]);
- }
- }
- }
- finally {
- Misc.close(in);
- }
- IResource[] depends = {file};
- vr.setDependsOn(depends);
- return null;
-
- }
-
- public String getName(){
- return "TestValidator1";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator2.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator2.java
deleted file mode 100644
index 747f7e2..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.MessageSeveritySetting.Severity;
-
-/**
- * A simple test validator that always returns an error marker and a warning marker.
- * @author karasiuk
- *
- */
-public class TestValidator2 extends AbstractValidator {
-
- public String getName() {
- return "TestValidator2";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".Test2";
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- ValidationResult vr = new ValidationResult();
- ValidatorMessage vm = ValidatorMessage.create("A sample message from " + getName(), resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 1);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(vm);
-
- MessageSeveritySetting sev = getParent().getMessage("sortof");
- if (sev != null){
- Severity ms = sev.getCurrent();
- if (ms != Severity.Ignore){
- vm = ValidatorMessage.create("A different message from " + getName(), resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 2);
- vm.setAttribute(IMarker.SEVERITY, ms.getMarkerSeverity());
- vr.add(vm);
- }
- }
-
- return vr;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator3.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator3.java
deleted file mode 100644
index 4d19243..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator3.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.internal.Tracing;
-
-/**
- * A validator that processes *.html and *.htm files.
- * @author karasiuk
- *
- */
-public class TestValidator3 extends AbstractValidator {
-
- private static final String Name = "TestValidator3";
- static final String ID = "org.eclipse.wst.validation.tests.TestValidator3";
-
- public String getName() {
- return Name;
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- Tracing.log(Name+"-04: validating: " + resource);
- checkState(state);
-
- if (resource.getName().equals("test.html")){
- ValidationResult vr = new ValidationResult();
- ValidatorMessage vm = ValidatorMessage.create("A specific test.html error", resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 1);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(vm);
-
- IResource other = resource.getParent().findMember("test2.html");
- if (other != null)vr.setValidated(new IResource[]{other});
-
- IResource depends = resource.getParent().findMember("master.html");
- if (depends != null)vr.setDependsOn(new IResource[]{depends});
- return vr;
- }
-
- ValidationResult vr = new ValidationResult();
- ValidatorMessage vm = ValidatorMessage.create("A sample message from " + getName(), resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 1);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(vm);
-
- vm = ValidatorMessage.create("A different message from " + getName(), resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 3);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
- vr.add(vm);
-
- return vr;
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- String name = project == null ? "NULL" : project.getName();
- Tracing.log(Name+"-05: thinks validation is starting for project: ", name);
- if (!checkState(state)){
- state.put(ID, "my state");
- }
-
-
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- String name = project == null ? "NULL" : project.getName();
- Tracing.log(Name+"-01: thinks validation is finishing for project: ", name);
- checkState(state);
- }
-
- @Override
- public void clean(IProject project, ValidationState state, IProgressMonitor monitor) {
- String name = project == null ? "NULL" : project.getName();
- Tracing.log(Name+"-02: thinks a clean has been requested for project: ", name);
- checkState(state);
- }
-
- private boolean checkState(ValidationState state){
- if (state.get(ID) != null){
- Tracing.log(Name+"-03: has state information");
- return true;
- }
- return false;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator4.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator4.java
deleted file mode 100644
index 5be6ffd..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator4.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A slower validator. This validator takes at least 2 seconds to run.
- *
- * It looks at files with a file extension of test4.
- * @author karasiuk
- *
- */
-public class TestValidator4 extends TestValidator {
-
- private static ValCounters _counters = new ValCounters();
-
- public static String id(){
- return Activator.PLUGIN_ID +".Test4";
- }
-
- public static ValCounters getCounters() {
- return _counters;
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null)_counters.startingCount++;
- else _counters.startingProjectCount++;
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null)_counters.finishedCount++;
- else _counters.finishedProjectCount++;
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- ValidationResult vr = super.validate(resource, kind, state, monitor);
- long j = 0;
- try {
- for (long i=0; i< 10000000; i++)j = i + 1;
- Thread.sleep(2000);
- }
- catch (InterruptedException e){
- // eat it
- }
- j++; // just to get rid of the compiler warning
- return vr;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5.java
deleted file mode 100644
index 50e7c5d..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * This validator never gets called, it just serves as a definition for a delegating validator.
- * @author karasiuk
- *
- */
-public class TestValidator5 extends AbstractValidator {
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5D.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5D.java
deleted file mode 100644
index e577d06..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator5D.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * This is a delegating validator.
- * @author karasiuk
- *
- */
-public class TestValidator5D extends AbstractValidator {
-
- private static int _calledCount;
- private static ValCounters _counters = new ValCounters();
-
- public static ValCounters getCounters() {
- return _counters;
- }
-
- @Override
- public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null)_counters.startingCount++;
- else _counters.startingProjectCount++;
- }
-
- @Override
- public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
- if (project == null)_counters.finishedCount++;
- else _counters.finishedProjectCount++;
- }
-
- public String getName() {
- return "TestValidator5D";
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- ValidationResult vr = new ValidationResult();
- _calledCount++;
- return vr;
- }
-
- public static int getCalledCount() {
- return _calledCount;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator6.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator6.java
deleted file mode 100644
index bc7ab48..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator6.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A validator that has similar rules as the XML validator.
- * @author karasiuk
- *
- */
-public class TestValidator6 extends AbstractValidator {
-
- public static String id(){
- return Activator.PLUGIN_ID +".Test6";
- }
-
-
- private Set<IResource> _set = new HashSet<IResource>(100);
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- ValidationResult result = new ValidationResult();
- _set.add(resource);
- return result;
- }
-
- public Set<IResource> getSet() {
- return _set;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator7.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator7.java
deleted file mode 100644
index 35ade9f..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator7.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-
-/**
- * A validator that has similar rules as the Test1 Validator, used to test the suspend validation API.
- * @author karasiuk
- *
- */
-public class TestValidator7 extends AbstractValidator {
-
- public static String id(){
- return Activator.PLUGIN_ID +".Test7";
- }
-
- private Set<IResource> _set = new HashSet<IResource>(100);
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- ValidationResult result = new ValidationResult();
- _set.add(resource);
- result.setSuspendValidation(resource.getProject());
- return result;
- }
-
- public Set<IResource> getSet() {
- return _set;
- }
-
- public void reset(){
- _set.clear();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator8.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator8.java
deleted file mode 100644
index 9e9b610..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/TestValidator8.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.tests.validation.Activator;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-
-/**
- * A simple test validator that always returns an error marker on line 1. This can be extended by other testcases.
- *
- * Test8 is used to test the file filter. The both files named file.specific should be validated, where as only
- * source/full.specific should be validated.
- * @author karasiuk
- *
- */
-public class TestValidator8 extends AbstractValidator {
-
- public String getName() {
- return "TestValidator8";
- }
-
- public static String id(){
- return Activator.PLUGIN_ID +".Test8";
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- ValidationResult vr = new ValidationResult();
- ValidatorMessage vm = ValidatorMessage.create("A sample error from " + getName(), resource);
- vm.setAttribute(IMarker.LINE_NUMBER, 1);
- vm.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- vr.add(vm);
- return vr;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/ValCounters.java b/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/ValCounters.java
deleted file mode 100644
index 6a0fc4a..0000000
--- a/tests/org.eclipse.wst.common.tests.validation/validators/org/eclipse/wst/validation/tests/ValCounters.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.wst.validation.tests;
-
-/**
- * Some miscellaneous counters.
- * @author karasiuk
- *
- */
-public class ValCounters {
- public int startingCount;
- public int finishedCount;
- public int startingProjectCount;
- public int finishedProjectCount;
-
- public void reset(){
- startingCount = 0;
- startingProjectCount = 0;
- finishedCount = 0;
- finishedProjectCount = 0;
- }
-
- @Override
- public String toString() {
- return "ValCounters: startingCount=" + startingCount + ", finishedCount="+finishedCount+
- ", startProjectCount="+startingProjectCount+", finishedProjectCount="+finishedProjectCount;
- }
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/.classpath b/tests/org.eclipse.wst.internet.cache.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.internet.cache.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.internet.cache.tests/.cvsignore b/tests/org.eclipse.wst.internet.cache.tests/.cvsignore
deleted file mode 100644
index 67968bd..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-javaCompiler.tests.jar.args
diff --git a/tests/org.eclipse.wst.internet.cache.tests/.project b/tests/org.eclipse.wst.internet.cache.tests/.project
deleted file mode 100644
index fb4b067..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.internet.cache.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.internet.cache.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.internet.cache.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fdebaa7..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Jun 03 00:34:09 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-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.internet.cache.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6044f57..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.internet.cache.tests
-Bundle-Version: 1.0.1.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.wst.internet.cache.tests.internal.CacheTestsPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="[3.8.2,4.0.0)",
- org.eclipse.wst.internet.cache,
- org.eclipse.core.resources,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.internet.cache.internal;x-internal:=true,
- org.eclipse.wst.internet.cache.tests.internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
-
diff --git a/tests/org.eclipse.wst.internet.cache.tests/about.html b/tests/org.eclipse.wst.internet.cache.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.internet.cache.tests/build.properties b/tests/org.eclipse.wst.internet.cache.tests/build.properties
deleted file mode 100644
index 67e37c6..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.tests.jar = src/
-output.tests.jar = bin/
-bin.includes = META-INF/,\
- tests.jar,\
- test.xml,\
- about.html,\
- plugin.properties
-src.includes = build.properties
diff --git a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties b/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
deleted file mode 100644
index 6ee48b6..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.internet.cache.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = Cache Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheEntryTest.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheEntryTest.java
deleted file mode 100644
index f98308c..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheEntryTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.internal;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Tests for the CacheEntry class.
- */
-public class CacheEntryTest 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(CacheEntryTest.class);
- }
-
- /**
- * Test that the entry is not considered expired when -1 is specified.
- */
- public void testNotExpiredWhenMinusOne()
- {
- CacheEntry cacheEntry = new CacheEntry(null, null, 0, -1);
- assertFalse("The cache entry is expired when -1 is specified.", cacheEntry.hasExpired());
- }
-
- /**
- * Test that the entry is not considered expired when the set expiration
- * time is greater than the current system time.
- */
- public void testNotExpiredWhenGreaterThanSystemTime()
- {
- CacheEntry cacheEntry = new CacheEntry(null, null, 0, System.currentTimeMillis() + 60000);
- assertFalse("The cache entry is expired when greater than the currnet system time.", cacheEntry.hasExpired());
- }
-
- /**
- * Test that the entry is considered expired when the set expiration
- * time is less than the current system time.
- */
- public void testExpiredWhenLessThanSystemTime()
- {
- CacheEntry cacheEntry = new CacheEntry(null, null, 0, System.currentTimeMillis() - 60000);
- assertTrue("The cache entry is not expired when less than the currnet system time.", cacheEntry.hasExpired());
- }
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheTest.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheTest.java
deleted file mode 100644
index 89f496f..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.internal;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Tests for the Cache class.
- */
-public class CacheTest extends TestCase
-{
- private Cache cache;
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(CacheTest.class);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- cache = Cache.getInstance();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-
- /**
- * Test trying to cache a resource that doesn't exist
- * on a server that does exist.
- */
- public void testGetNonExistantResource()
- {
- String resource = "http://www.eclipse.org/webtools/nonexistantfile";
- String result = cache.getResource(resource);
- cache.clear();
- assertNull("The result returned for resource " + resource + " is not null.", result);
- }
-
- /**
- * Test trying to cache a resource that doesn't exist
- * because the server doesn't exist.
- */
-// public void testGetNonExistantServer()
-// {
-// String resource = "http://www.eclipse.bad/webtools/nonexistantfile";
-// String result = cache.getResource(resource);
-// cache.clear();
-// assertNull("The result returned for resource " + resource + " is not null.", result);
-// }
-
- /**
- * Test trying to get a resource specified by null.
- */
- public void testGetNullResource()
- {
- String resource = null;
- String result = cache.getResource(resource);
- cache.clear();
- assertNull("The result returned for resource " + resource + " is not null.", result);
- }
-
- /**
- * Test trying to cache a resource that does exist.
- */
- public void testGetResourceThatExists()
- {
- String resource = "http://www.eclipse.org/webtools";
- String result = cache.getResource(resource);
- cache.clear();
- assertNotNull("The result returned for resource " + resource + " was null.", result);
- assertTrue("The result and resource are the same.", !resource.equals(result));
- }
-
- /**
- * Test to ensure the result that is returned starts with file:///
- */
- public void testResultStartsWithFile()
- {
- String resource = "http://www.eclipse.org/webtools";
- String result = cache.getResource(resource);
- cache.clear();
- assertTrue("The result does not start with file:///.", result.startsWith("file:///"));
- }
-
- /**
- * Test to ensure deleting a cache entry deletes it from the cache and
- * from the file system.
- */
- public void testDeleteCacheEntry()
- {
- String resource = "http://www.eclipse.org/webtools";
- String result = cache.getResource(resource);
- assertNotNull("The local cache file is null.", result);
- // Remove file:/// from the result.
- result = result.substring(8);
- assertTrue("The cache file " + result + " does not exist.", new File(result).exists());
- cache.deleteEntry(resource);
- assertFalse("The cache file was not deleted.", new File(result).exists());
- assertTrue("The cache still contains the deleted entry.", cache.getCachedURIs().length == 0);
- cache.clear();
- }
-
- /**
- * Test to ensure deleting a null cache entry simply returns.
- */
- public void testDeleteNullCacheEntry()
- {
- String resource = "http://www.eclipse.org/webtools";
- cache.getResource(resource);
- cache.deleteEntry(null);
- assertFalse("The cache no longer contains the entry after deleting null.", cache.getCachedURIs().length == 0);
- cache.clear();
- }
-
- /**
- * Test to ensure clearing the cache with a single entry deletes the entry
- * from the cache and deletes the file from the file system.
- */
- public void testClearCacheWithSingleEntry()
- {
- String resource1 = "http://www.eclipse.org/webtools";
- String result1 = cache.getResource(resource1);
- assertNotNull("The local cache file is null for resource1.", result1);
- // Remove file:/// from the result.
- result1 = result1.substring(8);
- assertTrue("The cache file " + result1 + " does not exist.", new File(result1).exists());
- cache.clear();
- assertFalse("The cache file for resource1 was not deleted.", new File(result1).exists());
- assertTrue("The cache still contains the deleted entries.", cache.getCachedURIs().length == 0);
- }
-
- /**
- * Test to ensure clearing the cache with multiple entries deletes the entries
- * from the cache and deletes the files from the file system.
- */
- public void testClearCacheWithMultipleEntries()
- {
- String resource1 = "http://www.eclipse.org/webtools";
- String resource2 = "http://www.eclipse.org";
- String result1 = cache.getResource(resource1);
- String result2 = cache.getResource(resource2);
- assertNotNull("The local cache file is null for resource1.", result1);
- assertNotNull("The local cache file is null for resource2.", result2);
- // Remove file:/// from the result.
- result1 = result1.substring(8);
- result2 = result2.substring(8);
- assertTrue("The cache file " + result1 + " does not exist.", new File(result1).exists());
- assertTrue("The cache file " + result2 + " does not exist.", new File(result2).exists());
- cache.clear();
- assertFalse("The cache file for resource1 was not deleted.", new File(result1).exists());
- assertFalse("The cache file for resource2 was not deleted.", new File(result2).exists());
- assertTrue("The cache still contains the deleted entries.", cache.getCachedURIs().length == 0);
- }
-
- /**
- * Test to ensure deleting a null cache entry simply returns.
- */
- public void testGetInstance()
- {
- assertNotNull("The cache object is null.", cache);
- }
-
- /**
- * Test to ensure getCacheEntries returns all of the cache entries and not entries that
- * haven't been cached.
- */
- public void testGetCacheEntries()
- {
- String resource1 = "http://www.eclipse.org/webtools";
- String resource2 = "http://www.eclipse.org";
- String resource3 = "http://www.eclipse.org/webtools/nonexistantfile";
- cache.getResource(resource1);
- cache.getResource(resource2);
- cache.getResource(resource3);
- String[] uris = cache.getCachedURIs();
- assertTrue("There are not 2 entries in the cache.", uris.length == 2);
-
- for(int i = 0; i < uris.length -1; i++)
- {
- String uri = uris[i];
- if(!(uri.equals(resource1) || uri.equals(resource2) || uri.equals(resource3)))
- {
- fail("The URI " + uri + " is not equal to any of the resources put in the cache.");
- }
- }
- cache.clear();
-
- }
-
-
-
-
-
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtensionTest.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtensionTest.java
deleted file mode 100644
index d1f1615..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/CacheURIResolverExtensionTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.internal;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Tests for the CacheURIResolverExtension class.
- */
-public class CacheURIResolverExtensionTest extends TestCase
-{
- private CacheURIResolverExtension cacheResolver;
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(CacheURIResolverExtensionTest.class);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- cacheResolver = new CacheURIResolverExtension();
- // The cache is disabled by default. We need to enable it for the tests.
- CachePlugin.getDefault().setCacheEnabled(true);
- }
-
- /**
- * Test that the result returned when a null systemId is given is null.
- */
- public void testResolveNullSystemId()
- {
- String result = cacheResolver.resolve(null,"http://www.eclipse.org/webtools", null, null);
- assertNull("The result is not null.", result);
- }
-
- /**
- * Test that the result returned when a null systemId and a null baselocation
- * are given is null.
- */
- public void testResolveNullSystemIdAndBaselocation()
- {
- String result = cacheResolver.resolve(null, null, null, null);
- assertNull("The result is not null.", result);
- }
-
- /**
- * Test that the result is sucessfully cached when an absolute systemId
- * is given.
- */
- public void testAbsoluteSystemId()
- {
- String result = cacheResolver.resolve(null,"http://www.eclipse.org/webtools", null, "http://www.eclipse.org");
- assertNotNull("The result is null.", result);
- }
-
- /**
- * Test that the result is sucessfully cached when an absolute systemId
- * is given and a null base location is given
- */
- public void testAbsoluteSystemIdNullBaselocation()
- {
- String result = cacheResolver.resolve(null, null, null, "http://www.eclipse.org");
- assertNotNull("The result is null.", result);
- }
-
- /**
- * Test that the result is sucessfully cached when a relative systemId
- * is given.
- */
- public void testRelativeSystemId()
- {
- String result = cacheResolver.resolve(null,"http://www.eclipse.org/webtools/community/somefile.xml", null, "index.php");
- assertNotNull("The result is null.", result);
- }
-
- /**
- * Test that the result is unsucessfully cached when a relative systemId
- * is given and a null base location is given.
- */
- public void testRelativeSystemIdWillNullBaselocation()
- {
- String result = cacheResolver.resolve(null, null, null, "community.html");
- assertNull("The result is not null.", result);
- }
-
- /**
- * Test that null is returned when the cache is disabled.
- */
- public void testReturnsNullWhenDisabled()
- {
- CachePlugin.getDefault().setCacheEnabled(false);
- String result = cacheResolver.resolve(null, "http://www.eclipse.org/webtools/", null, "http://www.eclipse.org/webtools/");
- assertNull("The result is not null.", result);
- CachePlugin.getDefault().setCacheEnabled(true);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryTest.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryTest.java
deleted file mode 100644
index febd010..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.internal;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class LicenseRegistryTest 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(LicenseRegistryTest.class);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- /**
- * Test adding a license to the registry. When added the registry should contain the license
- * and the license should have the unspecified value.
- */
- public void testAddLicenseToRegistry()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.addLicense(licenseURL);
- assertEquals("The registry does not have 1 license.", 1, registry.getLicensesHashtable().size());
- assertTrue("The registry does not conain the license " + licenseURL, registry.getLicensesHashtable().containsKey(licenseURL));
- assertEquals("The registry does not have the correct value for the license.", LicenseRegistryWrapper.LICENSE_UNSPECIFIED, registry.getLicensesHashtable().get(licenseURL));
- }
-
- /**
- * Test adding a license to the registry twice. The registry should only have a single entry
- * for the license.
- */
- public void testAddLicenseToRegistryTwice()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.addLicense(licenseURL);
- registry.addLicense(licenseURL);
- assertEquals("The registry contains more than one license.", 1, registry.getLicensesHashtable().size());
- }
-
- /**
- * Test agree to license method. The registry should have 'agree' registered for the license.
- */
- public void testAgreeToLicense()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.addLicense(licenseURL);
- registry.agreeLicense(licenseURL);
- assertEquals("The registry does not have the correct value for the license.", LicenseRegistryWrapper.LICENSE_AGREE, registry.getLicensesHashtable().get(licenseURL));
- }
-
- /**
- * Test agree to license that is not in the registry. The registry should not create
- * an entry for the license.
- */
- public void testAgreeToLicenseNotInRegistry()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.agreeLicense(licenseURL);
- assertEquals("The registry registered the license but it should not have.", 0, registry.getLicensesHashtable().size());
- }
-
- /**
- * Test disagree to license method. The registry should have 'disagree' registered for the license.
- */
- public void testDisgreeToLicense()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.addLicense(licenseURL);
- registry.disagreeLicense(licenseURL);
- assertEquals("The registry does not have the correct value for the license.", LicenseRegistryWrapper.LICENSE_DISAGREE, registry.getLicensesHashtable().get(licenseURL));
- }
-
- /**
- * Test disagree to license that is not in the registry. The registry should not create
- * an entry for the license.
- */
- public void testDisagreeToLicenseNotInRegistry()
- {
- String licenseURL = "http://somelicense";
- LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
- registry.agreeLicense(licenseURL);
- assertEquals("The registry registered the license but it should not have.", 0, registry.getLicensesHashtable().size());
- }
-
- /**
- * Test prompt for agree for license not in registry.
- * TODO: This test does not test what it is supposed to.
- * This test should be corrected if possible.
- */
-// public void testPromptForLicenseNotInRegistry()
-// {
-// String licenseURL = "http://somelicense";
-// LicenseRegistryWrapper registry = new LicenseRegistryWrapper();
-// assertTrue("The prompt for agreement method does not return true for a license not in the registry.", registry.promptToAcceptLicense(licenseURL, licenseURL));
-// }
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryWrapper.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryWrapper.java
deleted file mode 100644
index f94b1ea..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/internal/LicenseRegistryWrapper.java
+++ /dev/null
@@ -1,48 +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.internet.cache.internal;
-
-import java.util.Hashtable;
-
-/**
- * A wrapper for org.eclipse.wst.internet.cache.internal.LicenseRegistry
- * that allows for testing of protected methods.
- */
-public class LicenseRegistryWrapper extends LicenseRegistry
-{
- protected static Integer LICENSE_UNSPECIFIED = LicenseRegistry.LICENSE_UNSPECIFIED;
- protected static Integer LICENSE_AGREE = LicenseRegistry.LICENSE_AGREE;
- protected static Integer LICENSE_DISAGREE = LicenseRegistry.LICENSE_DISAGREE;
- protected LicenseRegistryWrapper()
- {
- super();
- }
-
- protected Hashtable getLicensesHashtable()
- {
- return licenses;
- }
-
- protected void agreeLicense(String url)
- {
- super.agreeLicense(url);
- }
-
- protected void disagreeLicense(String url)
- {
- super.disagreeLicense(url);
- }
-
- protected int promptToAcceptLicense(String url, String licenseURL)
- {
- return super.promptToAcceptLicense(url, licenseURL);
- }
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/AllCacheTests.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/AllCacheTests.java
deleted file mode 100644
index f69872f..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/AllCacheTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.internet.cache.internal.CacheEntryTest;
-import org.eclipse.wst.internet.cache.internal.CacheTest;
-import org.eclipse.wst.internet.cache.internal.CacheURIResolverExtensionTest;
-import org.eclipse.wst.internet.cache.internal.LicenseRegistryTest;
-/**
- * The root test suite that contains all other Cache test suites.
- */
-public class AllCacheTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllCacheTests();
- }
-
- /**
- * Constructor
- */
- public AllCacheTests()
- {
- super("AllCacheTests");
- addTest(CacheTest.suite());
- addTest(CacheEntryTest.suite());
- addTest(CacheURIResolverExtensionTest.suite());
- addTest(LicenseRegistryTest.suite());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/CacheTestsPlugin.java b/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/CacheTestsPlugin.java
deleted file mode 100644
index 6404a3d..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/src/org/eclipse/wst/internet/cache/tests/internal/CacheTestsPlugin.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.cache.tests.internal;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CacheTestsPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static CacheTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public CacheTestsPlugin() {
- 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 CacheTestsPlugin 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 = CacheTestsPlugin.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.internal.cache.tests.CacheTestsPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- /**
- * 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.internal.cache.tests", path);
- }
-}
diff --git a/tests/org.eclipse.wst.internet.cache.tests/test.xml b/tests/org.eclipse.wst.internet.cache.tests/test.xml
deleted file mode 100644
index e9a522b..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/test.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!--
- =====================================================
- There should be no need to change what's above.
- (if there is, let us know if the script can be improved.)
- =====================================================
- -->
-
- <!--
- Every suite needs to specify three thing:
- plugin-name,
- classname - that provides the suite to test, and
- testType - either core-test, or ui-test.
- There is an optional extraVMargs property that some tests need to use in order to specify
- extra, non-standard properties to the VM when it runs. If not need, no need to specify it.
- -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.internet.cache.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.internet.cache.tests.internal.AllCacheTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- some test suites need to add special vm arguments when they run. This is just an example.
- <property
- name="extraVMargs"
- value="-DjsfRuntimeJarsDirectoryV1.1=${testDir}/${jsf1.1Dir}" />
- <echo
- message="extraVMargs ${extraVMargs}" />
- -->
-
- <!--
- =====================================================
- There should be no need to change what's below.
- (if there is, let us know if the script can be improved.)
- =====================================================
- -->
-
- <fail
- message="Error: missing property. eclipse-home must be proved"
- unless="eclipse-home" />
- <fail
- message="Error: missing property. buildDirectory must be proved"
- unless="buildDirectory" />
- <fail
- message="Error: missing property. buildLabel must be proved"
- unless="buildLabel" />
- <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 init 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. Here it's a good idea
- to delete things that might have been created if the test has already been
- ran, just in case the test is being re-ran.
- -->
- <target
- name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
-
- <!--
- make the workspace directory, in case path doesn't exist yet
- but delete to make sure fresh contents, if it does exist
- -->
- <delete
- dir="${workspace}"
- quiet="true" />
- <mkdir
- dir="${workspace}" />
- </target>
-
- <!--
- This suite 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 clean 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, if required. But,
- it's usually best to leave it all, in case you'd like to inspect it
- after a failed run. It will be deleted eventually by the next clean build.
- -->
- <target
- name="cleanup">
-
- </target>
-
- <!--
- This run target is the master target that get's all the work done.
- Most activity is actually done in the 'depends' tasks, but any
- actions that need to happen after all the tests have been run
- should go here, such as copying the results to a common 'save'
- directory.
- -->
- <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
