harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r555964 [1/2] - in /harmony/enhanced/buildtest/branches/2.0: adaptors/eut/ tests/eut/ tests/eut/extra/eut.3.2.jdtcorecompiler.patching/ tests/eut/extra/eut.3.2.jdtdebug.patching/ tests/eut/extra/eut.3.2.jdtdebug.patching/patch/ tests/eut/ex...
Date Fri, 13 Jul 2007 12:15:46 GMT
Author: varlax
Date: Fri Jul 13 05:15:43 2007
New Revision: 555964

URL: http://svn.apache.org/viewvc?view=rev&rev=555964
Log:
Applied HARMONY-4268 [buildtest][eut] Improvements for Eclipse Unit Tests integration to the Build&Test infrastructure

Added:
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.162366.patch
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.193488.patch
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/eclipse.162366.patch
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/readme.txt   (with props)
Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/eut/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/eut/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/EUT.README.TXT
    harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.linux.x86
    harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.windows.x86
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut.properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/readme.txt

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/eut/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/eut/adaptor.xml?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/eut/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/eut/adaptor.xml Fri Jul 13 05:15:43 2007
@@ -33,14 +33,20 @@
             inheritAll="false">
             <property name="eut.location"
                 value="${eut.parameters.optional.eut.location}" />
+            <property name="eut.filename"
+                value="${eut.parameters.optional.eut.filename}" />
             <property name="eclipse.location"
                 value="${eut.parameters.optional.eclipse.location}" />
             <property name="eclipse.filename.prefix"
                 value="${eut.parameters.optional.eclipse.filename.prefix}" />
+            <property name="eclipse.buildid"
+                value="${eut.parameters.optional.eclipse.buildid}" />
             <property name="work.dir"
                 value="${checkouts.dir}/${suite.name}"/>
             <property name="result.dir"
                 value="${results.dir}/${suite.name}"/>
+            <property name="test.jre.home"
+                value="${eut.parameters.required.tested.runtime}"/>
         </ant>
     </target>
 
@@ -52,7 +58,7 @@
             inheritAll="false">
             <property name="eut.location"
                 value="${eut.parameters.optional.eut.location}" />
-            <property name="eut.filenae"
+            <property name="eut.filename"
                 value="${eut.parameters.optional.eut.filename}" />
             <property name="eclipse.location"
                 value="${eut.parameters.optional.eclipse.location}" />
@@ -90,7 +96,6 @@
                 <propertyref name="eut.parameters.optional.cvs_root"/>
                 <mapper type="glob" from="eut.parameters.optional.cvs_root" to="cvs_root"/>
             </propertyset>
-
             <property name="vm.options"
                 value="${eut.parameters.optional.tested.vm.options}"/>
             <property name="test.jre.home"

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/eut/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/eut/parameters.xml?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/eut/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/eut/parameters.xml Fri Jul 13 05:15:43 2007
@@ -15,14 +15,14 @@
      See the License for the specific language governing permissions and
      limitations under the License. -->
 
-<parameters depends="drlvm">
+<parameters depends="hdk">
 
     <!-- required -->
     <required>
         <!-- path to JRE under test -->
         <tested.runtime
             description="Path to JRE under test"
