This commit was manufactured by cvs2svn to create tag 'v200802180115'.
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 ad3c08e..0000000
--- a/features/org.eclipse.wst.common_tests.feature/feature.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_tests.feature"
- label="%featureName"
- version="3.0.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>
-
- <requires>
- <import feature="org.eclipse.emf.common" version="2.3.0" match="compatible"/>
- </requires>
-
- <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"/>
-
-</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 ca5ba84..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.0,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 73db36e..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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.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.ui/.classpath b/tests/org.eclipse.wst.common.tests.ui/.classpath
deleted file mode 100644
index 4a72458..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.ui/.cvsignore b/tests/org.eclipse.wst.common.tests.ui/.cvsignore
deleted file mode 100644
index f2c0c6d..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-javaCompiler.ui.jar.args
diff --git a/tests/org.eclipse.wst.common.tests.ui/.project b/tests/org.eclipse.wst.common.tests.ui/.project
deleted file mode 100644
index 8efe78d..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.ui</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.ui/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.common.tests.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9c78d3d..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Jun 03 02:20:54 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.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f045b9..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Ui_Plug-in
-Bundle-SymbolicName: org.eclipse.wst.common.tests.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-ClassPath: ui.jar
-Bundle-Activator: org.eclipse.wst.common.tests.ui.UiPlugin
-Bundle-Vendor: %Eclipse
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.tests.ui,
- org.eclipse.wst.common.tests.ui.manager,
- org.eclipse.wst.common.tests.ui.wizard
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.tests,
- org.eclipse.wst.common.environment
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.common.tests.ui/about.html b/tests/org.eclipse.wst.common.tests.ui/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.common.tests.ui/build.properties b/tests/org.eclipse.wst.common.tests.ui/build.properties
deleted file mode 100644
index cee1739..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.ui.jar = src/
-output.ui.jar = bin/
-bin.includes = plugin.xml,\
- ui.jar,\
- about.html,\
- plugin.properties,\
- META-INF/
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.properties b/tests/org.eclipse.wst.common.tests.ui/plugin.properties
deleted file mode 100644
index 43069c8..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Ui_Plug-in=Test Ui Plug-in
-Eclipse=Eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.xml b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
deleted file mode 100644
index b2e5a66..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/plugin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.wst.common.tests.collector.suites">
- <suite
- class="org.eclipse.wst.common.tests.ui.DataModelUIAPITests"
- name="DataModel UI API Tests">
- </suite>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.DataModelWizardExtension">
- <DataModelWizard
- class="org.eclipse.wst.common.tests.ui.TestDataModelWizard"
- id="org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wizardPageGroup">
- <wizardPageGroup
- pageGroupID="foo"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory"/>
- </wizardPageGroup>
- <wizardPageGroup
- pageGroupID="bar"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory2"/>
- </wizardPageGroup>
- <wizardPageGroup
- pageGroupID="foobar"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory3"/>
- </wizardPageGroup>
- </extension>
-
- <!--
- A picture of the operation tree
- /**
- * Operations are organized as follows: <code>
- * D
- * / \
- * / \
- * B F
- * / \ / \
- * A C E G
- * </code>
- */
- -->
-
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension"
- id="org.eclipse.wst.common.tests.ui.manager">
- <operationExtension
- id="org.eclipse.wst.common.tests.ui.manager.D"
- postOperationClass="org.eclipse.wst.common.tests.ui.manager.F"
- preOperationClass="org.eclipse.wst.common.tests.ui.manager.B"/>
- <operationExtension
- id="org.eclipse.wst.common.tests.ui.manager.B"
- postOperationClass="org.eclipse.wst.common.tests.ui.manager.C"
- preOperationClass="org.eclipse.wst.common.tests.ui.manager.A"/>
- <operationExtension
- id="org.eclipse.wst.common.tests.ui.manager.F"
- postOperationClass="org.eclipse.wst.common.tests.ui.manager.G"
- preOperationClass="org.eclipse.wst.common.tests.ui.manager.E"/>
- </extension>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
deleted file mode 100644
index b7f3581..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-import org.eclipse.wst.common.tests.ui.wizard.TestWizardTestcase;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class DataModelUIAPITests extends TestSuite {
-
- public static Test suite() {
- return new DataModelUIAPITests();
- }
-
- public DataModelUIAPITests() {
- super();
- addTest(new SimpleTestSuite(DataModelUIFactoryTest.class));
- addTest(new SimpleTestSuite(TestWizardTestcase.class));
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
deleted file mode 100644
index 5f2d281..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardFactory;
-
-public class DataModelUIFactoryTest extends TestCase {
-
- public void testValidExtensionID() {
- IDataModel dataModel = DataModelFactory.createDataModel("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
- assertNotNull(wizard);
- assertNotNull(wizard.getDataModel());
- }
-
-
- public void testValidExtensionClass() {
- IDataModel dataModel = DataModelFactory.createDataModel(ITestDataModel.class);
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard(ITestDataModel.class);
- assertNotNull(wizard);
- assertNotNull(wizard.getDataModel());
- }
-
- public void testValidExtensionInstance() {
- int startInstanceCount = TestDataModelProvider.getInstanceCount();
- IDataModel dataModel = DataModelFactory.createDataModel(new TestDataModelProvider());
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard(dataModel);
- assertNotNull(wizard);
- assertTrue(dataModel == wizard.getDataModel());
- int endInstanceCount = TestDataModelProvider.getInstanceCount();
- assertEquals(1, endInstanceCount-startInstanceCount);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
deleted file mode 100644
index b6044c4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class TestDataModelWizard extends DataModelWizard {
-
- public TestDataModelWizard() {
- super();
- }
-
- public TestDataModelWizard(IDataModel dataModel) {
- super(dataModel);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new TestDataModelProvider();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
deleted file mode 100644
index 976fc6e..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.wst.common.tests.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static UiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public UiPlugin() {
- 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 UiPlugin 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 = UiPlugin.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.common.tests.ui.UiPluginResources"); //$NON-NLS-1$
- } 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.common.tests.ui", path); //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/A.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/A.java
deleted file mode 100644
index e0a7f57..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/A.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class A extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/B.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/B.java
deleted file mode 100644
index ce641b4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/B.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class B extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/BaseOperation.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/BaseOperation.java
deleted file mode 100644
index e72b1f6..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/BaseOperation.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class BaseOperation extends AbstractDataModelOperation {
- public static Vector resultList;
- public static Vector undoList;
- private IStatus status;
- private boolean checkModels;
- private boolean modelsOK = false;
-
- public BaseOperation() {
- super();
- }
-
- public void setStatus(IStatus status) {
- this.status = status;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- resultList.add(getID());
-
- getDataModel().setProperty("executedOps", resultList);
- getDataModel().setProperty("executedUndoOps", undoList);
- if (checkModels)
- modelsOK = checkModels();
-
- getEnvironment().getLog().log(ILog.OK, 1234, this, "BaseOperation", (Throwable) null); //$NON-NLS-1$
-
- return status;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- resultList.remove(resultList.size() - 1);
- undoList.add(getID());
- return Status.OK_STATUS;
- }
-
- public void setCheckModels(boolean checkModels) {
- this.checkModels = checkModels;
- }
-
- public boolean getModelsOK() {
- return modelsOK;
- }
-
- private boolean checkModels() {
- IDataModel model = getDataModel();
-
- boolean containsModel1 = model.isNestedModel("testprovider1");
- boolean containsModel2 = model.isNestedModel("testprovider2");
- boolean prop1 = model.isPropertySet("provider1Prop1");
- boolean prop2 = model.isPropertySet("provider1Prop2");
- boolean prop3 = model.isPropertySet("provider1Prop3");
- boolean prop4 = model.isPropertySet("provider1Prop4");
- boolean prop5 = model.isPropertySet("provider2Prop1");
- boolean prop6 = model.isPropertySet("provider2Prop2");
- boolean prop7 = model.isPropertySet("provider2Prop3");
- boolean prop8 = model.isPropertySet("provider2Prop4");
- boolean value1 = model.getProperty("provider1Prop1").equals("11");
- boolean value2 = model.getProperty("provider1Prop2").equals("22");
- boolean value3 = model.getProperty("provider1Prop3").equals("33");
- boolean value4 = model.getProperty("provider1Prop4").equals("44");
- boolean value5 = model.getProperty("provider2Prop1").equals("1111");
- boolean value6 = model.getProperty("provider2Prop2").equals("2222");
- boolean value7 = model.getProperty("provider2Prop3").equals("3333");
- boolean value8 = model.getProperty("provider2Prop4").equals("4444");
-
- return containsModel1 && containsModel2 && prop1 && prop2 && prop3 && prop4 && prop5 && prop6 && prop7 && prop8 && value1 && value2 && value3 && value4 && value5 && value6 && value7 && value8;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/C.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/C.java
deleted file mode 100644
index f29751b..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/C.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class C extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/D.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/D.java
deleted file mode 100644
index b4aad22..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/D.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class D extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/E.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/E.java
deleted file mode 100644
index 600c671..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/E.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class E extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/F.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/F.java
deleted file mode 100644
index f42328e..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/F.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class F extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/G.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/G.java
deleted file mode 100644
index 4f8a40f..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/G.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-public class G extends BaseOperation {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java
deleted file mode 100644
index 7610e30..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestExtendedProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-import java.util.Set;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public class TestExtendedProvider extends AbstractDataModelProvider
-{
- public Set getPropertyNames(){
- Set propertyNames = super.getPropertyNames();
- propertyNames.add("executedOps");
- propertyNames.add("executedUndoOps");
-
- return propertyNames;
- }
-
- public void init()
- {
- }
-
- public String getID()
- {
- return "TestExtendedProvider";
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
deleted file mode 100644
index 6443deb..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelPausibleOperationImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.IDataModelPausibleOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.PageGroupManager;
-
-public class TestGroupManager extends TestCase {
-
- private IDataModelPausibleOperation rootOperation;
-
- private PageGroupManager pageGroupManager;
- private SimplePageGroup pgA;
- private SimplePageGroup pgB;
- private SimplePageGroup pgC;
- private SimplePageGroup pgD;
- private SimplePageGroup pgE;
- private SimplePageGroup pgF;
- private SimplePageGroup pgG;
- private SimplePageGroup pgH;
- private SimplePageGroup pgRoot;
- private WizardPage r1;
- private WizardPage b1;
- private WizardPage b2;
- private WizardPage c1;
- private WizardPage d1;
- private WizardPage d2;
- private WizardPage d3;
- private WizardPage f1;
- private WizardPage f2;
- private WizardPage f3;
- private WizardPage f4;
- private WizardPage f5;
- private WizardPage f6;
- private WizardPage g1;
-
- private AGroupHandler aGroupHandler;
- private FGroupHandler fGroupHandler;
- private Vector expectedOps;
- private Vector expectedUndoOps;
- private IDataModel dataModel;
-
- public static final String a = A.class.getName();
- public static final String b = B.class.getName();
- public static final String c = C.class.getName();
- public static final String d = D.class.getName();
- public static final String e = E.class.getName();
- public static final String f = F.class.getName();
- public static final String g = G.class.getName();
-
-
- protected void setUp() throws Exception {
- super.setUp();
- BaseOperation.resultList = new Vector();
- BaseOperation.undoList = new Vector();
-
- expectedOps = new Vector();
- expectedUndoOps = new Vector();
- dataModel = new DataModelImpl(new EmptyProvider());
- dataModel.addNestedModel("testprovider1", DataModelFactory.createDataModel(new TestProvider1()));
- dataModel.addNestedModel("testprovider2", DataModelFactory.createDataModel(new TestProvider2()));
- dataModel.addNestedModel("testextendedprovider", DataModelFactory.createDataModel(new TestExtendedProvider()));
-
- /**
- * Operations are organized as follows: <code>
- * D
- * / \
- * / \
- * B F
- * / \ / \
- * A C E G
- * </code>
- */
- rootOperation = new DataModelPausibleOperationImpl(new D());
- rootOperation.setDataModel(dataModel);
- rootOperation.setEnvironment(EnvironmentService.getEclipseConsoleEnvironment());
-
- /**
- * Page groups are organized as follows:
- *
- * <code>
- *
- * B - C
- * / \
- * Root - A - D \ G
- * \ \ /
- * ------ E - F - H
- * \ null
- * </code>
- */
-
- // The page group handler for A will return either B and then E or D and
- // then E. The group handler for F will return either G or H and then null or
- // just null.
- //
- // Some of these group require operations to run first:
- //
- // Page group B requires operation C.
- // Page group D requires operation C.
- // Page group E requires operation E.
- // Page group F requires operation C.( C will already have been run and should not be
- // rerun.)
- //
- // Each page group has some pages associated with it as follows:
- //
- // Root has page r1.
- // A has no pages.
- // B has b1 and b2.
- // C has c1
- // D has d1, d2, and d3
- // E has no pages.
- // F has pages f1, f2, f3, f4, f5, f6
- // the page handler for F will return the following:
- // expected = f1 returns f1
- // expected = f2 returns skip
- // expected = f3 returns before f6
- // expected = f4 returns null
- // expected = f5 returns after f5
- // expected = f6 returns f4
- // G has pages g1
- // H has no pages.
- r1 = new WizardPage("r1"); //$NON-NLS-1$
- b1 = new WizardPage("b1"); //$NON-NLS-1$
- b2 = new WizardPage("b2"); //$NON-NLS-1$
- c1 = new WizardPage("c1"); //$NON-NLS-1$
- d1 = new WizardPage("d1"); //$NON-NLS-1$
- d2 = new WizardPage("d2"); //$NON-NLS-1$
- d3 = new WizardPage("d3"); //$NON-NLS-1$
- f1 = new WizardPage("f1"); //$NON-NLS-1$
- f2 = new WizardPage("f2"); //$NON-NLS-1$
- f3 = new WizardPage("f3"); //$NON-NLS-1$
- f4 = new WizardPage("f4"); //$NON-NLS-1$
- f5 = new WizardPage("f5"); //$NON-NLS-1$
- f6 = new WizardPage("f6"); //$NON-NLS-1$
- g1 = new WizardPage("g1"); //$NON-NLS-1$
-
- String wizardID = "testWizard"; //$NON-NLS-1$
-
- pgRoot = new SimplePageGroup("Root", wizardID); //$NON-NLS-1$
- pgA = new SimplePageGroup("A", wizardID); //$NON-NLS-1$
- pgB = new SimplePageGroup("B", wizardID, true, c); //$NON-NLS-1$ //$NON-NLS-2$
- pgC = new SimplePageGroup("C", wizardID); //$NON-NLS-1$
- pgD = new SimplePageGroup("D", wizardID, true, c); //$NON-NLS-1$ //$NON-NLS-2$
- pgE = new SimplePageGroup("E", wizardID, true, e); //$NON-NLS-1$ //$NON-NLS-2$
- pgF = new SimplePageGroup("F", wizardID, true, c); //$NON-NLS-1$ //$NON-NLS-2$
- pgG = new SimplePageGroup("G", wizardID); //$NON-NLS-1$
- pgH = new SimplePageGroup("H", wizardID); //$NON-NLS-1$
-
- pgRoot.addPages(new WizardPage[]{r1});
- pgB.addPages(new WizardPage[]{b1, b2});
- pgC.addPages(new WizardPage[]{c1});
- pgD.addPages(new WizardPage[]{d1, d2, d3});
- pgF.addPages(new WizardPage[]{f1, f2, f3, f4, f5, f6});
- pgG.addPages(new WizardPage[]{g1});
-
- pgF.setPageHandler(new FPageHandler());
-
- aGroupHandler = new AGroupHandler();
- fGroupHandler = new FGroupHandler();
-
- pgA.setPageGroupHandler(aGroupHandler);
- pgF.setPageGroupHandler(fGroupHandler);
-
- pageGroupManager = new PageGroupManager(rootOperation, pgRoot);
- pageGroupManager.addGroupAfter("Root", pgA); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgB); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgD); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgE); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("B", pgC); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("E", pgF); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("F", pgG); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("F", pgH); //$NON-NLS-1$
- }
-
- public void testSimpleRun() throws Exception {
- HashSet ids = new HashSet();
- ids.add("testprovider1");
- ids.add("testprovider2");
- pgA.setDataModelIDs(ids);
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The root page should be null", pageGroupManager.getCurrentPage() == null); //$NON-NLS-1$
- pageGroupManager.moveBackOnePage(); // Should do nothing.
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- aGroupHandler.setGroupIDToSelect("B"); //$NON-NLS-1$
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be r1", pageGroupManager.getCurrentPage() == r1); //$NON-NLS-1$
- checkResults();
- assertTrue("Data models not Ok for page group A", checkDataModels()); //$NON-NLS-1$
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b1", pageGroupManager.getCurrentPage() == b1); //$NON-NLS-1$
- expectedOps.add(a);
- expectedOps.add(b);
- expectedOps.add(c);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b2", pageGroupManager.getCurrentPage() == b2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be c1", pageGroupManager.getCurrentPage() == c1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f1", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- expectedOps.add(d);
- expectedOps.add(e);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f3", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f5", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f6", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- fGroupHandler.setGroupIDToSelect("G"); //$NON-NLS-1$
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertFalse("There should not be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be g1", pageGroupManager.getCurrentPage() == g1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == c1); //$NON-NLS-1$
- expectedOps.setSize(3);
- expectedUndoOps.add(e);
- expectedUndoOps.add(d);
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b2", pageGroupManager.getCurrentPage() == b2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b1", pageGroupManager.getCurrentPage() == b1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The root page should be r1", pageGroupManager.getCurrentPage() == r1); //$NON-NLS-1$
- expectedOps = new Vector();
- expectedUndoOps.add(c);
- expectedUndoOps.add(b);
- expectedUndoOps.add(a);
- checkResults();
-
- reset();
- aGroupHandler.setGroupIDToSelect("D"); //$NON-NLS-1$
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d1", pageGroupManager.getCurrentPage() == d1); //$NON-NLS-1$
- expectedOps.add(a);
- expectedOps.add(b);
- expectedOps.add(c);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d2", pageGroupManager.getCurrentPage() == d2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d3", pageGroupManager.getCurrentPage() == d3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f1", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- expectedOps.add(d);
- expectedOps.add(e);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f3", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f5", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f6", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- fGroupHandler.setGroupIDToSelect(null);
- assertFalse("There should not be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
- }
-
- private void checkResults() {
- assertTrue("Expected=" + expectedOps.size() + " executed=" + BaseOperation.resultList.size(), BaseOperation.resultList.size() == expectedOps.size()); //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int index = 0; index < BaseOperation.resultList.size(); index++) {
- assertEquals(expectedOps.elementAt(index), BaseOperation.resultList.elementAt(index));
- }
-
- assertTrue("Expected undo=" + expectedUndoOps.size() + " executed=" + BaseOperation.undoList.size(), BaseOperation.undoList.size() == expectedUndoOps.size()); //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int index = 0; index < BaseOperation.undoList.size(); index++) {
- assertEquals(expectedUndoOps.elementAt(index), BaseOperation.undoList.elementAt(index));
- }
- }
-
- private void reset() {
- BaseOperation.resultList.removeAllElements();
- expectedOps.removeAllElements();
- BaseOperation.undoList.removeAllElements();
- expectedUndoOps.removeAllElements();
- }
-
- private boolean checkDataModels() {
- IDataModel model = dataModel;
-
- boolean containsModel1 = model.isNestedModel("testprovider1");
- boolean containsModel2 = model.isNestedModel("testprovider2");
- boolean prop1 = model.isPropertySet("provider1Prop1");
- boolean prop2 = model.isPropertySet("provider1Prop2");
- boolean prop3 = model.isPropertySet("provider1Prop3");
- boolean prop4 = model.isPropertySet("provider1Prop4");
- boolean prop5 = model.isPropertySet("provider2Prop1");
- boolean prop6 = model.isPropertySet("provider2Prop2");
- boolean prop7 = model.isPropertySet("provider2Prop3");
- boolean prop8 = model.isPropertySet("provider2Prop4");
- boolean value1 = model.getProperty("provider1Prop1").equals("11");
- boolean value2 = model.getProperty("provider1Prop2").equals("22");
- boolean value3 = model.getProperty("provider1Prop3").equals("33");
- boolean value4 = model.getProperty("provider1Prop4").equals("44");
- boolean value5 = model.getProperty("provider2Prop1").equals("1111");
- boolean value6 = model.getProperty("provider2Prop2").equals("2222");
- boolean value7 = model.getProperty("provider2Prop3").equals("3333");
- boolean value8 = model.getProperty("provider2Prop4").equals("4444");
-
- return containsModel1 && containsModel2 && prop1 && prop2 && prop3 && prop4 && prop5 && prop6 && prop7 && prop8 && value1 && value2 && value3 && value4 && value5 && value6 && value7 && value8;
- }
-
- private class AGroupHandler implements IDMPageGroupHandler {
- private String groupID_;
-
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- String result = null;
-
- if (currentPageGroupID == null) {
- result = groupID_;
- } else if (currentPageGroupID.equals("E")) { //$NON-NLS-1$
- result = null;
- } else {
- result = "E"; //$NON-NLS-1$
- }
-
- return result;
- }
-
- public void setGroupIDToSelect(String id) {
- groupID_ = id;
- }
- }
-
- private class FGroupHandler implements IDMPageGroupHandler {
- private String groupID_;
-
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- if (currentPageGroupID == null)
- return groupID_;
-
- return null;
- }
-
- public void setGroupIDToSelect(String id) {
- groupID_ = id;
- }
- }
-
- //
- // F has pages f1, f2, f3, f4, f5, f6
- // the page handler for F will return the following:
- // expected = f1 returns f1
- // expected = f2 returns skip
- // expected = f3 returns before f6
- // expected = f4 returns null
- // expected = f5 returns after f5
- // expected = f6 returns f4
- //
- // This handle should cause the following pages to be used.
- // f1, f3, f5, f6, f4, null
- //
- private class FPageHandler implements IDMPageHandler {
- public String getNextPage(String currentPageName, String expectedNextPageName) {
- String result = null;
-
- if (currentPageName == null) {
- result = "f1"; //$NON-NLS-1$
- } else if (currentPageName.equals("f1")) { //$NON-NLS-1$
- result = IDMPageHandler.SKIP_PAGE;
- } else if (currentPageName.equals("f3")) { //$NON-NLS-1$
- result = IDMPageHandler.PAGE_BEFORE + "f6"; //$NON-NLS-1$
- } else if (currentPageName.equals("f4")) { //$NON-NLS-1$
- result = null;
- } else if (currentPageName.equals("f5")) { //$NON-NLS-1$
- result = IDMPageHandler.PAGE_AFTER + "f5"; //$NON-NLS-1$
- } else if (currentPageName.equals("f6")) { //$NON-NLS-1$
- result = "f4"; //$NON-NLS-1$
- }
-
- return result;
- }
-
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
- return expectedPreviousPageName;
- }
-
- }
-
- private class EmptyProvider extends AbstractDataModelProvider {
-
- public Set getPropertyNames() {
- return new HashSet();
- }
- }
-
- private class WizardPage extends DataModelWizardPage {
- private boolean canFinish_ = true;
-
- public WizardPage(String id) {
- super(dataModel, id);
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- return null;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-
- public void setCanFinish(boolean canFinish) {
- canFinish_ = canFinish;
- }
-
- public boolean canPageFinish() {
- return canFinish_;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java
deleted file mode 100644
index 996b02f..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-import java.util.Set;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public class TestProvider1 extends AbstractDataModelProvider
-{
- public Set getPropertyNames(){
- Set propertyNames = super.getPropertyNames();
- propertyNames.add("provider1Prop1");
- propertyNames.add("provider1Prop2");
- propertyNames.add("provider1Prop3");
- propertyNames.add("provider1Prop4");
-
- return propertyNames;
- }
-
- public void init()
- {
- setProperty( "provider1Prop1", "11" );
- setProperty( "provider1Prop2", "22" );
- setProperty( "provider1Prop3", "33" );
- setProperty( "provider1Prop4", "44" );
- }
-
- public String getID()
- {
- return "testprovider1";
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java
deleted file mode 100644
index 670149d..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestProvider2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.manager;
-
-import java.util.Set;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public class TestProvider2 extends AbstractDataModelProvider
-{
- public Set getPropertyNames(){
- Set propertyNames = super.getPropertyNames();
- propertyNames.add("provider2Prop1");
- propertyNames.add("provider2Prop2");
- propertyNames.add("provider2Prop3");
- propertyNames.add("provider2Prop4");
-
- return propertyNames;
- }
-
- public void init()
- {
- setProperty( "provider2Prop1", "1111" );
- setProperty( "provider2Prop2", "2222" );
- setProperty( "provider2Prop3", "3333" );
- setProperty( "provider2Prop4", "4444" );
- }
-
- public String getID()
- {
- return "testprovider2";
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java
deleted file mode 100644
index d619d48..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public class Test2DataModelProvider extends AbstractDataModelProvider {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java
deleted file mode 100644
index 63eb6e6..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.AddablePageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.SimplePageGroupHandler;
-
-public class Test2DataModelWizard extends DataModelWizard {
-
- protected IDataModelProvider getDefaultProvider() {
- return new Test2DataModelProvider();
- }
-
- protected AddablePageGroup createRootPageGroup() {
- SimplePageGroup pg = (SimplePageGroup) super.createRootPageGroup();
- pg.setPageGroupHandler(new SimplePageGroupHandler() {
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- if (currentPageGroupID == null) {
- for (int i = 0; i < pageGroupIDs.length; i++) {
- if (pageGroupIDs[i].equals("bar")) { //$NON-NLS-1$
- return "bar"; //$NON-NLS-1$
- }
- }
- }
- return super.getNextPageGroup(currentPageGroupID, pageGroupIDs);
- }
- });
- return pg;
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java
deleted file mode 100644
index 3e369ad..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.DMWizardExtensionFactory;
-
-public class Test2DataModelWizardFactory extends DMWizardExtensionFactory {
-
- protected String getPageName() {
- return "A Page"; //$NON-NLS-1$
- }
-
- protected IDataModelProvider getProvider(){
- return new Test2DataModelProvider(){
- public IDataModelOperation getDefaultOperation() {
- return new AbstractDataModelOperation(){
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println(getPageName());
- return OK_STATUS;
- }
- };
- }
- };
- }
-
- public DataModelWizardPage[] createPageGroup(IDataModel dataModel, String pageGroupID) {
- return new DataModelWizardPage[]{new DataModelWizardPage(DataModelFactory.createDataModel(getProvider()), getPageName()) {
- protected String[] getValidationPropertyNames() {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- Label label = new Label(composite, SWT.NULL);
- label.setLayoutData(data);
- label.setText(getPageName());
- return composite;
- }
- }};
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java
deleted file mode 100644
index 0f758a7..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-public class Test2DataModelWizardFactory2 extends Test2DataModelWizardFactory {
-
- protected String getPageName() {
- return "A Better Page"; //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java
deleted file mode 100644
index 891e403..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-public class Test2DataModelWizardFactory3 extends Test2DataModelWizardFactory {
-
- protected String getPageName() {
- return "Another Page, but not better"; //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
deleted file mode 100644
index 5fb74f4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class TestDataModelProvider extends AbstractDataModelProvider {
- public String getID() {
- return "TestWizardID"; //$NON-NLS-1$
- }
-
- public Set getPropertyNames() {
- HashSet result = new HashSet();
-
- result.add("prop1"); //$NON-NLS-1$
- result.add("prop2"); //$NON-NLS-1$
-
- return result;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new TestOperation();
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
deleted file mode 100644
index ce6dde7..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.AddablePageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.PageGroupManager;
-
-public class TestDataWizard extends DataModelWizard {
- private SimplePageGroup root;
-
- public TestDataWizard() {
- setForcePreviousAndNextButtons(true);
- setNeedsProgressMonitor(true);
- }
-
- protected void doAddPages() {
- PageGroupManager pageManager = getPageGroupManager();
- pageManager.addGroupAfter(root.getPageGroupID(), new TestPageGroup2(getDataModel()));
-
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new TestDataModelProvider();
- }
-
- protected AddablePageGroup createRootPageGroup() {
- root = new TestRootPageGroup(getDataModel());
-
- return root;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
deleted file mode 100644
index ecf4a34..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class TestOperation extends AbstractDataModelOperation {
-
- public TestOperation() {
- setID("TestOperation"); //$NON-NLS-1$
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println("In execute: data model=" + getDataModel()); //$NON-NLS-1$
-
- try {
- monitor.beginTask("Test operation: ", 5); //$NON-NLS-1$
- for (int index = 1; index < 6; index++) {
- monitor.subTask("part " + index + " of 5 complete."); //$NON-NLS-1$ //$NON-NLS-2$
- Thread.sleep(1000);
- }
- } catch (Exception exc) {
- throw new ExecutionException("execute threw and exception ", exc); //$NON-NLS-1$
- }
-
- return Status.OK_STATUS;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println("Undo test operation"); //$NON-NLS-1$
-
- return Status.OK_STATUS;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
deleted file mode 100644
index 62a71b4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.swt.SWT;
-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.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class TestPage1 extends DataModelWizardPage {
- public TestPage1(IDataModel model) {
- super(model, "Page1"); //$NON-NLS-1$
- setTitle("Title for test page1"); //$NON-NLS-1$
- setDescription("Description for test page 1"); //$NON-NLS-1$
- }
-
- public boolean canPageFinish() {
- return true;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite group = new Composite(parent, SWT.NONE);
- Button button1 = new Button(group, SWT.PUSH);
- Button button2 = new Button(group, SWT.PUSH);
-
- button1.setText("Button1"); //$NON-NLS-1$
- button2.setText("Button2"); //$NON-NLS-1$
- group.setLayout(new GridLayout());
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- return group;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
deleted file mode 100644
index 78963f9..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.swt.SWT;
-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.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class TestPage2 extends DataModelWizardPage {
- public TestPage2(IDataModel model) {
- super(model, "Page2"); //$NON-NLS-1$
- setTitle("Title for test page2"); //$NON-NLS-1$
- setDescription("Description for test page 2"); //$NON-NLS-1$
- }
-
- public boolean canPageFinish() {
- return true;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite group = new Composite(parent, SWT.NONE);
- Button button1 = new Button(group, SWT.PUSH);
- Button button2 = new Button(group, SWT.PUSH);
-
- button1.setText("Page 2 button1"); //$NON-NLS-1$
- button2.setText("Page 2 button2"); //$NON-NLS-1$
- group.setLayout(new GridLayout());
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- return group;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
deleted file mode 100644
index 98a8355..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-
-public class TestPageGroup2 extends SimplePageGroup {
- private IDataModel dataModel;
-
- public TestPageGroup2(IDataModel dataModel) {
- super("group2", dataModel.getID(), true, "TestOperation"); //$NON-NLS-1$ //$NON-NLS-2$
- this.dataModel = dataModel;
-
- addPages(new IWizardPage[]{new TestPage2(this.dataModel)});
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
deleted file mode 100644
index ad285b9..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-
-public class TestRootPageGroup extends SimplePageGroup {
- private IDataModel dataModel;
-
- public TestRootPageGroup(IDataModel dataModel) {
- super(dataModel.getID(), dataModel.getID());
- this.dataModel = dataModel;
-
- addPages(new IWizardPage[]{new TestPage1(this.dataModel)});
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
deleted file mode 100644
index 0d05a9b..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-
-import junit.framework.TestCase;
-
-public class TestWizardTestcase extends TestCase {
- private TestDataWizard wizard_;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- wizard_ = new TestDataWizard();
- }
-
- public void testSimpleWizard() throws Exception {
- WizardDialog dialog = new WizardDialog(null, wizard_);
-
- dialog.open();
- }
-
- public void test2DataModelWizard() throws Exception {
- Display.getDefault().syncExec( new Runnable(){
- public void run() {
- WizardDialog dialog = new WizardDialog(null, new Test2DataModelWizard());
- dialog.open();
- }
- });
- }
-}
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 6196371..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.internet.cache.tests
-Bundle-Version: 1.0.0
-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.0,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
-
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 73db36e..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 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.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 1f2a6d9..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, "community.html");
- 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 1b5532f..0000000
--- a/tests/org.eclipse.wst.internet.cache.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.internet.cache.tests"/>
-
- <!-- End Configurable Properties -->
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
- <property name="bvtworkspace" value="${basedir}"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.internet.cache.tests.*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <!-- Start with clean data workspace -->
- <delete dir="${workspace-folder}" quiet="true"/>
-
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.internet.cache.tests.internal.AllCacheTests"/>
- </ant>
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <delete dir="${workspace-folder}" quiet="true"/>
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.internet.cache.tests*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
