commit 009a195c5507ddc799cf7a52927b0ac02aa7f7e6
author Alex Light <allight@google.com> Wed Feb 03 21:51:04 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 21:51:04 2016 +0000
tree a1eaac50bc6f117140388a53bf9f945434c67f0e
parent 287fd33a9f03f16ae52a3b290bcabb49bc65d97b
parent 42d511da4bb2f918b4c5f4372f91771ab5b61c83

Merge "Fix class_linker_test to take into account default methods."

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 40dfda9..a909cd8 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -210,11 +210,10 @@
                                                klass->GetDescriptor(&temp2)));
     if (klass->IsInterface()) {
       EXPECT_TRUE(klass->IsAbstract());
-      if (klass->NumDirectMethods() == 1) {
-        EXPECT_TRUE(klass->GetDirectMethod(0, sizeof(void*))->IsClassInitializer());
-        EXPECT_TRUE(klass->GetDirectMethod(0, sizeof(void*))->IsDirect());
-      } else {
-        EXPECT_EQ(0U, klass->NumDirectMethods());
+      // Check that all direct methods are static (either <clinit> or a regular static method).
+      for (ArtMethod& m : klass->GetDirectMethods(sizeof(void*))) {
+        EXPECT_TRUE(m.IsStatic());
+        EXPECT_TRUE(m.IsDirect());
       }
     } else {
       if (!klass->IsSynthetic()) {