commit f615a61aef972cfc1dc23931ac2ed0da14c3fedb
author Brian Carlstrom <bdc@google.com> Sat Jul 23 12:50:34 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sat Jul 23 12:50:34 2011 -0700
tree cca1f1f3475639f505bca688b5d7dab60c70a277
parent 7e49dca262933bc30cbc8b9f07cfc8cce2343389

Rename RawDexFile to DexFile

Change-Id: I4d0cd3885cf21a7b3dcad05c4d667d7ebd44378b

src/dex_file_test.cc

diff --git a/src/dex_file_test.cc b/src/dex_file_test.cc
index b6a7e77..a6b5bd5 100644
--- a/src/dex_file_test.cc
+++ b/src/dex_file_test.cc
@@ -9,16 +9,16 @@
 
 namespace art {
 
-TEST(RawDexFileTest, Open) {
-  scoped_ptr<RawDexFile> raw(OpenRawDexFileBase64(kNestedDex));
-  ASSERT_TRUE(raw != NULL);
+TEST(DexFileTest, Open) {
+  scoped_ptr<DexFile> dex(OpenDexFileBase64(kNestedDex));
+  ASSERT_TRUE(dex != NULL);
 }
 
-TEST(RawDexFileTest, Header) {
-  scoped_ptr<RawDexFile> raw(OpenRawDexFileBase64(kNestedDex));
+TEST(DexFileTest, Header) {
+  scoped_ptr<DexFile> raw(OpenDexFileBase64(kNestedDex));
   ASSERT_TRUE(raw != NULL);
 
-  const RawDexFile::Header& header = raw->GetHeader();
+  const DexFile::Header& header = raw->GetHeader();
   // TODO: header.magic_
   EXPECT_EQ(0x00d87910U, header.checksum_);
   // TODO: header.signature_
@@ -42,15 +42,15 @@
   EXPECT_EQ(320U, header.data_off_);
 }
 
-TEST(RawDexFileTest, ClassDefs) {
-  scoped_ptr<RawDexFile> raw(OpenRawDexFileBase64(kNestedDex));
+TEST(DexFileTest, ClassDefs) {
+  scoped_ptr<DexFile> raw(OpenDexFileBase64(kNestedDex));
   ASSERT_TRUE(raw != NULL);
   EXPECT_EQ(2U, raw->NumClassDefs());
 
-  const RawDexFile::ClassDef& c0 = raw->GetClassDef(0);
+  const DexFile::ClassDef& c0 = raw->GetClassDef(0);
   EXPECT_STREQ("LNested$Inner;", raw->GetClassDescriptor(c0));
 
-  const RawDexFile::ClassDef& c1 = raw->GetClassDef(1);
+  const DexFile::ClassDef& c1 = raw->GetClassDef(1);
   EXPECT_STREQ("LNested;", raw->GetClassDescriptor(c1));
 }