Merge "Enable field watchpoint tests"idea133-weekly-release

3 files changed, 7 insertions, 11 deletions

diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
index ecca19c..57b7506 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
@@ -38,8 +38,8 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class CapabilitiesNewTest extends JDWPSyncTestCase {
 
     static Object [][] capabilitiesFlags = {
-            {"canWatchFieldModification",        null},
-            {"canWatchFieldAccess",              null},
+            {"canWatchFieldModification",        "true"},
+            {"canWatchFieldAccess",              "true"},
             {"canGetBytecodes",                  "true"},
             {"canGetSyntheticAttribute",         "true"},
             {"canGetOwnedMonitorInfo",           "true"},
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesTest.java
index f6e8dbc..cdbc834 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesTest.java
@@ -69,12 +69,10 @@ public class CapabilitiesTest extends JDWPSyncTestCase {
 
         logWriter.println("\tcanWatchFieldModification\t= "
                 + canWatchFieldModification);
-        // TODO: the RI implements this, and we should, but currently don't. "@KnownFailure".
-        //assertTrue("canWatchFieldModification must be true", canWatchFieldModification);
+        assertTrue("canWatchFieldModification must be true", canWatchFieldModification);
 
         logWriter.println("\tcanWatchFieldAccess\t\t= " + canWatchFieldAccess);
-        // TODO: the RI implements this, and we should, but currently don't. "@KnownFailure".
-        //assertTrue("canWatchFieldAccess must be true", canWatchFieldAccess);
+        assertTrue("canWatchFieldAccess must be true", canWatchFieldAccess);
 
         logWriter.println("\tcanGetBytecodes\t\t\t= " + canGetBytecodes);
         assertTrue("canGetBytecodes must be true", canGetBytecodes);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
index dc62d1d..c21abaa 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
@@ -29,11 +29,6 @@ public class AllTests {
     // "TODO".
     //
 
-    // These will presumably require interpreting the whole system, but that's no worse than gdb.
-    //suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldAccessTest.class);
-    //suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldModification002Test.class);
-    //suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldModificationTest.class);
-
     // I haven't yet found an IDE that will use these, but we might want to implement them anyway.
     //suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnteredTest.class);
     //suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnterTest.class);
@@ -84,6 +79,9 @@ public class AllTests {
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.CombinedEvents003Test.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.CombinedEventsTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.ExceptionTest.class);
+    suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldAccessTest.class);
+    suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldModification002Test.class);
+    suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.FieldModificationTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.MethodEntryTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.MethodExitTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.Events.MethodExitWithReturnValueTest.class);