commit cdc8de4642ca447a7ed205f0d2203cb217e48aad
author Brian Carlstrom <bdc@google.com> Tue Jul 19 14:23:17 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jul 19 16:09:47 2011 -0700
tree 82b77592caaaefaf49dae5193294446cce68faf1
parent be9778540dfc70d154bb17f722c0b7fe454e2a8f

Move base64 to test code

Change-Id: I0cda5d8a559a2d60250c1d8a8ee6f69509515214

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index 21aa111..839d61b 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -34,9 +34,9 @@
 // TODO: test 0 argument methods
 // TODO: make this test simpler and shorter
 TEST_F(MethodTest, ProtoCompare) {
-  scoped_ptr<DexFile> object_dex_file(DexFile::OpenBase64(kJavaLangDex));
+  scoped_ptr<DexFile> object_dex_file(OpenDexFileBase64(kJavaLangDex));
   ASSERT_TRUE(object_dex_file != NULL);
-  scoped_ptr<DexFile> proto_dex_file(DexFile::OpenBase64(kProtoCompareDex));
+  scoped_ptr<DexFile> proto_dex_file(OpenDexFileBase64(kProtoCompareDex));
   ASSERT_TRUE(proto_dex_file != NULL);
 
   scoped_ptr<ClassLinker> linker(ClassLinker::Create());
@@ -92,11 +92,11 @@
 }
 
 TEST_F(MethodTest, ProtoCompare2) {
-  scoped_ptr<DexFile> object_dex_file(DexFile::OpenBase64(kJavaLangDex));
+  scoped_ptr<DexFile> object_dex_file(OpenDexFileBase64(kJavaLangDex));
   ASSERT_TRUE(object_dex_file != NULL);
-  scoped_ptr<DexFile> proto1_dex_file(DexFile::OpenBase64(kProtoCompareDex));
+  scoped_ptr<DexFile> proto1_dex_file(OpenDexFileBase64(kProtoCompareDex));
   ASSERT_TRUE(proto1_dex_file != NULL);
-  scoped_ptr<DexFile> proto2_dex_file(DexFile::OpenBase64(kProtoCompare2Dex));
+  scoped_ptr<DexFile> proto2_dex_file(OpenDexFileBase64(kProtoCompare2Dex));
   ASSERT_TRUE(proto2_dex_file != NULL);
   scoped_ptr<ClassLinker> linker1(ClassLinker::Create());
   linker1->AppendToClassPath(object_dex_file.get());