Merge "Disable a few tests that don't work with ART" into main am: 9561ea02cd am: abb611dcc0
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2846273
Change-Id: I184b7ec374dd217f4cf1223a8b320e8e32b498b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 55ce1ca..62862ec 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
@@ -129,6 +129,27 @@
// though.
Set<String> bad_test_cases = new HashSet<>();
bad_test_cases.addAll(Arrays.asList(TEST_OPTIONS.getBadTestCases()));
+
+ // TODO(b/227193963): ART and RI don't report errors for certain JNI checks like incorrect
+ // method IDs on invoke method or incorrect field ids on GetField. Though this is required by
+ // the spec ART has never supported this. RI doesn't support it either. So disable the following
+ // tests.
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethodTest#testInvokeMethod002");
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethodTest#testInvokeMethod003");
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.ReferenceType_GetValues002Test#testGetValues002");
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.ReferenceType_GetValues004Test#testGetValues004");
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.StringReference_ValueTest#"
+ + "testStringReferenceValueTest001_NullString");
+ bad_test_cases.add(
+ "org.apache.harmony.jpda.tests.jdwp.ClassType_InvokeMethod002Test#"
+ + "testInvokeMethod_wrong_argument_types");
+
+
FilterSuite suite = (k) -> {
try {
baseSuite.addTest(
