commit 9cc262e2ad5cb507c21cc83b8dc954e9354a469c
author Brian Carlstrom <bdc@google.com> Sun Aug 28 12:45:30 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Aug 28 12:49:05 2011 -0700
tree 869c3662ab908891e85b446760255b825b86a274
parent b63ec393a5c4ba2be1d34dd871cda811eaa803c7

Clarify CodeAndMethods to CodeAndDirectMethods

Change-Id: Ifa564ea25f4c7eb168f367274679a4915b9f4715

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 71bf523..9fd5fb5 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -105,13 +105,13 @@
     EXPECT_TRUE(method->dex_cache_types_ != NULL);
     EXPECT_TRUE(method->dex_cache_methods_ != NULL);
     EXPECT_TRUE(method->dex_cache_fields_ != NULL);
-    EXPECT_TRUE(method->dex_cache_code_and_methods_ != NULL);
+    EXPECT_TRUE(method->dex_cache_code_and_direct_methods_ != NULL);
     EXPECT_EQ(method->declaring_class_->dex_cache_->GetStrings(), method->dex_cache_strings_);
     EXPECT_EQ(method->declaring_class_->dex_cache_->GetTypes(), method->dex_cache_types_);
     EXPECT_EQ(method->declaring_class_->dex_cache_->GetMethods(), method->dex_cache_methods_);
     EXPECT_EQ(method->declaring_class_->dex_cache_->GetFields(), method->dex_cache_fields_);
-    EXPECT_EQ(method->declaring_class_->dex_cache_->GetCodeAndMethods(),
-              method->dex_cache_code_and_methods_);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetCodeAndDirectMethods(),
+              method->dex_cache_code_and_direct_methods_);
   }
 
   void AssertField(Class* klass, Field* field) {
@@ -143,6 +143,7 @@
       EXPECT_TRUE(klass->IsAbstract());
       if (klass->NumDirectMethods() == 1) {
         EXPECT_TRUE(klass->GetDirectMethod(0)->GetName()->Equals("<clinit>"));
+        EXPECT_TRUE(klass->GetDirectMethod(0)->IsDirect());
       } else {
         EXPECT_EQ(0U, klass->NumDirectMethods());
       }
@@ -171,12 +172,14 @@
     for (size_t i = 0; i < klass->NumDirectMethods(); i++) {
       Method* method = klass->GetDirectMethod(i);
       AssertMethod(klass, method);
+      EXPECT_TRUE(method->IsDirect());
       EXPECT_EQ(klass, method->GetDeclaringClass());
     }
 
     for (size_t i = 0; i < klass->NumVirtualMethods(); i++) {
       Method* method = klass->GetVirtualMethod(i);
       AssertMethod(klass, method);
+      EXPECT_FALSE(method->IsDirect());
       EXPECT_TRUE(method->GetDeclaringClass()->IsAssignableFrom(klass));
     }