commit a5a97a2bc1dfed70869da34650a5a2a3a3a06ac4
author Brian Carlstrom <bdc@google.com> Thu Sep 15 14:08:49 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Sep 15 16:46:43 2011 -0700
tree d81a0521bdae29b2a1f8655dddc18d5fe07728cd
parent e23d93ca1631ac5598d0f373c11d954b23ff586b

Compile time class initialization for classes without <clinit>

Change-Id: I4f167253fbfa16ed8f51928c5891e7a48b68e526

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index f43e47c..32f2eec 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -108,6 +108,7 @@
 
   void AssertMethod(Class* klass, Method* method) {
     EXPECT_TRUE(method != NULL);
+    EXPECT_TRUE(method->GetClass() != NULL);
     EXPECT_TRUE(method->GetName() != NULL);
     EXPECT_TRUE(method->GetSignature() != NULL);
 
@@ -133,6 +134,7 @@
 
   void AssertField(Class* klass, Field* field) {
     EXPECT_TRUE(field != NULL);
+    EXPECT_TRUE(field->GetClass() != NULL);
     EXPECT_EQ(klass, field->GetDeclaringClass());
     EXPECT_TRUE(field->GetName() != NULL);
     EXPECT_TRUE(field->GetType() != NULL);
@@ -146,6 +148,8 @@
       EXPECT_TRUE(klass->HasSuperClass());
       EXPECT_TRUE(klass->GetSuperClass() != NULL);
     }
+    EXPECT_TRUE(klass->GetClass() != NULL);
+    EXPECT_EQ(klass->GetClass(), klass->GetClass()->GetClass());
     EXPECT_TRUE(klass->GetDexCache() != NULL);
     EXPECT_TRUE(klass->IsResolved());
     EXPECT_FALSE(klass->IsErroneous());