commit fbfdce6952bee54a189af4b3984300301a5d62c1
author Brian Carlstrom <bdc@google.com> Wed Oct 05 17:33:32 2011 -0700
committer Brian Carlstrom <bdc@google.com> Wed Oct 05 17:33:32 2011 -0700
tree cad923620d1665316d1e130873238103f9427428
parent c22185019fff728346ce022ce2dc74382d6e5b59

Teach ClassLinkerTest about Reference.referent

Change-Id: I14ac62739c6e7afa34712d10b2db3d783945b5e4

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 8be1b90..a646f4e 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -241,7 +241,11 @@
       Field* field = klass->GetInstanceField(i);
       Class* field_type = field->GetType();
       ASSERT_TRUE(field_type != NULL);
-      EXPECT_TRUE(field_type->IsPrimitive());
+      if (!field_type->IsPrimitive()) {
+        // While Reference.referent is not primitive, the ClassLinker
+        // treats it as such so that the garbage collector won't scan it.
+        EXPECT_EQ(PrettyField(field), "java.lang.Object java.lang.ref.Reference.referent");
+      }
     }
 
     size_t total_num_reference_instance_fields = 0;