commit 565f50731db360584d0080af7f14f0b7ca10371c
author Carl Shapiro <cshapiro@google.com> Sun Jul 10 13:39:43 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Sun Jul 10 13:39:43 2011 -0700
tree 24de84a0b0a0a8cc2cb75cd048232f29d4f2adbf
parent 606258b5713ac3a0958db3b4b98074b6df6439a6

Initialize primitive type classes during linker initialization.

Change-Id: Ib31da85afcc59c5d0a14346fb7f97043487fd662

src/dex_file_test.cc

diff --git a/src/dex_file_test.cc b/src/dex_file_test.cc
index ea42519..ccac396 100644
--- a/src/dex_file_test.cc
+++ b/src/dex_file_test.cc
@@ -40,16 +40,18 @@
   scoped_ptr<DexFile> dex(DexFile::OpenBase64(kNestedDex));
   ASSERT_TRUE(dex != NULL);
 
-  Class* klass = dex->LoadClass("NoSuchClass");
-  ASSERT_TRUE(klass == NULL);
+  scoped_ptr<Class> klass(reinterpret_cast<Class*>(new byte[sizeof(Class)]));
+  bool result = dex->LoadClass("NoSuchClass", klass.get());
+  ASSERT_FALSE(result);
 }
 
 TEST(DexFile, Load) {
   scoped_ptr<DexFile> dex(DexFile::OpenBase64(kNestedDex));
   ASSERT_TRUE(dex != NULL);
 
-  Class* klass = dex->LoadClass("LNested;");
-  ASSERT_TRUE(klass != NULL);
+  scoped_ptr<Class> klass(reinterpret_cast<Class*>(new byte[sizeof(Class)]));
+  bool result = dex->LoadClass("LNested;", klass.get());
+  ASSERT_TRUE(result);
 
   uint32_t vmeth = klass->NumVirtualMethods();
   EXPECT_EQ(vmeth, 0U);