This commit was manufactured by cvs2svn to create tag 'v201107062115'.
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore b/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/.project b/features/org.eclipse.wst.jsdt_tests.feature/.project
deleted file mode 100644
index 808c20f..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.jsdt_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.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 06da1cb..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Dec 12 03:20:23 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/build.properties b/features/org.eclipse.wst.jsdt_tests.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.jsdt_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/epl-v10.html b/features/org.eclipse.wst.jsdt_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.jsdt_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.jsdt_tests.feature/feature.properties b/features/org.eclipse.wst.jsdt_tests.feature/feature.properties
deleted file mode 100644
index 791fb8b..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# 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=JSDT Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JSDT Tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
deleted file mode 100644
index 552b0ff..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.jsdt_tests.feature"
- label="%featureName"
- version="1.2.4.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.wst.jsdt.core.tests.compiler"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.core.tests.model"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wtp.releng.versionchecker"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wtp.releng.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.debug.rhino.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.debug.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/license.html b/features/org.eclipse.wst.jsdt_tests.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.wst.jsdt_tests.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "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 Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/.classpath b/tests/org.eclipse.wst.jsdt.debug.core.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/.project b/tests/org.eclipse.wst.jsdt.debug.core.tests/.project
deleted file mode 100644
index df3f8b1..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.jsdt.debug.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.jsdt.debug.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 511619d..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,90 +0,0 @@
-#Fri Apr 30 10:07:37 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=error
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 98ab7b3..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.core.tests;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.debug.core.tests.JSDTDebugTestPlugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.jsdt.debug.core,
- org.junit;bundle-version="3.8.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 4caad9a..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Bundle-Vendor = Eclipse Web Tools Platform
-Bundle-Name = JavaScript Debug Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/about.html b/tests/org.eclipse.wst.jsdt.debug.core.tests/about.html
deleted file mode 100755
index b4a1c56..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>March 10, 2010</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/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>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties
deleted file mode 100644
index f313e95..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/l10n/bundle.properties,\
- about.html
-src.includes = about.html
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/src/org/eclipse/wst/debug/core/tests/JSDTDebugTestPlugin.java b/tests/org.eclipse.wst.jsdt.debug.core.tests/src/org/eclipse/wst/debug/core/tests/JSDTDebugTestPlugin.java
deleted file mode 100644
index ec54e6a..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/src/org/eclipse/wst/debug/core/tests/JSDTDebugTestPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.debug.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JSDTDebugTestPlugin extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.debug.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static JSDTDebugTestPlugin plugin;
-
- /**
- * The constructor
- */
- public JSDTDebugTestPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JSDTDebugTestPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.classpath b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.project b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.project
deleted file mode 100644
index 4a3e5b3..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.jsdt.debug.rhino.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5401c86..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,90 +0,0 @@
-#Fri Apr 30 10:07:14 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=error
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d1129e..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.rhino.tests;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="3.8.2",
- org.eclipse.wst.jsdt.debug.core,
- org.eclipse.wst.jsdt.debug.rhino,
- org.eclipse.wst.jsdt.debug.rhino.debugger;bundle-version="1.0.0",
- org.mozilla.javascript;bundle-version="1.7.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: %Bundle-Vendor
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 166091e..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Bundle-Vendor = Eclipse Web Tools Platform
-Bundle-Name = Rhino JavaScript Debug Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/about.html b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/about.html
deleted file mode 100755
index b4a1c56..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>March 10, 2010</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/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>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties
deleted file mode 100644
index 5596258..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- test.xml,\
- OSGI-INF/l10n/bundle.properties,\
- about.html,\
- scripts/
-src.includes = about.html
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/scripts/script1.js b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/scripts/script1.js
deleted file mode 100644
index b22318e..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/scripts/script1.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var line1 = true;
-function test() { //line 2
- return "line 3"; //line 3
-}//line 4
-// line 5
-var line6 = test();
-var line7 = test();
-// line 8
-// line 9
-var line10 = test();
-// line 11
-// line 12
-function test2() { // line 13
- return "line 14"; //line 14
-} // line 15
-// line 16
-// line 17
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java
deleted file mode 100644
index 0515229..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-/**
- * Variety of tests for requesting breakpoint(s)
- *
- * @since 1.1
- */
-public class BreakpointRequestTests extends RequestTest {
-
- /**
- * Tests that asking for an invalid breakpoint returns an unsuccessful response
- *
- * @throws Exception
- */
- public void testInvalidBreakpoint() throws Exception {
- Request request = new Request(JSONConstants.BREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, new Integer("9999")); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertFalse(response.isSuccess());
- }
-
-
- /**
- * Tests asking for all breakpoints when none have been set
- *
- * @throws Exception
- */
- public void testBreakpointsWithNoBreakpoints() throws Exception {
- Request request = new Request(JSONConstants.BREAKPOINTS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection breakpoints = (Collection) response.getBody().get(JSONConstants.BREAKPOINTS);
- assertNotNull(breakpoints);
- assertTrue(breakpoints.isEmpty());
- }
-
- /**
- * Tests trying to clear an invalid breakpoint id
- * @throws Exception
- */
- public void testClearInvalidBreakpoint() throws Exception {
- Request request = new Request(JSONConstants.CLEARBREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, new Integer("9999")); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertFalse(response.isSuccess());
- }
-
- /**
- * Tests setting a breakpoint on every valid line of the test script and verifying they exist
- *
- * @throws Exception
- */
- public void testBreakpoints() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointsHandler());
-
- Request request = new Request(JSONConstants.BREAKPOINTS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection breakpoints = (Collection) response.getBody().get(JSONConstants.BREAKPOINTS);
- assertNotNull(breakpoints);
- assertTrue(breakpoints.isEmpty());
-
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
-
- evalScript(script, 1);
-
- request = new Request(JSONConstants.BREAKPOINTS);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- breakpoints = (Collection) response.getBody().get(JSONConstants.BREAKPOINTS);
- assertNotNull(breakpoints);
- assertEquals(7, breakpoints.size());
-
- for (Iterator iterator = breakpoints.iterator(); iterator.hasNext();) {
- Number breakpointId = (Number) iterator.next();
- request = new Request(JSONConstants.BREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, breakpointId);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Map breakpoint = (Map) response.getBody().get(JSONConstants.BREAKPOINT);
- assertEquals(breakpointId.intValue(), Util.numberAsInt(breakpoint.get(JSONConstants.BREAKPOINT_ID)));
- assertTrue(breakpoint.containsKey(JSONConstants.SCRIPT_ID));
- deleteBreakpoint(debugSession, breakpointId);
- }
- }
-
- /**
- * Tests setting breakpoints and removing them
- * @throws Exception
- */
- public void testGetSetClearBreakpoint() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointsHandler());
- eventHandler.addSubhandler(new ClearBreakpointsHandler());
-
- Request request = new Request(JSONConstants.BREAKPOINTS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection breakpoints = (Collection) response.getBody().get(JSONConstants.BREAKPOINTS);
- assertNotNull(breakpoints);
- assertTrue(breakpoints.isEmpty());
-
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- evalScript(script, 6);
-
- request = new Request(JSONConstants.BREAKPOINTS);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- breakpoints = (Collection) response.getBody().get(JSONConstants.BREAKPOINTS);
- assertNotNull(breakpoints);
- assertEquals(2, breakpoints.size());
-
- for (Iterator iterator = breakpoints.iterator(); iterator.hasNext();) {
- Number breakpointId = (Number) iterator.next();
- request = new Request(JSONConstants.BREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, breakpointId);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Map breakpoint = (Map) response.getBody().get(JSONConstants.BREAKPOINT);
- assertEquals(breakpointId.intValue(), Util.numberAsInt(breakpoint.get(JSONConstants.BREAKPOINT_ID)));
- assertTrue(breakpoint.containsKey(JSONConstants.SCRIPT_ID));
- deleteBreakpoint(debugSession, breakpointId);
- }
- }
-
- /**
- * Deletes the breakpoint with the given id from the given {@link DebugSession}
- * @param session
- * @param breakpointid
- */
- void deleteBreakpoint(DebugSession session, Number breakpointid) {
- Request request = new Request(JSONConstants.CLEARBREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, breakpointid);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ConnectionHelper.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ConnectionHelper.java
deleted file mode 100644
index abc3036..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ConnectionHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.io.IOException;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Connection;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService.ListenerKey;
-
-
-
-public class ConnectionHelper {
-
- private TransportService transportService;
- private String address;
-
- public ConnectionHelper(final TransportService transportService, final String address) {
- this.transportService = transportService;
- this.address = address;
- }
-
- public Connection getClientConnection() {
- try {
- return transportService.attach(address, 5000, 5000);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
- }
-
- public Connection getServerConnection() {
- ListenerKey key = null;
- try {
- key = transportService.startListening(address);
- return transportService.accept(key, 5000, 5000);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (key != null)
- try {
- transportService.stopListening(key);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return null;
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/DebugSessionTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/DebugSessionTest.java
deleted file mode 100644
index c3c1916..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/DebugSessionTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Connection;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Packet;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.PipedTransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService.ListenerKey;
-
-
-
-public class DebugSessionTest extends TestCase {
-
- boolean complete = false;
-
- public void testReceiveEvent() throws IOException, InterruptedException, TimeoutException, DisconnectedException {
- final TransportService service = new PipedTransportService();
- final ListenerKey key = service.startListening("9000"); //$NON-NLS-1$
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- DebugSession runtime = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
-
- runtime = new DebugSession(c);
- runtime.sendEvent(new EventPacket("test")); //$NON-NLS-1$
- synchronized (Thread.currentThread()) {
- Thread.currentThread().wait();
- }
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- } catch (DisconnectedException e) {
- fail();
- } catch (InterruptedException e) {
- fail();
- } finally {
- if (runtime != null)
- runtime.dispose();
- }
- }
- };
- t.start();
-
- Connection c = service.attach("9000", 5000, 5000); //$NON-NLS-1$
- assertNotNull(c);
- DebugSession session = new DebugSession(c);
- try {
- EventPacket event = session.receiveEvent(5000);
- assertTrue(event.getEvent().equals("test")); //$NON-NLS-1$
- } finally {
- session.dispose();
- synchronized (t) {
- t.notify();
- }
- }
- t.join(5000);
- service.stopListening(key);
- }
-
- public void testSendRequestReceiveResponse() throws IOException, InterruptedException, DisconnectedException, TimeoutException {
- final TransportService service = new PipedTransportService();
- final ListenerKey key = service.startListening("9000"); //$NON-NLS-1$
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- DebugSession runtime = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
-
- runtime = new DebugSession(c);
- Request request = runtime.receiveRequest(5000);
- runtime.sendResponse(new Response(request.getSequence(), request.getCommand()));
- synchronized (Thread.currentThread()) {
- Thread.currentThread().wait();
- }
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- } catch (DisconnectedException e) {
- fail();
- } catch (InterruptedException e) {
- fail();
- } catch (TimeoutException e) {
- fail();
- } finally {
- if (runtime != null)
- runtime.dispose();
- }
- }
- };
- t.start();
-
- Connection c = service.attach("9000", 5000, 5000); //$NON-NLS-1$
- assertNotNull(c);
- DebugSession session = new DebugSession(c);
- try {
- Request request = new Request("test"); //$NON-NLS-1$
- session.sendRequest(request);
- Response response = session.receiveResponse(request.getSequence(), 5000);
- assertTrue(response.getCommand().equals("test")); //$NON-NLS-1$
- assertTrue(response.getRequestSequence() == request.getSequence());
- } finally {
- session.dispose();
- synchronized (t) {
- t.notify();
- }
- }
- t.join(5000);
- service.stopListening(key);
- }
-
- public void testSendEvent() throws IOException, InterruptedException {
- final TransportService service = new PipedTransportService();
- final ListenerKey key = service.startListening("9000"); //$NON-NLS-1$
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- DebugSession runtime = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
-
- runtime = new DebugSession(c);
- runtime.sendEvent(new EventPacket("test")); //$NON-NLS-1$
- synchronized (Thread.currentThread()) {
- if (!complete)
- Thread.currentThread().wait(5000);
- }
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- fail();
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } finally {
- if (runtime != null)
- runtime.dispose();
- }
- }
- };
- t.start();
-
- Connection c = service.attach("9000", 5000, 5000); //$NON-NLS-1$
- assertNotNull(c);
- try {
- Packet packet = c.readPacket();
- assertTrue(packet instanceof EventPacket);
- EventPacket event = (EventPacket) packet;
- assertTrue(event.getEvent().equals("test")); //$NON-NLS-1$
- } finally {
- c.close();
- synchronized (t) {
- complete = true;
- t.notify();
- }
- }
- t.join(5000);
- service.stopListening(key);
- }
-
- public void testReceiveRequestSendResponse() throws IOException, InterruptedException {
- final TransportService service = new PipedTransportService();
- final ListenerKey key = service.startListening("9000"); //$NON-NLS-1$
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- DebugSession runtime = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
-
- runtime = new DebugSession(c);
- Request request = runtime.receiveRequest(5000);
- runtime.sendResponse(new Response(request.getSequence(), request.getCommand()));
- synchronized (Thread.currentThread()) {
- Thread.currentThread().wait();
- }
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- fail();
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- if (runtime != null)
- runtime.dispose();
- }
- }
- };
- t.start();
-
- Connection c = service.attach("9000", 5000, 5000); //$NON-NLS-1$
- assertNotNull(c);
- try {
- Request request = new Request("test"); //$NON-NLS-1$
- c.writePacket(request);
- Packet packet = c.readPacket();
- assertTrue(packet instanceof Response);
- Response response = (Response) packet;
- assertTrue(response.getCommand().equals("test")); //$NON-NLS-1$
- assertTrue(response.getRequestSequence() == request.getSequence());
- } finally {
- c.close();
- synchronized (t) {
- t.notify();
- }
- }
- t.join(5000);
- service.stopListening(key);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/FrameRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/FrameRequestTests.java
deleted file mode 100644
index 8e2df7b..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/FrameRequestTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-import org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler;
-
-/**
- * Variety of tests for requesting frame(s) / frame information
- *
- * @since 1.1
- */
-public class FrameRequestTests extends RequestTest {
-
- /**
- * Tests getting a frame once suspended
- * @throws Exception
- */
- public void testFramesAndFrameLookup() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointHandler(new int[] {6}));
- eventHandler.addSubhandler(new FrameCheckHandler());
-
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- //script + breakpoint on line 6
- evalScript(script, 2);
- }
-
- /**
- * Tests getting frames and running an evaluate
- * @throws Exception
- */
- public void testFramesAndFrameLookupAndEvaluate() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointHandler(new int[] {6}));
- Subhandler frameCheckHandler = new Subhandler() {
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#testName()
- */
- public String testName() {
- return getName();
- }
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.BREAK)) {
- Number threadId = (Number) event.getBody().get(JSONConstants.THREAD_ID);
- Number contextId = (Number) event.getBody().get(JSONConstants.CONTEXT_ID);
- Request request = new Request(JSONConstants.FRAMES);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 10000);
- assertTrue(response.isSuccess());
- Collection frames = (Collection) response.getBody().get(JSONConstants.FRAMES);
- for (Iterator iterator = frames.iterator(); iterator.hasNext();) {
- Number frameId = (Number) iterator.next();
- request = new Request(JSONConstants.EVALUATE);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- request.getArguments().put(JSONConstants.CONTEXT_ID, contextId);
- request.getArguments().put(JSONConstants.FRAME_ID, frameId);
- request.getArguments().put(JSONConstants.EXPRESSION, "this"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), 10000);
- assertTrue(response.isSuccess());
- assertTrue(response.getBody().containsKey(JSONConstants.EVALUATE));
- }
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
- };
- eventHandler.addSubhandler(frameCheckHandler);
-
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- //script + breakpoint
- evalScript(script, 2);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestBadCommandTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestBadCommandTest.java
deleted file mode 100644
index ef4393c..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestBadCommandTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-public class RequestBadCommandTest extends RequestTest {
-
- public void testBadCommand() throws DisconnectedException, TimeoutException {
- Request request = new Request("bad_command"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 30000);
- assertFalse(response.isSuccess());
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestContinueTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestContinueTest.java
deleted file mode 100644
index 92718e5..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestContinueTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-public class RequestContinueTest extends RequestTest {
-
- public void testContinueWithNoContexts() throws DisconnectedException, TimeoutException {
- Request request = new Request("continue"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 30000);
- assertTrue(response.isSuccess());
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestDisposeTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestDisposeTest.java
deleted file mode 100644
index 1412361..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestDisposeTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-public class RequestDisposeTest extends RequestTest {
-
- public void testDispose() throws DisconnectedException, TimeoutException {
- Request request = new Request("dispose"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 30000);
- assertTrue(response.isSuccess());
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java
deleted file mode 100644
index 3845c91..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-import org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler;
-
-/**
- * Variety of tests for sending <code>lookup</code> requests
- *
- * @since 1.0
- */
-public class RequestLookupTest extends FrameRequestTests {
-
- /**
- * Tests performing a <code>lookup</code>
- * @throws Exception
- */
- public void testLookup() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointHandler(new int[] {6}));
-
- final Object[] success = new Object[1];
-
- Subhandler frameCheckHandler = new Subhandler() {
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#testName()
- */
- public String testName() {
- return getName();
- }
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.BREAK)) {
- Number threadId = (Number) event.getBody().get(JSONConstants.THREAD_ID);
- Number contextId = (Number) event.getBody().get(JSONConstants.CONTEXT_ID);
- Request request = new Request(JSONConstants.FRAMES);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection frames = (Collection) response.getBody().get(JSONConstants.FRAMES);
- for (Iterator iterator = frames.iterator(); iterator.hasNext();) {
- Number frameId = (Number) iterator.next();
- request = new Request(JSONConstants.LOOKUP);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- request.getArguments().put(JSONConstants.CONTEXT_ID, contextId);
- request.getArguments().put(JSONConstants.FRAME_ID, frameId);
- request.getArguments().put(JSONConstants.HANDLE, new Integer(0));
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- assertTrue(response.getBody().containsKey(JSONConstants.LOOKUP));
- }
- success[0] = Boolean.TRUE;
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
- };
- eventHandler.addSubhandler(frameCheckHandler);
-
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- //script + breakpoint on line 6
- evalScript(script, 2);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestSuspendTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestSuspendTest.java
deleted file mode 100644
index 7c9c90b..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestSuspendTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-public class RequestSuspendTest extends RequestTest {
-
- public void testSuspendWithNoContexts() throws DisconnectedException, TimeoutException {
- Request request = new Request("suspend"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 30000);
- assertTrue(response.isSuccess());
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java
deleted file mode 100644
index 80df5a4..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.debugger.RhinoDebuggerImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.PipedTransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService;
-import org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.ContextFactory;
-import org.mozilla.javascript.Scriptable;
-
-/**
- * Abstract test for making requests
- *
- * @since 1.0
- */
-public abstract class RequestTest extends TestCase {
-
- /**
- * Default implementation of a {@link Subhandler}
- */
- abstract class SubHandler implements Subhandler {
-
- private String testname = null;
-
- public SubHandler(String testname) {
- Assert.assertNotNull("The test name cannot be null", testname); //$NON-NLS-1$
- this.testname = testname;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#testName()
- */
- public String testName() {
- return this.testname;
- }
- }
-
- /**
- * Handler to check that we can get frames from a suspended thread
- * @since 1.1
- */
- final class FrameCheckHandler extends SubHandler {
- /**
- * Constructor
- * @param testname
- */
- public FrameCheckHandler() {
- super(getName());
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#handleEvent(org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession, org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket)
- */
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.BREAK)) {
- Number threadId = (Number) event.getBody().get(JSONConstants.THREAD_ID);
- Number contextId = (Number) event.getBody().get(JSONConstants.CONTEXT_ID);
- Request request = new Request(JSONConstants.FRAMES);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(testName()+": the request for frames from thread ["+threadId.intValue()+"] was not successful", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$
- Collection frames = (Collection) response.getBody().get(JSONConstants.FRAMES);
- for (Iterator iterator = frames.iterator(); iterator.hasNext();) {
- Number frameId = (Number) iterator.next();
- request = new Request(JSONConstants.FRAME);
- request.getArguments().put(JSONConstants.THREAD_ID, threadId);
- request.getArguments().put(JSONConstants.CONTEXT_ID, contextId);
- request.getArguments().put(JSONConstants.FRAME_ID, frameId);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(testName()+": the request for frame ["+frameId.intValue()+"] frmo thread ["+threadId.intValue()+"] was not successful", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
-
- }
-
- /**
- * Handler to check that the thread returned when suspended is the same thread
- * from the break event
- * @since 1.1
- */
- final class ThreadCheckHandler extends SubHandler {
- /**
- * Constructor
- */
- public ThreadCheckHandler() {
- super(getName());
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#handleEvent(org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession, org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket)
- */
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.BREAK)) {
- Number threadId = (Number) event.getBody().get(JSONConstants.THREAD_ID);
- Request request = new Request(JSONConstants.THREADS);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 10000);
- assertTrue(response.isSuccess());
- List threads = (List) response.getBody().get(JSONConstants.THREADS);
- assertTrue(testName()+": the listing of threads must not be empty", threads.size() > 0); //$NON-NLS-1$
- assertEquals(testName()+": the thread ids do not match", threadId.intValue(), Util.numberAsInt(threads.get(0))); //$NON-NLS-1$
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
- }
-
- /**
- * Handler for setting breakpoints on all executable lines in a loaded script
- * @since 1.1
- */
- final class SetBreakpointsHandler extends SubHandler {
- /**
- * Constructor
- */
- public SetBreakpointsHandler() {
- super(getName());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#handleEvent(org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession, org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket)
- */
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.SCRIPT)) {
- Number scriptId = (Number) event.getBody().get(JSONConstants.SCRIPT_ID);
- Request request = new Request(JSONConstants.SCRIPT);
- request.getArguments().put(JSONConstants.SCRIPT_ID, scriptId);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Map result = (Map) response.getBody().get(JSONConstants.SCRIPT);
-
- // line numbers
- List lineNumbers = (List) result.get(JSONConstants.LINES);
- for (Iterator iterator = lineNumbers.iterator(); iterator.hasNext();) {
- Number lineNumber = (Number) iterator.next();
- request = new Request(JSONConstants.SETBREAKPOINT);
- request.getArguments().put(JSONConstants.SCRIPT_ID, scriptId);
- request.getArguments().put(JSONConstants.LINE, lineNumber);
- request.getArguments().put(JSONConstants.CONDITION, "1===1"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(testName()+": the request to set a breakpoint on line ["+lineNumber+"] was not successful", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$
-
- Map breakpoint = (Map) response.getBody().get(JSONConstants.BREAKPOINT);
- Number breakpointId = (Number) breakpoint.get(JSONConstants.BREAKPOINT_ID);
- request = new Request(JSONConstants.BREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, breakpointId);
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- breakpoint = (Map) response.getBody().get(JSONConstants.BREAKPOINT);
- assertEquals(breakpointId.intValue(), Util.numberAsInt(breakpoint.get(JSONConstants.BREAKPOINT_ID)));
- assertEquals(scriptId.intValue(), Util.numberAsInt(breakpoint.get(JSONConstants.SCRIPT_ID)));
- assertEquals(lineNumber.intValue(), Util.numberAsInt(breakpoint.get(JSONConstants.LINE)));
- assertEquals("1===1", breakpoint.get(JSONConstants.CONDITION)); //$NON-NLS-1$
- }
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
- }
-
- /**
- * Handler to set breakpoints on a given set of lines. The lines are not checked
- * to see if they are valid.
- *
- * @since 1.1
- */
- final class SetBreakpointHandler extends SubHandler {
- int[] adds = null;
- /**
- * Constructor
- * @param lines <code>null</code> is not accepted, not is an empty array
- */
- public SetBreakpointHandler(int[] lines) {
- super(getName());
- assertNotNull(testName()+": no line numbers have been specified to set breakpoints on", lines); //$NON-NLS-1$
- assertTrue(testName()+": no line numbers have been specified to set breakpoints on", lines.length > 0); //$NON-NLS-1$
- this.adds = lines;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#handleEvent(org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession, org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket)
- */
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.SCRIPT)) {
- Number scriptId = (Number) event.getBody().get(JSONConstants.SCRIPT_ID);
- Request request = new Request(JSONConstants.SCRIPT);
- request.getArguments().put(JSONConstants.SCRIPT_ID, scriptId);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Map script = (Map) response.getBody().get(JSONConstants.SCRIPT);
- assertNotNull(testName()+": the response body cannot be null", script); //$NON-NLS-1$
- for (int i = 0; i < adds.length; i++) {
- request = new Request(JSONConstants.SETBREAKPOINT);
- request.getArguments().put(JSONConstants.SCRIPT_ID, scriptId);
- request.getArguments().put(JSONConstants.LINE, new Integer(adds[i]));
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(testName()+": the request to set a breakpoint on line ["+adds[i]+"] was not successful", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- return true;
- }
- return false;
- }
- }
-
- /**
- * Clears all of the breakpoints that are hit
- *
- * @since 1.1
- */
- final class ClearBreakpointsHandler extends SubHandler {
- /**
- * Constructor
- */
- public ClearBreakpointsHandler() {
- super(getName());
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.jsdt.debug.rhino.tests.TestEventHandler.Subhandler#handleEvent(org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession, org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket)
- */
- public boolean handleEvent(DebugSession debugSession, EventPacket event) {
- if (event.getEvent().equals(JSONConstants.BREAK)) {
- Number bid = (Number)event.getBody().get(JSONConstants.BREAKPOINT);
- if(bid == null && JSONConstants.STEP_OUT.equals(event.getBody().get(JSONConstants.STEP))) {
- return false;
- }
- Request request = new Request(JSONConstants.CLEARBREAKPOINT);
- request.getArguments().put(JSONConstants.BREAKPOINT_ID, bid);
- try {
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(testName()+": the request to clear breakpoint ["+bid+"] should have succeeded", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$
- return true;
- } catch (DisconnectedException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- e.printStackTrace();
- }
- }
- return false;
- }
- }
-
- protected RhinoDebuggerImpl debugger;
- protected DebugSession debugSession;
- protected TestEventHandler eventHandler;
- protected ContextFactory contextFactory;
- private static boolean tracing = false;
-
- /**
- * Turns on tracing for the test. All testing event handlers use this.
- */
- protected void useTracing() {
- tracing = true;
- }
-
- /**
- * Turns off tracing. This method is called on every {@link #tearDown()} invocation.
- */
- protected void disableTracing() {
- tracing = false;
- }
-
- /**
- * Returns if tracing is enabled
- *
- * @return if tracing is enabled
- */
- public static boolean isTracing() {
- return tracing;
- }
-
- /**
- * Evaluates the given script source
- * @param script
- * @since 1.1
- */
- protected void evalScript(String script) {
- Scriptable scope = null;
- Context context = contextFactory.enterContext();
- try {
- scope = context.initStandardObjects();
- context.evaluateString(scope, script, JSONConstants.SCRIPT, 0, null);
- } finally {
- Context.exit();
- }
- }
-
- /**
- * Evaluates the given script source and waits for the given number of events
- * @param script
- * @param eventcount
- * @since 1.1
- */
- protected void evalScript(String script, int eventcount) {
- evalScript(script);
- waitForEvents(eventcount);
- }
-
- /**
- * Evaluates the given script and waits for the specific events to be received
- * @param script
- * @param events
- * @since 1.1
- */
- protected void evalScript(String script, EventPacket[] events) {
- evalScript(script);
- waitForEvents(events);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- TransportService pipedTransport = new PipedTransportService();
- ConnectionHelper helper = new ConnectionHelper(pipedTransport, null);
-
- debugger = new RhinoDebuggerImpl(pipedTransport, null, false);
- debugger.start();
-
- debugSession = new DebugSession(helper.getClientConnection());
- eventHandler = new TestEventHandler(debugSession, getName());
- eventHandler.start();
-
- assertTrue(suspendForRuntime(debugger, 100));
- contextFactory = new ContextFactory();
- contextFactory.addListener(debugger);
- super.setUp();
- }
-
- /**
- * Suspend waiting for the debugger to have a connected session
- *
- * @param debug the debugger to poll for a session connection
- * @param timeout the amount of time to wait
- * @return true when a {@link DebugSession} has connected
- */
- public synchronized boolean suspendForRuntime(RhinoDebuggerImpl debug, long timeout) {
- while (!debug.isConnected())
- try {
- wait(timeout);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return debug.isConnected();
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- disableTracing();
- super.tearDown();
- contextFactory.removeListener(debugger);
- eventHandler.stop();
- debugger.stop();
- debugSession.dispose();
- }
-
- /**
- * Forces the backing event handler to block until the given number of events have been
- * received or a timeout occurs.
- *
- * @param count the event count to wait for
- */
- synchronized void waitForEvents(int count) {
- eventHandler.waitForEvents(count);
- }
-
- /**
- * Sets the collection of specific events we are expecting to handle
- *
- * @param events the collection of events
- */
- synchronized void setExpectedEvents(EventPacket[] events) {
- eventHandler.setExpectedEvents(events);
- }
-
- /**
- * Forces the backing event handler to block until the given number of events have been
- * received or a timeout occurs.
- *
- * @param events the specific set of events expected
- * @see #setExpectedEvents(EventPacket[])
- */
- synchronized void waitForEvents(EventPacket[] events) {
- eventHandler.waitForEvents(events);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestVersionTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestVersionTest.java
deleted file mode 100644
index 086b446..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestVersionTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-public class RequestVersionTest extends RequestTest {
-
- public void testVersion() throws DisconnectedException, TimeoutException {
- Request request = new Request("version"); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), 30000);
- assertTrue(response.getBody().containsKey("javascript.version")); //$NON-NLS-1$
- assertTrue(response.getBody().containsKey("ecmascript.version")); //$NON-NLS-1$
- assertTrue(response.getBody().containsKey("javascript.vm.vendor")); //$NON-NLS-1$
- assertTrue(response.getBody().containsKey("javascript.vm.name")); //$NON-NLS-1$
- assertTrue(response.getBody().containsKey("javascript.vm.version")); //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebugTestSuite.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebugTestSuite.java
deleted file mode 100644
index 392915d..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebugTestSuite.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Main test suite entry point
- * @since 1.0
- */
-public class RhinoDebugTestSuite extends TestSuite {
-
- /**
- * @return the new test suite
- */
- public static Test suite() {
- return new RhinoDebugTestSuite();
- }
-
- /**
- * Constructor
- */
- public RhinoDebugTestSuite() {
- addTestSuite(TransportTest.class);
- addTestSuite(DebugSessionTest.class);
- addTestSuite(RhinoDebuggerTest.class);
- addTestSuite(RequestBadCommandTest.class);
- addTestSuite(BreakpointRequestTests.class);
- addTestSuite(ThreadRequestTests.class);
- addTestSuite(RequestContinueTest.class);
- addTestSuite(RequestDisposeTest.class);
- addTestSuite(FrameRequestTests.class);
- addTestSuite(RequestLookupTest.class);
- addTestSuite(ScriptRequestTests.class);
- addTestSuite(RequestSuspendTest.class);
- addTestSuite(RequestVersionTest.class);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebuggerTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebuggerTest.java
deleted file mode 100644
index f6d4268..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RhinoDebuggerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import org.mozilla.javascript.Callable;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
-
-public class RhinoDebuggerTest extends RequestTest {
-
- public static String TEST = "test"; //$NON-NLS-1$
-
- public void testDebugSanityInstallResolveBundle(){
- String script = ""; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "var test = function() {"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "var clazz = Packages." + this.getClass().getName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
- script += "return clazz.TEST;"; //$NON-NLS-1$
- script += "};\r\n"; //$NON-NLS-1$
- script += "var v = test();\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "var y = test();\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "var z = test();\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
- script += "\r\n"; //$NON-NLS-1$
-
- Scriptable scope = null;
- Context context = contextFactory.enterContext();
- ClassLoader current = context.getApplicationClassLoader();
- context.setApplicationClassLoader(this.getClass().getClassLoader());
- try {
- scope = context.initStandardObjects();
- context.evaluateString(scope, script, "script", 0, null); //$NON-NLS-1$
- } finally {
- context.setApplicationClassLoader(current);
- Context.exit();
- }
- Object obj = scope.get("test", scope); //$NON-NLS-1$
- assertNotSame(Scriptable.NOT_FOUND, obj);
- assertTrue(obj instanceof Callable);
- Callable test = (Callable) obj;
-
- context = contextFactory.enterContext();
- current = context.getApplicationClassLoader();
- context.setApplicationClassLoader(this.getClass().getClassLoader());
- try {
- Object result = test.call(Context.getCurrentContext(), scope, scope, new Object[0]);
- Object javaResult = Context.jsToJava(result, String.class);
- assertEquals("test", javaResult); //$NON-NLS-1$
- } finally {
- context.setApplicationClassLoader(current);
- Context.exit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ScriptRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ScriptRequestTests.java
deleted file mode 100644
index a1aaeac..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ScriptRequestTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
-
-/**
- * Variety of tests requesting information from scripts
- *
- * @since 1.1
- */
-public class ScriptRequestTests extends RequestTest {
-
- /**
- * Tests asking for all scripts when there are none
- *
- * @throws Exception
- */
- public void testScriptsWithNoScripts() throws Exception {
- Request request = new Request(JSONConstants.SCRIPTS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection scripts = (Collection) response.getBody().get(JSONConstants.SCRIPTS);
- assertNotNull(scripts);
- assertTrue(scripts.isEmpty());
- }
-
- /**
- * Tests getting a script and asserting its information
- *
- * @throws Exception
- */
- public void testScript() throws Exception {
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- Scriptable scope = null;
- Context context = contextFactory.enterContext();
- try {
- scope = context.initStandardObjects();
- context.evaluateString(scope, script, "script", 0, null); //$NON-NLS-1$
- } finally {
- Context.exit();
- }
-
- Request request = new Request(JSONConstants.SCRIPTS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- List scripts = (List) response.getBody().get(JSONConstants.SCRIPTS);
- assertNotNull(scripts);
- assertFalse(scripts.isEmpty());
-
- request = new Request("script"); //$NON-NLS-1$
- request.getArguments().put("scriptId", scripts.get(0)); //$NON-NLS-1$
- debugSession.sendRequest(request);
- response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Map result = (Map) response.getBody().get(JSONConstants.SCRIPT);
- assertEquals(script, result.get(JSONConstants.SOURCE));
- List lineNumbers = (List) result.get(JSONConstants.LINES);
- assertEquals(7, lineNumbers.size());
- assertTrue("The line number [1] should be returned", lineNumbers.contains(new BigDecimal(1))); //$NON-NLS-1$
- assertTrue("The line number [2] should be returned", lineNumbers.contains(new BigDecimal(2))); //$NON-NLS-1$
- assertTrue("The line number [5] should be returned", lineNumbers.contains(new BigDecimal(5))); //$NON-NLS-1$
- assertTrue("The line number [6] should be returned", lineNumbers.contains(new BigDecimal(6))); //$NON-NLS-1$
- assertTrue("The line number [9] should be returned", lineNumbers.contains(new BigDecimal(9))); //$NON-NLS-1$
- assertTrue("The line number [12] should be returned", lineNumbers.contains(new BigDecimal(12))); //$NON-NLS-1$
- assertTrue("The line number [13] should be returned", lineNumbers.contains(new BigDecimal(13))); //$NON-NLS-1$
- //assertTrue("The line number [14] should be returned", lineNumbers.contains(new BigDecimal(14)));
-
- List functionNames = (List) result.get(JSONConstants.FUNCTIONS);
- assertEquals(2, functionNames.size());
- assertEquals("test", functionNames.get(0)); //$NON-NLS-1$
- assertEquals("test2", functionNames.get(1)); //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TestEventHandler.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TestEventHandler.java
deleted file mode 100644
index 7442230..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TestEventHandler.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONUtil;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TimeoutException;
-
-/**
- * Event handler for testing purposes
- *
- * @since 1.0
- */
-public class TestEventHandler implements Runnable {
-
- /**
- * Sub-handler for test to implement and add to the root
- * {@link TestEventHandler}
- */
- public interface Subhandler {
- boolean handleEvent(DebugSession debugSession, EventPacket event);
-
- String testName();
- }
-
- /**
- * Sub-handler for breakpoint specific operations
- *
- * @since 1.1
- */
- public interface BreakpointSubHandler extends Subhandler {
- /**
- * Array of line numbers to add breakpoints to
- *
- * @param lines
- */
- void linesToAddBreakpoints(int[] lines);
-
- /**
- * Array of lines to remove breakpoints from
- *
- * @param lines
- */
- void linesToRemoveBreakpoints(int[] lines);
- }
-
- private DebugSession debugSession;
- private Thread thread;
- private final List subhandlers = new ArrayList();
- private final ArrayList expectedEvents = new ArrayList();
- private final ArrayList actualEvents = new ArrayList();
- private volatile boolean shutdown = false;
-
- private int eventCount = 0;
- private String testname = null;
-
- /**
- * Constructor
- *
- * @param debugSession
- * the current session to handle
- * @param testname
- * the name of the test using this handler
- */
- public TestEventHandler(DebugSession debugSession, String testname) {
- this.debugSession = debugSession;
- this.thread = new Thread(this, "TestEventHandler"); //$NON-NLS-1$
- this.testname = testname;
- }
-
- /**
- * start the test handler
- */
- public void start() {
- thread.start();
- }
-
- /**
- * stop the test handler
- */
- public void stop() {
- shutdown = true;
- thread.interrupt();
- try {
- thread.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- synchronized (this) {
- this.expectedEvents.clear();
- this.actualEvents.clear();
- this.subhandlers.clear();
- this.eventCount = 0;
- }
- }
-
- /**
- * Sets the events that the handler is expected to receive
- *
- * @param events
- */
- public synchronized void setExpectedEvents(EventPacket[] events) {
- this.expectedEvents.clear();
- for (int i = 0; i < events.length; i++) {
- this.expectedEvents.add(events[i]);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- while (!shutdown) {
- try {
- EventPacket event = debugSession.receiveEvent(VirtualMachine.DEFAULT_TIMEOUT);
- handleEvent(event);
- } catch (TimeoutException e) {
- // ignore
- } catch (DisconnectedException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Add a sub handler
- *
- * @param subhandler
- */
- public synchronized void addSubhandler(Subhandler subhandler) {
- subhandlers.add(subhandler);
- }
-
- /**
- * Remove a sub handler
- *
- * @param subhandler
- */
- public synchronized void removeSubhandler(Subhandler subhandler) {
- subhandlers.remove(subhandler);
- }
-
- /**
- * Handles the given event packet
- *
- * @param event
- */
- private synchronized void handleEvent(EventPacket event) {
- String estring = null;
- if (RequestTest.isTracing()) {
- estring = JSONUtil.write(event.toJSON());
- System.out.println(this.testname + " got event: " + estring); //$NON-NLS-1$
- }
- for (ListIterator iterator = subhandlers.listIterator(); iterator.hasNext();) {
- Subhandler subhandler = (Subhandler) iterator.next();
- try {
- if (subhandler.handleEvent(debugSession, event)) {
- if (RequestTest.isTracing()) {
- System.out.println("\t" + this.testname + " handled event: " + estring); //$NON-NLS-1$ //$NON-NLS-2$
- }
- this.expectedEvents.remove(event);
- actualEvents.add(event);
- eventCount++;
- notifyAll();
- }
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
- if (!event.getEvent().equals("thread")) { //$NON-NLS-1$
- sendContinue(event, null);
- }
-
- }
-
- /**
- * Continues the handler
- *
- * @param event
- * @param step
- */
- protected void sendContinue(EventPacket event, String step) {
- Number threadId = (Number) event.getBody().get("threadId"); //$NON-NLS-1$
-
- Request request = new Request("continue"); //$NON-NLS-1$
- request.getArguments().put("threadId", threadId); //$NON-NLS-1$
- request.getArguments().put("step", step); //$NON-NLS-1$
- try {
- debugSession.sendRequest(request);
- debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- } catch (DisconnectedException e) {
- if (!shutdown)
- e.printStackTrace();
- } catch (TimeoutException e) {
- if (!shutdown)
- e.printStackTrace();
- }
- }
-
- /**
- * Waits for all of the events specified from
- * {@link #setExpectedEvents(EventPacket[])}
- *
- * @param count
- */
- public synchronized void waitForEvents(int count) {
- long timeout = System.currentTimeMillis() + 5000;
- while (eventCount < count && System.currentTimeMillis() < timeout) {
- try {
- wait(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- try {
- if (eventCount != count) {
- for (Iterator it = actualEvents.iterator(); it.hasNext();) {
- System.err.println(it.next().toString());
- }
- throw new IllegalStateException("eventcount was: " + eventCount + " expected: " + count); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } finally {
- this.eventCount = 0;
- }
- }
-
- /**
- * Waits for the given collection of events to be handled, or a default
- * timeout to occur
- *
- * @param events
- */
- public synchronized void waitForEvents(EventPacket[] events) {
- long timeout = System.currentTimeMillis() + 5000;
- while (!this.expectedEvents.isEmpty() && System.currentTimeMillis() < timeout) {
- try {
- wait(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- if (!this.expectedEvents.isEmpty()) {
- try {
- throw new IllegalStateException("Some expected events were not received"); //$NON-NLS-1$
- } finally {
- this.eventCount = 0;
- for (int i = 0; i < this.expectedEvents.size(); i++) {
- System.out.println(this.testname + " missed expected event: " + JSONUtil.write(this.expectedEvents.get(i))); //$NON-NLS-1$
- }
- }
- }
- if (this.eventCount > events.length) {
- try {
- throw new IllegalStateException(this.testname + " got too many events - expected [" + events.length + "] got [" + eventCount + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- } finally {
- this.eventCount = 0;
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java
deleted file mode 100644
index ec6007b..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.util.Collection;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-
-/**
- * Variety of tests for thread requests
- *
- * @since 1.1
- */
-public class ThreadRequestTests extends RequestTest {
-
- /**
- * Tests requesting the threads from the debugger when there are none
- * @throws Exception
- */
- public void testThreadsWithNoThreads() throws Exception {
- Request request = new Request(JSONConstants.THREADS);
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertTrue(response.isSuccess());
- Collection threads = (Collection) response.getBody().get(JSONConstants.THREADS);
- assertNotNull(threads);
- assertTrue(threads.isEmpty());
- }
-
- /**
- * Tests asking the VM for a thread with an invalid ID
- * @throws Exception
- */
- public void testInvalidThread() throws Exception {
- Request request = new Request("context"); //$NON-NLS-1$
- request.getArguments().put(JSONConstants.THREAD_ID, new Integer("9999")); //$NON-NLS-1$
- debugSession.sendRequest(request);
- Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
- assertFalse(response.isSuccess());
- }
-
- /**
- * Tests getting threads from the VM
- * @throws Exception
- */
- public void testThreads() throws Exception {
- eventHandler.addSubhandler(new SetBreakpointHandler(new int[] {6}));
- eventHandler.addSubhandler(new ThreadCheckHandler());
- String script = Util.getTestSource(Util.SRC_SCRIPTS_CONTAINER, "script1.js"); //$NON-NLS-1$
- assertNotNull("The test source for [script1.js] must exist", script); //$NON-NLS-1$
- evalScript(script);
- //script event + breakpoint on line 6
- waitForEvents(2);
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TransportTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TransportTest.java
deleted file mode 100644
index 48d696b..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/TransportTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.SocketUtil;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Connection;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.PipedTransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.SocketTransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService.ListenerKey;
-
-/**
- * Tests the two provided transport services: {@link PipedTransportService} and {@link SocketTransportService}
- *
- * @since 1.0
- */
-public class TransportTest extends TestCase {
-
- /**
- * Tests that a socket transport service can be started and stopped without fail
- * @throws Exception - pass up any failures to the test framework for reporting
- */
- public void testSocketStartStopListening() throws Exception {
- TransportService service = new SocketTransportService();
- ListenerKey key = service.startListening(SocketUtil.findFreePortString());
- assertNotNull(key);
- service.stopListening(key);
- }
-
- /**
- * Tests that a socket attach service can be started, joined and stopped without fail.
- * This test can fail in the event that Java cannot find a free port to communicate on.
- * @throws Exception - pass up any failures to the test framework for reporting
- */
- public void _testSocketAcceptAttach() throws Exception {
- final TransportService service = new SocketTransportService();
- final String port = SocketUtil.findFreePortString();
- assertTrue("A valid port could not be found on localhost", !"-1".equals(port)); //$NON-NLS-1$ //$NON-NLS-2$
- final ListenerKey key = service.startListening(port);
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
- c.close();
- } catch (IOException e) {
- fail(e.getMessage());
- }
- }
- };
- t.start();
-
- Connection c = service.attach(port, 5000, 5000);
- assertNotNull(c);
- c.close();
- t.join(5000);
- service.stopListening(key);
- }
-
- /**
- * Tests that a piped transport server can be started and stopped without fail
- * @throws Exception - pass up any failures to the test framework for reporting
- */
- public void testPipedStartStopListening() throws Exception {
- TransportService service = new PipedTransportService();
- ListenerKey key = service.startListening(SocketUtil.findFreePortString());
- assertNotNull(key);
- service.stopListening(key);
- }
-
- /**
- * Tests that a piped connection can be attached to, joined and then closed without fail
- * @throws Exception - pass up any failures to the test framework for reporting
- */
- public void testPipedAcceptAttach() throws Exception {
- final TransportService service = new PipedTransportService();
- final String port = SocketUtil.findFreePortString();
- assertTrue("A valid port could not be found on localhost", !"-1".equals(port)); //$NON-NLS-1$ //$NON-NLS-2$
- final ListenerKey key = service.startListening(port);
-
- Thread t = new Thread() {
- public void run() {
- Connection c = null;
- try {
- c = service.accept(key, 5000, 5000);
- assertNotNull(c);
- c.close();
- } catch (IOException e) {
- fail(e.getMessage());
- }
- }
- };
- t.start();
-
- Connection c = service.attach(port, 5000, 5000);
- assertNotNull(c);
- c.close();
- t.join(5000);
- service.stopListening(key);
- }
-
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/Util.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/Util.java
deleted file mode 100644
index 874f24b..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/Util.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.rhino.tests;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Collection of utility methods for tests
- *
- * @since 1.0
- */
-public class Util {
-
- /**
- * BiDi
- * @since 1.1
- */
- public static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
- /**
- * The name of the source container <code>scripts</code> in the test bundle
- * @since 1.1
- */
- public static final String SRC_SCRIPTS_CONTAINER = "scripts"; //$NON-NLS-1$
-
- /**
- * Constant representing the default size to read from an input stream
- * @since 1.1
- */
- private static final int DEFAULT_READING_SIZE = 8192;
-
- /**
- * Returns the int value of the given {@link Number}
- * @param number
- * @return
- */
- public static int numberAsInt(Object number) {
- return ((Number) number).intValue();
- }
-
- /**
- * Returns the OS path to the directory that contains the test plugin.
- *
- * @since 1.1
- */
- public static IPath getPluginDirectoryPath() {
- if (Platform.isRunning()) {
- try {
- URL platformURL = Platform.getBundle("org.eclipse.wst.jsdt.debug.rhino.tests").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- return new Path(new File(FileLocator.toFileURL(platformURL).getFile()).getAbsolutePath());
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return new Path(System.getProperty("user.dir")); //$NON-NLS-1$
- }
-
- /**
- * Loads the test source with the given name. If the source does not exist
- * a {@link FileNotFoundException} is thrown.
- *
- * @param container the folder in the test project containing the source
- * @param sourcename the name of the source file to load
- *
- * @return the {@link String} representation of the source or <code>null</code>
- * @throws FileNotFoundException if the source does not exist
- * @since 1.1
- */
- public static String getTestSource(String container, String sourcename) throws IOException {
- if (Platform.isRunning()) {
- URL platformURL = Platform.getBundle("org.eclipse.wst.jsdt.debug.rhino.tests").getEntry("/" + container + "/" + sourcename); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- char[] chars = getInputStreamAsCharArray(platformURL.openStream(), -1, "UTF-8"); //$NON-NLS-1$
- if (chars != null) {
- return new String(chars);
- }
- }
-
- throw new IllegalStateException("Platform not running"); //$NON-NLS-1$
- }
-
- /**
- * Returns the contents of the given file as a string, or <code>null</code>
- *
- * @param file the file to get the contents for
- * @return the contents of the file as a {@link String} or <code>null</code>
- * @since 1.1
- */
- public static String getFileContentAsString(File file) {
- String contents = null;
- FileInputStream stream = null;
- try {
- stream = new FileInputStream(file);
- char[] array = getInputStreamAsCharArray(stream, -1, "UTF-8"); //$NON-NLS-1$
- contents = new String(array);
- }
- catch(IOException ioe) {
- ioe.printStackTrace();
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- return contents;
- }
-
- /**
- * Returns the given input stream's contents as a character array.
- * If a length is specified (i.e. if length != -1), this represents the number of bytes in the stream.
- * Note the specified stream is not closed in this method
- *
- * @param stream the stream to get convert to the char array
- * @param length the length of the input stream, or -1 if unknown
- * @param encoding the encoding to use when reading the stream
- * @return the given input stream's contents as a character array.
- * @throws IOException if a problem occurred reading the stream.
- * @since 1.1
- */
- public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding) throws IOException {
- Charset charset = null;
- try {
- charset = Charset.forName(encoding);
- } catch (IllegalCharsetNameException e) {
- System.err.println("Illegal charset name : " + encoding); //$NON-NLS-1$
- return null;
- } catch(UnsupportedCharsetException e) {
- System.err.println("Unsupported charset : " + encoding); //$NON-NLS-1$
- return null;
- }
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPLACE).onUnmappableCharacter(CodingErrorAction.REPLACE);
- byte[] contents = getInputStreamAsByteArray(stream, length);
- ByteBuffer byteBuffer = ByteBuffer.allocate(contents.length);
- byteBuffer.put(contents);
- byteBuffer.flip();
- return charsetDecoder.decode(byteBuffer).array();
- }
-
- /**
- * Returns the given input stream as a byte array
- *
- * @param stream the stream to get as a byte array
- * @param length the length to read from the stream or -1 for unknown
- * @return the given input stream as a byte array
- * @throws IOException
- * @since 1.1
- */
- public static byte[] getInputStreamAsByteArray(InputStream stream, int length) throws IOException {
- byte[] contents;
- if (length == -1) {
- contents = new byte[0];
- int contentsLength = 0;
- int amountRead = -1;
- do {
- // read at least 8K
- int amountRequested = Math.max(stream.available(), DEFAULT_READING_SIZE);
- // resize contents if needed
- if (contentsLength + amountRequested > contents.length) {
- System.arraycopy(contents,
- 0,
- contents = new byte[contentsLength + amountRequested],
- 0,
- contentsLength);
- }
- // read as many bytes as possible
- amountRead = stream.read(contents, contentsLength, amountRequested);
- if (amountRead > 0) {
- // remember length of contents
- contentsLength += amountRead;
- }
- } while (amountRead != -1);
- // resize contents if necessary
- if (contentsLength < contents.length) {
- System.arraycopy(contents, 0, contents = new byte[contentsLength], 0, contentsLength);
- }
- } else {
- contents = new byte[length];
- int len = 0;
- int readSize = 0;
- while ((readSize != -1) && (len != length)) {
- // See PR 1FMS89U
- // We record first the read size. In this case length is the actual
- // read size.
- len += readSize;
- readSize = stream.read(contents, len, length - len);
- }
- }
- return contents;
- }
-}
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/test.xml b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/test.xml
deleted file mode 100644
index a2b6dc3..0000000
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/test.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!--
- =====================================================
- There should be no need to change what's above.
- (if there is, let us know if the script can be improved.)
- =====================================================
- -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.jsdt.debug.rhino.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.jsdt.debug.rhino.tests.RhinoDebugTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
-
- <!--
- make the workspace directory, in case path doesn't exist yet
- but delete to make sure fresh contents, if it does exist
- -->
- <delete
- dir="${workspace}"
- quiet="true" />
- <mkdir
- dir="${workspace}" />
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
