commit 9baa4aefc370f48774b6104680193d9a7e4fb631
author Brian Carlstrom <bdc@google.com> Thu Sep 01 21:14:14 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sat Sep 03 13:25:31 2011 -0700
tree 26ed5735022c29f77d6b025c357674ecf50b27c8
parent e9ea8d1f002dd86976f0e1493ab8aa23a66c0494

Remove use of MemMap for code allocation.

In preparation of moving to an executable code space.

Change-Id: I6cb6fec93c66005f8020d718fe3c1c5aa1c85356

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index d485c2e..79a1f2d 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -274,10 +274,8 @@
 TEST_F(ObjectTest, DescriptorCompare) {
   ClassLinker* linker = class_linker_;
 
-  UniquePtr<const DexFile> proto1_dex_file(OpenTestDexFile("ProtoCompare"));
-  const PathClassLoader* class_loader_1 = AllocPathClassLoader(proto1_dex_file.get());
-  UniquePtr<const DexFile> proto2_dex_file(OpenTestDexFile("ProtoCompare2"));
-  const PathClassLoader* class_loader_2 = AllocPathClassLoader(proto2_dex_file.get());
+  const ClassLoader* class_loader_1 = LoadDex("ProtoCompare");
+  const ClassLoader* class_loader_2 = LoadDex("ProtoCompare2");
 
   Class* klass1 = linker->FindClass("LProtoCompare;", class_loader_1);
   ASSERT_TRUE(klass1 != NULL);
@@ -323,8 +321,7 @@
 }
 
 TEST_F(ObjectTest, InstanceOf) {
-  UniquePtr<const DexFile> dex(OpenTestDexFile("XandY"));
-  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const ClassLoader* class_loader = LoadDex("XandY");
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
   ASSERT_TRUE(X != NULL);
@@ -350,8 +347,7 @@
 }
 
 TEST_F(ObjectTest, IsAssignableFrom) {
-  UniquePtr<const DexFile> dex(OpenTestDexFile("XandY"));
-  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const ClassLoader* class_loader = LoadDex("XandY");
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
 
@@ -362,8 +358,7 @@
 }
 
 TEST_F(ObjectTest, IsAssignableFromArray) {
-  UniquePtr<const DexFile> dex(OpenTestDexFile("XandY"));
-  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const ClassLoader* class_loader = LoadDex("XandY");
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
   ASSERT_TRUE(X != NULL);