-            value="${drlvm.parameters.shared.jre.dir}"/>
+            value="${hdk.parameters.shared.binaries.jre.dir}"/>
     </required>
 
     <!-- shared values -->

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/EUT.README.TXT
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/EUT.README.TXT?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/EUT.README.TXT (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/EUT.README.TXT Fri Jul 13 05:15:43 2007
@@ -18,14 +18,24 @@
   |-+extra/                                - extra scripts and patches that might be useful for EUT runs
   |  |
   |  |-+eut.3.2.jdtcorecompiler.patching/  - patches for EUT 3.2 'jdtcorecompiler' suite in order to pass on Apache Harmony
-  |    |
-  |    |-+patch/                           - directory containing patches to be applied
-  |    |
-  |    |--build.xml                        - script that applies the patches
-  |    |
-  |    |--properties                       - patching pre-requisites settings (EUT and Eclipse 3.2 location)
-  |    |
-  |    |--readme.txt                       - readme file describing the patches
+  |  | |
+  |  | |-+patch/                           - directory containing patches to be applied
+  |  | |
+  |  | |--build.xml                        - script that applies the patches
+  |  | |
+  |  | |--properties                       - patching pre-requisites settings (EUT and Eclipse 3.2 location)
+  |  | |
+  |  | |--readme.txt                       - readme file describing the patches
+  |  |
+  |  |-+eut.3.2.jdtdebug.patching/         - patches for EUT 3.2 'jdtdebug' suite in order to pass on Apache Harmony
+  |  | |
+  |  | |-+patch/                           - directory containing patches to be applied
+  |  | |
+  |  | |--build.xml                        - script that applies the patches
+  |  | |
+  |  | |--properties                       - patching pre-requisites settings (EUT and Eclipse 3.2 location)
+  |  | |
+  |  | |--readme.txt                       - readme file describing the patches
   |
   |--build.xml                             - main EUT suite launching script
   |
@@ -40,7 +50,8 @@
 --------------
 * Make sure that PATH environment variable contains JRE 1.5 (use RI) and Apache
 Ant (version >=1.6.5), and that JAVA_HOME and ANT_HOME are properly set up. Make
-sure that 'unzip' tool can also be found in your PATH.
+sure that 'unzip' tool can also be found in your PATH (use Info-ZIP UnZip version
+5.41 or later http://www.info-zip.org/pub/infozip/UnZip.html).
 
 * If you use proxy server,
 specify proxy settings by setting ANT_OPTS environment variable:
@@ -111,5 +122,14 @@
    Some tests from org.eclipse.jdt.core.tests.eval suite fail because the timeout
    for VM launch is not enough for DRLVM. The patch consists in increasing the
    timeout to 30 seconds.
-3. As a temporary workaround for http://issues.apache.org/jira/browse/HARMONY-2914
+3. https://bugs.eclipse.org/bugs/show_bug.cgi?id=162366:
+   Several jdtdebug tests depend on VM behavior. See 'extra/eut.3.2.jdtdebug.patching/readme.txt'
+   for details on how to apply the patch.
+4. https://bugs.eclipse.org/bugs/show_bug.cgi?id=193488:
+   org.eclipse.jdt.debug.test.stepping.StepIntoSelectionTests depend on VM behavior.
+   One of these tests leaves open error dialog window 'Execution did not enter
+   "step" before the current method returned.', which requires user
+   interaction to finish tests execution. See 'extra/eut.3.2.jdtdebug.patching/readme.txt'
+   for details on how to apply the patch.
+5. As a temporary workaround for http://issues.apache.org/jira/browse/HARMONY-2914
    set open files limit to 64000 when running on Linux.

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml Fri Jul 13 05:15:43 2007
@@ -35,7 +35,7 @@
     <property name="eut.work.dir" location="${work.dir}/eclipse-testing"/>
 
     <!-- Test suite specific properties -->
-    <property name="tests" value="jdttext relEng pdeui ant compare coreruntime coreresources osgi coreexpressions help update teamcore jdtcoreperf jdtcorebuilder jdtcorecompiler jdtcoremodel ui uiperformance uieditors uinavigator uiworkbenchtexteditor uircp uiviews jdtdebug jdtui jdtuirefactoring ltkuirefactoringtests ltkcorerefactoringtests text jface jfacedatabinding filebuffers antui swt teamcvs jdtapt ua"/>
+    <property name="tests" value=""/>
 
     <property name="eut.filename" value="eclipse-Automated-Tests-3.2.zip"/>
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.linux.x86
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.linux.x86?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.linux.x86 (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.linux.x86 Fri Jul 13 05:15:43 2007
@@ -1,38 +1,26 @@
 #Crashes & Hangs
 
-org.eclipse.jdt.debug.tests.AutomatedSuite                                                          # HARMONY-4066
 org.eclipse.jdt.ui.tests.LeakTestSuite                                                              # JVMPI is unsupported - deprecated functionality, see Bug-2590
+org.eclipse.team.tests.ccvs.core.AllTests                                                           # HARMONY-4298
 
 #Failures and errors
 
-#Eclipse issues fixed in EUT 3.3 only
-org.eclipse.ant.tests.ui.editor.CodeCompletionTest.testAttributeProposals                           # https://bugs.eclipse.org/bugs/show_bug.cgi?id=176157, fixed in EUT 3.3
-org.eclipse.jdt.apt.tests.MirrorTests.testMirror                                                    # HARMONY-3390 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=161492, fixed in EUT 3.3
-org.eclipse.jdt.ui.tests.nls.NLSSourceModifierTest.testBug95708_2                                   # HARMONY-3391 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=189146, fixed in EUT 3.3
-org.eclipse.jdt.ui.tests.nls.NLSSourceModifierTest.testInsertionOrder2                              # HARMONY-3391 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=189146, fixed in EUT 3.3
+#TODO: To be investigated:
+org.eclipse.jdt.core.tests.compiler.regression.VarargsTest.test030 - 1.5                            # To be investigated, not reproducible on EUT 3.3
 
+#Harmony issues
 
-org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test1OutputOnReadOnly                # Invalid: intermittently fail on RI, looks like test issue
-org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test2Resolution                      # Invalid: intermittently fail on RI, looks like test issue
+# gc_gen warning in the output: tests fail because they compare the actual output with the expected ones. http://www.mail-archive.com/dev@harmony.apache.org/msg07849.html
+org.eclipse.jdt.core.tests.compiler.regression.LookupTest.test043 - 1.3
+org.eclipse.jdt.core.tests.compiler.regression.RuntimeTests.test0500_synchronization - 1.3
+org.eclipse.jdt.core.tests.compiler.regression.LookupTest.test044 - 1.4
+org.eclipse.jdt.core.tests.compiler.regression.FlowAnalysisTest.test009 - 1.4
+org.eclipse.jdt.core.tests.compiler.regression.LookupTest.test031 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.NonFatalErrorTest.test005 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.FlowAnalysisTest.test025 - 1.4
+# enf of gc_gen warning affected failures
 
-#To be investigated:
-
-org.eclipse.jdt.core.tests.model.JavaProjectTests.testExtraJavaLikeExtension1                       # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.JavaProjectTests.testUserLibrary                                   # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry02                             # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry04                             # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry05                             # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ClasspathTests.testUnknownAttributes                               # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ClasspathTests.testUnknownElements2                                # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.ReconcilerTests.testDeleteTwoMethods                               # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.WorkingCopyOwnerTests.testBecomeWorkingCopy3                       # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.JavaLikeExtensionsTests.testGetJavaLikeExtensions01                # to be investigated, similar to HARMONY-3393
-org.eclipse.jdt.core.tests.model.JavaLikeExtensionsTests.testGetJavaLikeExtensions02                # to be investigated, similar to HARMONY-3393
-
-
-#Known issues
-org.eclipse.core.tests.runtime.content.IContentTypeManagerTest.testContentDescription               # HARMONY-3343
-org.eclipse.core.tests.runtime.content.IContentTypeManagerTest.testRootElementAndDTDDescriber       # HARMONY-3343
+org.eclipse.core.tests.runtime.content.IContentTypeManagerTest.testRootElementAndDTDDescriber       # HARMONY-3850
 org.eclipse.jdt.text.tests.PluginsNotLoadedTest.testSearchPluginNotLoaded                           # HARMONY-3361
 org.eclipse.ui.tests.dynamicplugins.BrowserTests.testClass                                          # HARMONY-3359
 org.eclipse.ui.tests.dynamicplugins.PreferencePageTests.testClass                                   # HARMONY-3359
@@ -46,221 +34,81 @@
 org.eclipse.ui.tests.dynamicplugins.ViewTests.testClass                                             # HARMONY-3359
 org.eclipse.ui.tests.dynamicplugins.NewWizardTests.testClass                                        # HARMONY-3359
 org.eclipse.ui.tests.dynamicplugins.ObjectContributionTests.testClass                               # HARMONY-3359
-org.eclipse.jdt.core.tests.model.ClasspathTests.testEncoding                                        # HARMONY-3307
 org.eclipse.jface.tests.databinding.ObservableTest.testAddChangeListener                            # HARMONY-3362
 org.eclipse.jface.tests.databinding.DatabindingContextTest.testBindValueModel                       # HARMONY-3362
 org.eclipse.jface.tests.databinding.DatabindingContextTest.testBindValueTarget                      # HARMONY-3362
-org.eclipse.team.tests.ccvs.core.CVSTestSetup.unknown                                               # Configuration issue, see http://download.eclipse.org/eclipse/downloads/drops/M20070212-1330/automatedtesting.html for CVS configuration instructions
-org.eclipse.team.tests.ccvs.core.CVSUITestSetup.unknown                                             # Configuration issue, see http://download.eclipse.org/eclipse/downloads/drops/M20070212-1330/automatedtesting.html for CVS configuration instructions
-# HARMONY-3393
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0109 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0110 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0111 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0429 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0444 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0499 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0719 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0720 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0729 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0768 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0777 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0778 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0968 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0989 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0991 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0992 - 1.5
-org.eclipse.jdt.core.tests.compiler.regression.MethodVerifyTest.test088 - 1.5
-#end of HARMONY-3393 affected tests
-# HARMONY-3282
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test001 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test002 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test003 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test004 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test005 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test006 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test007 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test008 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test009 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test010 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test011 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test012 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test016 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test017 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test018 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test020 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test021 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test022 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test023 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test024 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test025 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test026 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test027 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test028 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test029 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test030 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test031 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test032 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test033 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test034 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test035 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test036 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test037 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test038 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test039 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test040 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test041 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test042 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test043 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test044 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test045 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test046 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test047 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test048 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test049 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test050 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test051 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test052 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test053 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test054 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test055 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test056 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test057 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test058 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test059 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test060 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test061 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test062 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative001 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative002 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative003 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative004 - 1.3
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test001 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test002 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test003 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test004 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test005 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test006 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test007 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test008 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test009 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test010 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test011 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test012 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test016 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test017 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test018 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test020 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test021 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test022 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test023 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test024 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test025 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test026 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test027 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test028 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test029 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test030 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test031 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test032 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test033 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test034 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test035 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test036 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test037 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test038 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test039 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test040 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test041 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test042 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test043 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test044 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test045 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test046 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test047 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test048 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test049 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test050 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test051 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test052 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test053 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test054 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test055 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test056 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test057 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test058 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test059 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test060 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test061 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test062 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative001 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative002 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative003 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative004 - 1.4
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test001 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test002 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test003 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test004 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test005 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test006 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test007 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test008 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test009 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test010 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test011 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test012 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test016 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test017 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test018 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test020 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test021 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test022 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test023 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test024 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test025 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test026 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test027 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test028 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test029 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test030 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test031 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test032 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test033 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test034 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test035 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test036 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test037 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test038 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test039 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test040 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test041 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test042 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test043 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test044 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test045 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test046 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test047 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test048 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test049 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test050 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test051 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test052 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test053 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test054 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test055 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test056 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test057 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test058 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test059 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test060 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test061 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test062 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative001 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative002 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative003 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.testNegative004 - 1.5
-org.eclipse.jdt.core.tests.eval.DebugEvaluationTest.test063 - 1.5
-# end of HARMONY-3282 failures
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=192576 - will not be fixed in Eclipse 3.2
+
+
+# HARMONY-3862 / https://bugs.eclipse.org/bugs/show_bug.cgi?id=194398
+org.eclipse.team.tests.ccvs.core.provider.CVSProviderTest.testUpdateWithNoChange
+org.eclipse.team.tests.ccvs.core.provider.IsModifiedTests.testUpdateIgnoreLocal
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testIncomingChanges
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.test46007
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testMergableConflicts
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testUnmergableConflicts
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testLocalScrub
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testBug37546MergeWantsToDeleteNewDirectories
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testOutgoingDeletionAfterMergeBug53129
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testMarkAsMerged
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testDeletedAddition
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testFileAddedToBranch
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testMergeNewFileToBranch
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testOverideAndUpdateSimple
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testOverrideOutgoingChanges
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testFileConflict
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testAdditionConflicts
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testDeletionConflicts
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testOverrideAndUpdateOutgoingAddition
+org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testOverUpdateAfterExternalDeletion
+org.eclipse.team.tests.ccvs.core.mappings.ResourceMapperTests.testReplace
+org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testBinaryAddition
+org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testStandardChanges
+org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testInvalidTag
+org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testBinaryAddition
+org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testBinaryMarkAsMerged
+# HARMONY-3862 / https://bugs.eclipse.org/bugs/show_bug.cgi?id=194398 related failures
+
+# HARMONY-4189
+org.eclipse.jdt.debug.tests.core.ArgumentTests.testVMArgStandardEmbeddedQuotes
+org.eclipse.jdt.debug.tests.core.ArgumentTests.testVMArgEmbeddedQuotes
+# End of HARMONY-4189 failures
+
+org.eclipse.jdt.debug.tests.core.HitCountBreakpointsTests.testResetHitCountBreakpoint               # HARMONY-4191
+
+#Eclipse issues fixed in Eclipse 3.3 or later
+
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0641 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195509
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0800 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195509
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0744 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195526
+
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=181026
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testArchiveSourceContainerMemento
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testAutoDetectRootSourceLookupPositive
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testAutoDetectRootSourceLookupNegative
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testSourceLookupPositive
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testSourceLookupNegative
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testPartiallyQualifiedSourceLookupPositive
+org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testAutoDetectUnqualifiedSourceLookupPositive
+# end of https://bugs.eclipse.org/bugs/show_bug.cgi?id=181026 failures
+
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0370 - 1.5                       #https://bugs.eclipse.org/bugs/show_bug.cgi?id=158518, fixed in EUT 3.3
+org.eclipse.ant.tests.ui.editor.CodeCompletionTest.testAttributeProposals                           # https://bugs.eclipse.org/bugs/show_bug.cgi?id=176157, fixed in EUT 3.3
+org.eclipse.jdt.apt.tests.MirrorTests.testMirror                                                    # HARMONY-3390 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=161492, fixed in EUT 3.3
+org.eclipse.jdt.ui.tests.nls.NLSSourceModifierTest.testBug95708_2                                   # HARMONY-3391 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=189146, fixed in EUT 3.3
+org.eclipse.jdt.ui.tests.nls.NLSSourceModifierTest.testInsertionOrder2                              # HARMONY-3391 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=189146, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.JavaProjectTests.testExtraJavaLikeExtension1                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.JavaProjectTests.testUserLibrary                                   # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry02                             # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry04                             # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ClasspathTests.testEncodeDecodeEntry05                             # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ClasspathTests.testUnknownAttributes                               # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ClasspathTests.testUnknownElements2                                # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.WorkingCopyOwnerTests.testBecomeWorkingCopy3                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.JavaLikeExtensionsTests.testGetJavaLikeExtensions01                # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.JavaLikeExtensionsTests.testGetJavaLikeExtensions02                # https://bugs.eclipse.org/bugs/show_bug.cgi?id=146215, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.JavadocTypeCompletionModelTest.test022                             # https://bugs.eclipse.org/bugs/show_bug.cgi?id=187223, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.model.ReconcilerTests.testDeleteTwoMethods                               # https://bugs.eclipse.org/bugs/show_bug.cgi?id=161555, fixed in EUT 3.3
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=188648 - will not be fixed in Eclipse 3.2
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test009 - 1.5
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test010 - 1.5
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test011 - 1.5
@@ -297,4 +145,35 @@
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test051 - 1.5
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test052 - 1.5
 org.eclipse.jdt.core.tests.compiler.regression.BatchCompilerTest.test053 - 1.5
-# end of https://bugs.eclipse.org/bugs/show_bug.cgi?id=192576 failures
+# end of https://bugs.eclipse.org/bugs/show_bug.cgi?id=188648 failures
+# HARMONY-3393 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=188103, fixed in EUT 3.3
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0109 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0110 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0111 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0429 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0444 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0499 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0719 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0720 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0729 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0768 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0777 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0778 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0968 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0989 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0991 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0992 - 1.5
+org.eclipse.jdt.core.tests.compiler.regression.MethodVerifyTest.test088 - 1.5
+#end of HARMONY-3393 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=188103, fixed in EUT 3.3
+
+#Invalid tests failing on RI
+
+org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test1OutputOnReadOnly                # Invalid: intermittently fails on RI, looks like test issue
+org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test2Resolution                      # Invalid: intermittently fails on RI, looks like test issue
+org.eclipse.core.tests.runtime.jobs.JobTest.testGetResult                                           # Invalid: intermittently fails on RI
+org.eclipse.jdt.debug.tests.core.MethodBreakpointTests.testInnerClassesHit                          # Incorrect test, timeout is not enough for Harmony
+org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText.test_copy                        # Invalid: intermittently fails on RI
+org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText.test_paste                        # Invalid: intermittently fails on RI
+org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text.test_copy                             # Invalid: intermittently fails on RI
+org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text.test_paste                            # Invalid: intermittently fails on RI
+

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.windows.x86
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.windows.x86?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.windows.x86 (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/efl.windows.x86 Fri Jul 13 05:15:43 2007
@@ -6,14 +6,10 @@
 #Failures and errors
 
 #TODO: To be investigated:
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0641 - 1.5                       # To be investigated
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0744 - 1.5                       # To be investigated
-org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0800 - 1.5                       # To be investigated
-org.eclipse.jdt.core.tests.compiler.regression.VarargsTest.test030 - 1.5                            # To be investigated
+org.eclipse.jdt.core.tests.compiler.regression.VarargsTest.test030 - 1.5                            # To be investigated, not reproducible on EUT 3.3
 
 #Harmony issues
 
-
 # gc_gen warning in the output: tests fail because they compare the actual output with the expected ones. http://www.mail-archive.com/dev@harmony.apache.org/msg07849.html
 org.eclipse.jdt.core.tests.compiler.regression.LookupTest.test043 - 1.3
 org.eclipse.jdt.core.tests.compiler.regression.RuntimeTests.test0500_synchronization - 1.3
@@ -43,7 +39,7 @@
 org.eclipse.jface.tests.databinding.DatabindingContextTest.testBindValueTarget                      # HARMONY-3362
 
 
-# HARMONY-3862: most probably is the ECJ issue, investigation in progress
+# HARMONY-3862 / https://bugs.eclipse.org/bugs/show_bug.cgi?id=194398
 org.eclipse.team.tests.ccvs.core.provider.CVSProviderTest.testUpdateWithNoChange
 org.eclipse.team.tests.ccvs.core.provider.IsModifiedTests.testUpdateIgnoreLocal
 org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest.testIncomingChanges
@@ -70,16 +66,20 @@
 org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testInvalidTag
 org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testBinaryAddition
 org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest.testBinaryMarkAsMerged
-# HARMONY-3862 related failures
+# HARMONY-3862 / https://bugs.eclipse.org/bugs/show_bug.cgi?id=194398 related failures
 
 # HARMONY-4189
 org.eclipse.jdt.debug.tests.core.ArgumentTests.testVMArgStandardEmbeddedQuotes
 org.eclipse.jdt.debug.tests.core.ArgumentTests.testVMArgEmbeddedQuotes
-# End of HARMONY-4189failures
+# End of HARMONY-4189 failures
 
 org.eclipse.jdt.debug.tests.core.HitCountBreakpointsTests.testResetHitCountBreakpoint               # HARMONY-4191
 
-#Eclipse issues fixed in Eclipse 3.3 only
+#Eclipse issues fixed in Eclipse 3.3 or later
+
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0641 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195509
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0800 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195509
+org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0744 - 1.5                       # https://bugs.eclipse.org/bugs/show_bug.cgi?id=195526
 
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=181026
 org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests.testArchiveSourceContainerMemento
@@ -165,11 +165,13 @@
 org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest.test0992 - 1.5
 org.eclipse.jdt.core.tests.compiler.regression.MethodVerifyTest.test088 - 1.5
 #end of HARMONY-3393 = https://bugs.eclipse.org/bugs/show_bug.cgi?id=188103, fixed in EUT 3.3
+
+#Invalid tests failing on RI
+
 org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test1OutputOnReadOnly                # Invalid: intermittently fails on RI, looks like test issue
 org.eclipse.core.tests.internal.runtime.PlatformURLSessionTest.test2Resolution                      # Invalid: intermittently fails on RI, looks like test issue
 org.eclipse.core.tests.runtime.jobs.JobTest.testGetResult                                           # Invalid: intermittently fails on RI
 org.eclipse.jdt.debug.tests.core.MethodBreakpointTests.testInnerClassesHit                          # Incorrect test, timeout is not enough for Harmony
-
 org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText.test_copy                        # Invalid: intermittently fails on RI
 org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText.test_paste                        # Invalid: intermittently fails on RI
 org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text.test_copy                             # Invalid: intermittently fails on RI

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/eut.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/eut.properties?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/eut.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/eut.properties Fri Jul 13 05:15:43 2007
@@ -23,9 +23,10 @@
 #tests=
 
 #Time to wait before killing testsuite by timeout, milliseconds. Default is 7200000.
-timeout=720000
+timeout=7200000
 
 #Eclipse SDK and Eclipse Unit Tests versions and filenames
+#Eclipse filename prefix should be of the form: eclipse-SDK-<version>
 eclipse.filename.prefix=eclipse-SDK-3.2
 eut.filename=eclipse-Automated-Tests-3.2.zip
 eclipse.buildid=3.2

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/build.xml?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/build.xml Fri Jul 13 05:15:43 2007
@@ -129,7 +129,7 @@
     </target>
 
     <target name="download.eut" unless="eut.exists">
-        <get src="${eut.location}/${eut.filename}" dest="${work.dir}/${eclipse.filename}" usetimestamp="true" verbose="true" />
+        <get src="${eut.location}/${eut.filename}" dest="${work.dir}/${eut.filename}" usetimestamp="true" verbose="true" />
     </target>
 
     <target name="unpack.eclipse.windows" if="is.windows">

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/readme.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/readme.txt?view=diff&rev=555964&r1=555963&r2=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/readme.txt (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtcorecompiler.patching/readme.txt Fri Jul 13 05:15:43 2007
@@ -8,16 +8,14 @@
 this archive to apply the patches.
 
 ---------------
-Archive Content
+Directory Content
 ---------------
 
-This archive contains script for patching Eclipse Unit Tests 'jdtcorecompiler'
+This directory contains script for patching Eclipse Unit Tests 'jdtcorecompiler'
 suite. The archive content is as follows:
 
-+<eut.jdtcorecompiler.patching>/
++<eut.3.2.jdtcorecompiler.patching>/
 |-+patch/                           - directory containing patches to apply
-|   |
-|   |--patch_eclipse172820          - patch to workaround EUT issue (see details below)
 |
 |--build.xml                        - Apache Ant scrip that applies given patches
 |

Added: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/build.xml?view=auto&rev=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/build.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/build.xml Fri Jul 13 05:15:43 2007
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="eut.jdtcorecompiler.patch" default="default" basedir=".">
+<description>Apply patches to Eclipse Unit Tests jdtdebug suite in order to pass on Apache Harmony</description>
+
+    <!-- Global settings -->
+    <property file="${basedir}/properties"/>
+
+    <property name="work.dir" location="${basedir}"/>
+    <mkdir dir="${work.dir}"/>
+
+    <!-- Patches specific settings -->
+    <property name="patch.location" location="${basedir}/patch"/>
+    <patternset id="to.patch.patterns">
+        <patternset id="to.patch.patterns.162366">
+            <include name="**/org/eclipse/jdt/debug/tests/core/StepFilterTests*"/>
+            <include name="**/testprograms/StepFilterOne*"/>
+            <include name="**/testprograms/StepFilterTwo*"/>
+            <include name="**/testprograms/StepFilterThree*"/>
+        </patternset>
+        <patternset id="to.patch.patterns.193488">
+            <include name="**/org/eclipse/debug/tests/targets/StepIntoSelectionClass*"/>
+        </patternset>
+   </patternset>
+
+    <property name="plugin.sources.to.patch" value="eclipse/plugins/org.eclipse.sdk.tests.source_3.2.0.v20060329/src/org.eclipse.jdt.debug.tests_3.1.0/javadebugtestssrc.zip"/>
+
+    <property name="plugin.to.patch.dir" value="eclipse/plugins/org.eclipse.jdt.debug.tests_3.1.0"/>
+    <property name="plugin.to.patch" value="${plugin.to.patch.dir}/javadebugtests.jar"/>
+
+    <!-- Define architecture/platform -->
+    <condition property="arch" value="x86">
+        <and>
+            <contains string="${os.arch}" substring="86" />
+            <not>
+                <contains string="${os.arch}" substring="64" />
+            </not>
+        </and>
+    </condition>
+    <condition property="arch" value="x86_64">
+        <or>
+            <contains string="${os.arch}" substring="86_64" />
+            <contains string="${os.arch}" substring="amd64" />
+        </or>
+    </condition>
+    <condition property="is.windows">
+        <os family="windows" />
+    </condition>
+    <condition property="is.linux">
+        <and>
+            <os family="unix" />
+            <os name="linux" />
+        </and>
+    </condition>
+    <condition property="is.windows.x86">
+        <and>
+            <isset property="is.windows" />
+            <equals arg1="${arch}" arg2="x86" />
+        </and>
+    </condition>
+    <condition property="is.linux.x86">
+        <and>
+            <isset property="is.linux" />
+            <equals arg1="${arch}" arg2="x86" />
+        </and>
+    </condition>
+    <condition property="is.linux.x86_64">
+        <and>
+            <isset property="is.linux" />
+            <equals arg1="${arch}" arg2="x86_64" />
+        </and>
+    </condition>
+
+    <!--  Define arch/os -specific properties -->
+    <condition property="eclipse.filename" value="${eclipse.filename.prefix}-win32.zip">
+        <isset property="is.windows.x86" />
+    </condition>
+    <condition property="eclipse.filename" value="${eclipse.filename.prefix}-linux-gtk.tar.gz">
+        <isset property="is.linux.x86" />
+    </condition>
+    <condition property="eclipse.filename" value="${eclipse.filename.prefix}-linux-gtk-x86_64.tar.gz">
+        <isset property="is.linux.x86_64" />
+    </condition>
+
+    <condition property="eclipse.exists">
+        <available file="${work.dir}/${eclipse.filename}"/>
+    </condition>
+
+    <property
+        name="eut.filename"
+        value="eclipse-Automated-Tests-3.2.zip"/>
+
+    <condition property="eut.exists">
+        <available file="${work.dir}/${eut.filename}"/>
+    </condition>
+
+    <property
+        name="eut.tests.archive.filename"
+        value="eclipse-junit-tests-M20060629-1905.zip"/>
+     <property
+        name="eut.dir"
+        location="${work.dir}/eclipse-testing"/>
+
+    <property
+        name="eclipse.dir"
+        value="${work.dir}/eclipse"/>
+
+<!-- ======== Setup: download and unpack prerequisites (EUT and Eclipse) ======== -->
+
+    <target name="download.eclipse" unless="eclipse.exists">
+        <get src="${eclipse.location}/${eclipse.filename}" dest="${work.dir}/${eclipse.filename}" usetimestamp="true" verbose="true" />
+    </target>
+
+    <target name="download.eut" unless="eut.exists">
+        <get src="${eut.location}/${eut.filename}" dest="${work.dir}/${eut.filename}" usetimestamp="true" verbose="true" />
+    </target>
+
+    <target name="unpack.eclipse.windows" if="is.windows">
+         <unzip
+            src="${work.dir}/${eclipse.filename}"
+            dest="${work.dir}"
+            overwrite="true"/>
+    </target>
+
+    <target name="unpack.eclipse.linux" if="is.linux">
+         <untar
+            src="${work.dir}/${eclipse.filename}"
+            dest="${work.dir}"
+            compression="gzip"
+            overwrite="true"/>
+    </target>
+
+    <target name="unpack.eclipse" depends="unpack.eclipse.windows,unpack.eclipse.linux"/>
+
+    <target name="unpack.eut">
+        <unzip
+            src="${work.dir}/${eut.filename}"
+            dest="${work.dir}"
+            overwrite="true"/>
+        <unzip
+            src="${work.dir}/eclipse-testing/${eut.tests.archive.filename}"
+            dest="${work.dir}/eclipse-testing"
+            overwrite="true"/>
+    </target>
+
+    <target name="setup" depends="download.eclipse,unpack.eclipse,download.eut,unpack.eut">
+    </target>
+
+<!-- ======== Extract sources and apply patches ======== -->
+
+    <target name="extract.sources.to.patch">
+        <delete dir="${work.dir}/sources_to_patch"/>
+        <mkdir dir="${work.dir}/sources_to_patch"/>
+        <unzip
+            src="${eut.dir}/${plugin.sources.to.patch}"
+            dest="${work.dir}/sources_to_patch">
+            <patternset refid="to.patch.patterns"/>
+        </unzip>
+    </target>
+
+    <target name="concat.patches">
+        <concat destfile="${work.dir}/all.patches" append="false">
+            <fileset dir="${patch.location}/tests"/>
+        </concat>
+    </target>
+
+    <target name="try.patch.sources" depends="concat.patches">
+        <delete failonerror="false">
+            <fileset dir="${work.dir}" includes="patched.tmp,patched.tmp.rej"/>
+        </delete>
+        <patch
+            dir="${work.dir}/sources_to_patch"
+            patchfile="${work.dir}/all.patches"
+            strip="2"
+            destfile="${work.dir}/patched.tmp"
+        />
+        <fail message="Patch wasn't applied successfully (see output for details)! Check that you use valid original EUT archive and the patches from ${work.dir}/patch don't interfere.">
+            <condition>
+                <available file="${work.dir}/patched.tmp.rej"/>
+            </condition>
+        </fail>
+        <delete file="${work.dir}/patched.tmp"/>
+    </target>
+
+    <target name="patch.sources" depends="concat.patches,try.patch.sources">
+        <delete dir="${work.dir}/sources_patched" failonerror="false"/>
+        <copy todir="${work.dir}/sources_patched" overwrite="true">
+            <fileset dir="${work.dir}/sources_to_patch"/>
+        </copy>
+        <patch
+            dir="${work.dir}/sources_patched"
+            patchfile="${work.dir}/all.patches"
+            strip="2"
+        />
+    </target>
+
+    <!-- testprograms sources - specific for jdtdebug suite -->
+    <target name="concat.testprograms.patches">
+        <concat destfile="${work.dir}/all.testprograms.patches" append="false">
+            <fileset dir="${patch.location}/testprograms"/>
+        </concat>
+    </target>
+
+    <target name="try.patch.testprograms.sources" depends="concat.testprograms.patches">
+        <delete failonerror="false">
+            <fileset dir="${work.dir}" includes="testprograms.patched.tmp,testprograms.patched.tmp.rej"/>
+        </delete>
+        <patch
+            dir="${eut.dir}/${plugin.to.patch.dir}"
+            patchfile="${work.dir}/all.testprograms.patches"
+            strip="1"
+            destfile="${work.dir}/testprograms.patched.tmp"
+        />
+        <fail message="Patch wasn't applied successfully (see output for details)! Check that you use valid original EUT archive and the patches from ${work.dir}/patch don't interfere.">
+            <condition>
+                <available file="${work.dir}/testprograms.patched.tmp.rej"/>
+            </condition>
+        </fail>
+        <delete file="${work.dir}/testprograms.patched.tmp"/>
+    </target>
+
+    <target name="patch.testprograms.sources" depends="concat.testprograms.patches,try.patch.testprograms.sources">
+        <patch
+            dir="${eut.dir}/${plugin.to.patch.dir}"
+            patchfile="${work.dir}/all.testprograms.patches"
+            strip="1"
+        />
+    </target>
+    <!-- end od jdtdebug suite specific stuff -->
+
+<!-- ======== Compile patched sources ======== -->
+
+    <target name="compile.patched.sources">
+         <fail message="The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib">
+            <condition>
+                <not>
+                    <available classname="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+                </not>
+            </condition>
+        </fail>
+        <property name="javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+        <property name="javac.source" value="1.5" />
+        <property name="javac.target" value="1.5" />
+        <property name="destdir" value="${work.dir}/classes_patched" />
+        <mkdir dir="${destdir}"/>
+        <javac compiler="${javac.compiler}"
+            srcdir="${work.dir}/sources_patched"
+            destdir="${work.dir}/classes_patched"
+            includeAntRuntime="no">
+            <compilerarg line="" />
+            <classpath>
+                <fileset dir="${eclipse.dir}/plugins"
+                    includes="**/*.jar" />
+                <fileset dir="${eut.dir}/eclipse/plugins"
+                    includes="**/*.jar" />
+            </classpath>
+        </javac>
+    </target>
+
+<!-- ======== Pack patched files to EUT archive ======== -->
+
+    <target name="pack.patched.sources">
+        <zip
+            update="true"
+            basedir="${work.dir}/sources_patched"
+            keepcompression="true"
+            destfile="${eut.dir}/${plugin.sources.to.patch}">
+            <patternset refid="to.patch.patterns"/>
+        </zip>
+    </target>
+
+    <target name="pack.patched.classes">
+        <zip
+            update="true"
+            basedir="${work.dir}/classes_patched"
+            keepcompression="true"
+            destfile="${eut.dir}/${plugin.to.patch}">
+            <patternset refid="to.patch.patterns"/>
+        </zip>
+    </target>
+
+    <target name="pack.patched.testprograms.sources">
+        <zip
+            update="true"
+            basedir="${work.dir}/testprograms_sources_patched"
+            keepcompression="true"
+            destfile="${eut.dir}/${plugin.to.patch}">
+            <patternset refid="to.patch.patterns"/>
+        </zip>
+    </target>
+
+
+    <target name="pack.eut">
+        <zip
+            destfile="${eut.dir}/${eut.tests.archive.filename}"
+            update="false"
+            keepcompression="true">
+            <zipfileset dir="${eut.dir}/eclipse" prefix="eclipse"/>
+        </zip>
+        <delete dir="${eut.dir}/eclipse"/>
+        <delete dir="${eut.dir}/patched" failonerror="false"/>
+        <mkdir dir="${work.dir}/patched"/>
+        <zip
+            destfile="${work.dir}/patched/${eut.filename}"
+            update="false"
+            duplicate="preserve"
+            keepcompression="true">
+            <zipfileset dir="${eut.dir}" excludes="runtests" prefix="eclipse-testing"/>
+            <zipfileset dir="${eut.dir}" includes="runtests" prefix="eclipse-testing" filemode="755"/>
+        </zip>
+    </target>
+
+<!-- ======== Clean work files/directories ======== -->
+
+    <target name="-clean">
+        <delete failonerror="false" includeemptydirs="true">
+            <fileset dir="${work.dir}/sources_to_patch"/>
+            <fileset dir="${work.dir}/testprograms_sources_to_patch"/>
+            <fileset dir="${work.dir}/sources_patched"/>
+            <fileset dir="${work.dir}/testprograms_sources_patched"/>
+            <fileset dir="${work.dir}/classes_patched"/>
+            <fileset dir="${work.dir}" includes="patched.tmp,patched.tmp.rej"/>
+            <fileset dir="${work.dir}" includes="all.patches,all.testprograms.patches"/>
+            <fileset dir="${eut.dir}"/>
+        </delete>
+    </target>
+
+<!-- ======== Clean work and results files/directories ======== -->
+    <target name="clean" depends="-clean">
+        <delete failonerror="false" includeemptydirs="true">
+            <fileset dir="${eclipse.dir}"/>
+            <fileset dir="${work.dir}/patched"/>
+        </delete>
+    </target>
+
+    <target name="default" depends="setup,extract.sources.to.patch,patch.sources,patch.testprograms.sources,compile.patched.sources,pack.patched.sources,pack.patched.classes,pack.eut,-clean">
+    </target>
+
+</project>

Added: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.162366.patch
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.162366.patch?view=auto&rev=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.162366.patch (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.162366.patch Fri Jul 13 05:15:43 2007
@@ -0,0 +1,164 @@
+diff -u -r org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
+--- org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java	2007-06-20 20:15:57.129366200 +0700
++++ org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java	2007-06-20 20:01:01.462836200 +0700
+@@ -1,25 +1,27 @@
+-/*******************************************************************************
+- * Copyright (c) 2000, 2005 IBM Corporation and others.
+- * All rights reserved. This program and the accompanying materials
+- * are made available under the terms of the Eclipse Public License v1.0
+- * which accompanies this distribution, and is available at
+- * http://www.eclipse.org/legal/epl-v10.html
+- * 
+- * Contributors:
+- *     IBM Corporation - initial API and implementation
+- *******************************************************************************/
+-
+-public class StepFilterOne {
+-
+-	public static void main(String[] args) {
+-		StepFilterOne sf1 = new StepFilterOne();
+-		sf1.go();
+-	}
+-	
+-	private void go() {
+-		StepFilterTwo sf2 = new StepFilterTwo();
+-		sf2.test();
+-		sf2.go();
+-	}
+-}
+-
++/*******************************************************************************
++ * Copyright (c) 2000, 2006 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ * 
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++
++public class StepFilterOne {
++
++	public static void main(String[] args) {
++		StepFilterOne sf1 = new StepFilterOne();
++		sf1.go();
++	}
++	
++	private void go() {
++		StepFilterTwo sf2 = new StepFilterTwo();
++		sf2.test();
++		sf2.go();
++		sf2.test();
++		sf2.go();
++	}
++}
++
+diff -u -r org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
+--- org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java	2007-06-20 20:15:57.129366200 +0700
++++ org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java	2007-06-20 20:01:01.462836200 +0700
+@@ -1,22 +1,22 @@
+-/*******************************************************************************
+- * Copyright (c) 2000, 2005 IBM Corporation and others.
+- * All rights reserved. This program and the accompanying materials
+- * are made available under the terms of the Eclipse Public License v1.0
+- * which accompanies this distribution, and is available at
+- * http://www.eclipse.org/legal/epl-v10.html
+- * 
+- * Contributors:
+- *     IBM Corporation - initial API and implementation
+- *******************************************************************************/
+-
+-public class StepFilterThree {
+-
+-	public StepFilterThree() {
+-		//int i = 0;
+-	}
+-
+-	void go() {
+-		System.out.println("StepFilterThree.go()");
+-	}
+-}
+-
++/*******************************************************************************
++ * Copyright (c) 2000, 2006 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ * 
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++
++public class StepFilterThree {
++
++	public StepFilterThree() {
++		//int i = 0;
++	}
++
++	void go() {
++		for (int i = 0; i < 10; i++);
++	}
++}
++
+diff -u -r org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
+--- org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java	2007-06-20 20:15:57.129366200 +0700
++++ org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java	2007-06-20 20:01:01.462836200 +0700
+@@ -1,28 +1,28 @@
+-/*******************************************************************************
+- * Copyright (c) 2000, 2005 IBM Corporation and others.
+- * All rights reserved. This program and the accompanying materials
+- * are made available under the terms of the Eclipse Public License v1.0
+- * which accompanies this distribution, and is available at
+- * http://www.eclipse.org/legal/epl-v10.html
+- * 
+- * Contributors:
+- *     IBM Corporation - initial API and implementation
+- *******************************************************************************/
+-
+-public class StepFilterTwo {
+-
+-	private StepFilterThree sf3;
+-
+-	public StepFilterTwo() {
+-		sf3 = new StepFilterThree();
+-	}
+-
+-	protected void go() {
+-		sf3.go();
+-	}
+-	
+-	void test() {
+-		System.out.println("StepFilterTwo.test()");
+-	}
+-}
+-
++/*******************************************************************************
++ * Copyright (c) 2000, 2006 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ * 
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++
++public class StepFilterTwo {
++
++	private StepFilterThree sf3;
++
++	public StepFilterTwo() {
++		sf3 = new StepFilterThree();
++	}
++
++	protected void go() {
++		sf3.go();
++	}
++	
++	void test() {
++		for (int i = 0; i < 10; i++);
++	}
++}
++

Added: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.193488.patch
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.193488.patch?view=auto&rev=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.193488.patch (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/testprograms/testprograms.eclipse.193488.patch Fri Jul 13 05:15:43 2007
@@ -0,0 +1,12 @@
+diff -u -r org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java
+--- org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java	2007-06-20 20:15:57.098120200 +0700
++++ org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java	2007-06-20 19:09:45.905734000 +0700
+@@ -18,7 +18,7 @@
+ public class StepIntoSelectionClass {
+ 
+ 	public static void main(String[] args) {
+-		StepIntoSelectionClass stepper = new StepIntoSelectionClass();
++		StepIntoSelectionClass stepper = new StepIntoSelectionClass(); stepper.step();
+ 		stepper.step();
+ 	}
+ 	

Added: harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/eclipse.162366.patch
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/eclipse.162366.patch?view=auto&rev=555964
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/eclipse.162366.patch (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/extra/eut.3.2.jdtdebug.patching/patch/tests/eclipse.162366.patch Fri Jul 13 05:15:43 2007
@@ -0,0 +1,356 @@
+diff -u -r org.eclipse.jdt.debug.tests/src-javadebugtests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java org.eclipse.jdt.debug.tests/src-javadebugtests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
+--- org.eclipse.jdt.debug.tests/src-javadebugtests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java	2007-06-20 20:15:57.660548200 +0700
++++ org.eclipse.jdt.debug.tests/src-javadebugtests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java	2007-06-20 20:09:57.408839000 +0700
+@@ -1,160 +1,191 @@
+-/*******************************************************************************
+- * Copyright (c) 2000, 2005 IBM Corporation and others.
+- * All rights reserved. This program and the accompanying materials
+- * are made available under the terms of the Eclipse Public License v1.0
+- * which accompanies this distribution, and is available at
+- * http://www.eclipse.org/legal/epl-v10.html
+- * 
+- * Contributors:
+- *     IBM Corporation - initial API and implementation
+- *******************************************************************************/
+-package org.eclipse.jdt.debug.tests.core;
+-
+-import org.eclipse.debug.core.model.ILineBreakpoint;
+-import org.eclipse.jdt.debug.core.IJavaStackFrame;
+-import org.eclipse.jdt.debug.core.IJavaThread;
+-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
+-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
+-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+-import org.eclipse.jface.preference.IPreferenceStore;
+-
+-/**
+- * Step filtering tests
+- * This test forces the UI plugins to load.
+- */
+-public class StepFilterTests extends AbstractDebugTest {
+-
+-	private String fOriginalActiveFilters;
+-	private String fOriginalInactiveFilters;
+-
+-	public StepFilterTests(String name) {
+-		super(name);
+-		fOriginalActiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST);
+-		fOriginalInactiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST);		
+-	}
+-
+-	public void testSimpleStepFilter() throws Exception {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
+-		String typeName = "StepFilterOne";
+-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
+-		bp.setEnabled(true);
+-		
+-		IJavaThread thread = null;
+-		try {
+-			thread= launchToLineBreakpoint(typeName, bp, false);
+-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			thread = stepIntoWithFilters(stackFrame);
+-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			String recTypeName = stackFrame.getReceivingTypeName();
+-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+-			int lineNumber = stackFrame.getLineNumber();
+-			assertTrue("Line number should have been 22, but was " + lineNumber, lineNumber == 22);			
+-		} finally {
+-			terminateAndRemove(thread);
+-			removeAllBreakpoints();
+-			resetStepFilters();
+-		}				
+-	}
+-	
+-	public void testInactiveStepFilter() throws Exception {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo");
+-		String typeName = "StepFilterOne";
+-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
+-		bp.setEnabled(true);
+-		
+-		IJavaThread thread = null;
+-		try {
+-			thread= launchToLineBreakpoint(typeName, bp, false);
+-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			thread = stepIntoWithFilters(stackFrame);
+-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			String recTypeName = stackFrame.getReceivingTypeName();
+-			assertTrue("Receiving type name should have been 'StepFilterTwo' but was " + recTypeName, recTypeName.equals("StepFilterTwo"));
+-			int lineNumber = stackFrame.getLineNumber();
+-			assertTrue("Line number should have been 25, but was " + lineNumber, lineNumber == 25);			
+-		} finally {
+-			terminateAndRemove(thread);
+-			removeAllBreakpoints();
+-			resetStepFilters();
+-		}						
+-	}
+-	
+-	public void testDeepStepFilter() throws Exception {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
+-		String typeName = "StepFilterOne";
+-		ILineBreakpoint bp = createLineBreakpoint(22, typeName);
+-		bp.setEnabled(true);
+-		
+-		IJavaThread thread = null;
+-		try {
+-			thread= launchToLineBreakpoint(typeName, bp, false);
+-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			thread = stepIntoWithFilters(stackFrame);
+-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			String recTypeName = stackFrame.getReceivingTypeName();
+-			assertTrue("Receiving type name should have been 'StepFilterThree' but was " + recTypeName, recTypeName.equals("StepFilterThree"));
+-			int lineNumber = stackFrame.getLineNumber();
+-			assertTrue("Line number should have been 19, but was " + lineNumber, lineNumber == 19);			
+-		} finally {
+-			terminateAndRemove(thread);
+-			removeAllBreakpoints();
+-			resetStepFilters();
+-		}				
+-	}	
+-
+-	public void testStepReturnFilter() throws Exception {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
+-		String typeName = "StepFilterOne";
+-		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
+-		bp.setEnabled(true);
+-		
+-		IJavaThread thread = null;
+-		try {
+-			thread= launchToLineBreakpoint(typeName, bp, false);
+-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			thread = stepReturnWithFilters(stackFrame);
+-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			String recTypeName = stackFrame.getReceivingTypeName();
+-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+-			int lineNumber = stackFrame.getLineNumber();
+-			assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);			
+-		} finally {
+-			terminateAndRemove(thread);
+-			removeAllBreakpoints();
+-			resetStepFilters();
+-		}				
+-	}
+-	
+-	public void testStepOverFilter() throws Exception {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo,StepFilterThree," + fOriginalInactiveFilters);
+-		String typeName = "StepFilterOne";
+-		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
+-		bp.setEnabled(true);
+-		
+-		IJavaThread thread = null;
+-		try {
+-			thread= launchToLineBreakpoint(typeName, bp, false);
+-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			thread = stepOverWithFilters(stackFrame);
+-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
+-			String recTypeName = stackFrame.getReceivingTypeName();
+-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+-			int lineNumber = stackFrame.getLineNumber();
+-			assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);			
+-		} finally {
+-			terminateAndRemove(thread);
+-			removeAllBreakpoints();
+-			resetStepFilters();
+-		}				
+-	}	
+-	
+-	protected void resetStepFilters() {
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters);
+-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalInactiveFilters);
+-	}
+-
+-	protected IPreferenceStore getPrefStore() {
+-		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
+-	}
+-}
+-
++/*******************************************************************************
++ * Copyright (c) 2000, 2006 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ *
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++package org.eclipse.jdt.debug.tests.core;
++
++import org.eclipse.debug.core.model.ILineBreakpoint;
++import org.eclipse.jdt.debug.core.IJavaStackFrame;
++import org.eclipse.jdt.debug.core.IJavaThread;
++import org.eclipse.jdt.debug.tests.AbstractDebugTest;
++import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
++import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
++import org.eclipse.jface.preference.IPreferenceStore;
++
++/**
++ * Step filtering tests
++ * This test forces the UI plug-ins to load.
++ */
++public class StepFilterTests extends AbstractDebugTest {
++
++	private String fOriginalActiveFilters;
++	private String fOriginalInactiveFilters;
++
++	/**
++	 * Constructor
++	 * @param name
++	 */
++	public StepFilterTests(String name) {
++		super(name);
++		fOriginalActiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST);
++		fOriginalInactiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST);		
++	}
++
++	/**
++	 * Tests a simple step filter
++	 * @throws Exception
++	 */
++	public void testSimpleStepFilter() throws Exception {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
++		String typeName = "StepFilterOne";
++		ILineBreakpoint bp = createLineBreakpoint(23, typeName);
++		bp.setEnabled(true);
++		
++		IJavaThread thread = null;
++		try {
++			thread= launchToLineBreakpoint(typeName, bp, true);
++			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			thread = stepIntoWithFilters(stackFrame);
++			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			String recTypeName = stackFrame.getReceivingTypeName();
++			assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
++			int lineNumber = stackFrame.getLineNumber();
++			assertEquals("Wrong line number", 24, lineNumber);			
++		} finally {
++			terminateAndRemove(thread);
++			removeAllBreakpoints();
++			resetStepFilters();
++		}				
++	}
++	
++	/**
++	 * Tests a step filter that is not active
++	 * @throws Exception
++	 */
++	public void testInactiveStepFilter() throws Exception {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo");
++		String typeName = "StepFilterOne";
++		ILineBreakpoint bp = createLineBreakpoint(23, typeName);
++		bp.setEnabled(true);
++		
++		IJavaThread thread = null;
++		try {
++			thread= launchToLineBreakpoint(typeName, bp, false);
++			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			thread = stepIntoWithFilters(stackFrame);
++			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			String recTypeName = stackFrame.getReceivingTypeName();
++			assertEquals("Wrong receiving type", "StepFilterTwo", recTypeName);
++			int lineNumber = stackFrame.getLineNumber();
++			assertEquals("Wrong line number", 25, lineNumber);			
++		} finally {
++			terminateAndRemove(thread);
++			removeAllBreakpoints();
++			resetStepFilters();
++		}						
++	}
++	
++	/**
++	 * Tests a deep step filter, i.e. a step filter that is more than one stack frame deep on the current
++	 * suspended thread
++	 * @throws Exception
++	 */
++	public void testDeepStepFilter() throws Exception {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
++		String typeName = "StepFilterOne";
++		ILineBreakpoint bp = createLineBreakpoint(24, typeName);
++		bp.setEnabled(true);
++		
++		IJavaThread thread = null;
++		try {
++			thread= launchToLineBreakpoint(typeName, bp, false);
++			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			thread = stepIntoWithFilters(stackFrame);
++			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			String recTypeName = stackFrame.getReceivingTypeName();
++			assertEquals("Wrong receiving type", "StepFilterThree", recTypeName);
++			int lineNumber = stackFrame.getLineNumber();
++			assertEquals("Wrong line number", 19, lineNumber);			
++		} finally {
++			terminateAndRemove(thread);
++			removeAllBreakpoints();
++			resetStepFilters();
++		}				
++	}	
++
++	/**
++	 * Tests a simple step return filter
++	 * @throws Exception
++	 */
++	public void testStepReturnFilter() throws Exception {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
++		String typeName = "StepFilterOne";
++		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
++		bp.setEnabled(true);
++		
++		IJavaThread thread = null;
++		try {
++			thread= launchToLineBreakpoint(typeName, bp, false);
++			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			thread = stepReturnWithFilters(stackFrame);
++			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			String recTypeName = stackFrame.getReceivingTypeName();
++			assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
++			int lineNumber = stackFrame.getLineNumber();
++			assertEquals("Wrong line number", 23, lineNumber);			
++		} finally {
++			terminateAndRemove(thread);
++			removeAllBreakpoints();
++			resetStepFilters();
++		}				
++	}
++	
++	/**
++	 * Tests a simple step over filter
++	 * @throws Exception
++	 */
++	public void testStepOverFilter() throws Exception {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo,StepFilterThree," + fOriginalInactiveFilters);
++		String typeName = "StepFilterOne";
++		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
++		bp.setEnabled(true);
++		
++		IJavaThread thread = null;
++		try {
++			thread= launchToLineBreakpoint(typeName, bp, false);
++			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			thread = stepOverWithFilters(stackFrame);
++			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
++			String recTypeName = stackFrame.getReceivingTypeName();
++			assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
++			int lineNumber = stackFrame.getLineNumber();
++			assertEquals("Wrong line number", 23, lineNumber);			
++		} finally {
++			terminateAndRemove(thread);
++			removeAllBreakpoints();
++			resetStepFilters();
++		}				
++	}	
++	
++	/**
++	 * Reset the step filtering preferences
++	 */
++	protected void resetStepFilters() {
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters);
++		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalInactiveFilters);
++	}
++
++	/**
++	 * Returns the <code>JDIDebugUIPlugin</code> preference store
++	 * @return
++	 */
++	protected IPreferenceStore getPrefStore() {
++		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
++	}
++}
+



Mime
View raw message