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/compiler_test.cc

diff --git a/src/compiler_test.cc b/src/compiler_test.cc
index 6a2f81e..f6dc5c7 100644
--- a/src/compiler_test.cc
+++ b/src/compiler_test.cc
@@ -99,12 +99,12 @@
 
   // TODO: check that all Method::GetCode() values are non-null
 
-  EXPECT_EQ(dex->NumMethodIds(), dex_cache->NumCodeAndMethods());
-  CodeAndMethods* code_and_methods = dex_cache->GetCodeAndMethods();
-  for (size_t i = 0; i < dex_cache->NumCodeAndMethods(); i++) {
+  EXPECT_EQ(dex->NumMethodIds(), dex_cache->NumCodeAndDirectMethods());
+  CodeAndDirectMethods* code_and_direct_methods = dex_cache->GetCodeAndDirectMethods();
+  for (size_t i = 0; i < dex_cache->NumCodeAndDirectMethods(); i++) {
     Method* method = dex_cache->GetResolvedMethod(i);
-    EXPECT_EQ(method->GetCode(), code_and_methods->GetResolvedCode(i));
-    EXPECT_EQ(method,            code_and_methods->GetResolvedMethod(i));
+    EXPECT_EQ(method->GetCode(), code_and_direct_methods->GetResolvedCode(i));
+    EXPECT_EQ(method,            code_and_direct_methods->GetResolvedMethod(i));
   }
 }