Merge "Check for nest annotations in SyntheticMethodsTest" am: a63065e86e

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2358779

Change-Id: I5a1860ed7c4dae5e6f98dd39c34fe9f84a6828ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SyntheticMethodsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SyntheticMethodsTest.java
index 158b072..8effa0c 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SyntheticMethodsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SyntheticMethodsTest.java
@@ -37,6 +37,20 @@ public class SyntheticMethodsTest extends JDWPSyncTestCase {
         return SyntheticMembersDebuggee.class.getName();
     }
 
+    private boolean doesDebuggeeClassUseNestAnnotation() {
+        // If the nest group annotations are used in SyntheticMembersDebuggee, then its nest group
+        // will contain at least one other member (SyntheticMembersDebuggee.InnerClass). Without the
+        // annotations, the group would only have SyntheticMembersDebuggee.
+        Class debuggee = SyntheticMembersDebuggee.class;
+        Class[] members = debuggee.getNestMembers();
+        for (Class member : members) {
+            if (member != debuggee) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * This testcase exercises ReferenceType.Methods command.
      *
@@ -109,7 +123,12 @@ public class SyntheticMethodsTest extends JDWPSyncTestCase {
         }
         assertAllDataRead(methodsReply);
 
-        assertTrue("Did not find any synthetic method", foundSyntheticMethod);
+        if (doesDebuggeeClassUseNestAnnotation()) {
+            assertFalse("Found synthetic methods when nest group information is available",
+                    foundSyntheticMethod);
+        } else {
+            assertTrue("Did not find any synthetic method", foundSyntheticMethod);
+        }
 
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE);
         logWriter.println("==> " + thisTestName + " for " + commandName + ": FINISH");