commit 4a289ed61242964b921434de7d375f46480472a1
author Brian Carlstrom <bdc@google.com> Tue Aug 16 17:17:49 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Aug 18 12:25:10 2011 -0700
tree fa1a25f1eec3ef79fd9765e9c89ce21afbd8144c
parent 44753c3908fcd5ccc066bf0dceddeabfeacf9f24

Work on heap and space initialization to support image loading

Change-Id: Icab25efa4dee17e4b6c6e97e38f63f5ab8a8a005

src/image_test.cc

diff --git a/src/image_test.cc b/src/image_test.cc
index 55984f6..6cfa62d 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -1,7 +1,11 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
 
 #include "common_test.h"
+#include "file.h"
+#include "image.h"
 #include "image_writer.h"
+#include "os.h"
+#include "space.h"
 
 #include "gtest/gtest.h"
 
@@ -13,16 +17,26 @@
   scoped_ptr<DexFile> libcore_dex_file(GetLibCoreDex());
   EXPECT_TRUE(libcore_dex_file.get() != NULL);
 
-  // TODO garbage collect before writing
+  // TODO: garbage collect before writing
   const std::vector<Space*>& spaces = Heap::GetSpaces();
   // can't currently deal with writing a space that might have pointers between spaces
-  CHECK_EQ(1U, spaces.size());
+  ASSERT_EQ(1U, spaces.size());
+  Space* space = spaces[0];
 
   ImageWriter writer;
   ScratchFile tmp;
   const int image_base = 0x5000000;
-  bool success = writer.Write(spaces[0], tmp.GetFilename(), reinterpret_cast<byte*>(image_base));
-  EXPECT_TRUE(success);
+  bool success = writer.Write(space, tmp.GetFilename(), reinterpret_cast<byte*>(image_base));
+  ASSERT_TRUE(success);
+
+  {
+    scoped_ptr<File> file(OS::OpenFile(tmp.GetFilename(), false));
+    ASSERT_TRUE(file != NULL);
+    ImageHeader image_header;
+    file->ReadFully(&image_header, sizeof(image_header));
+    ASSERT_TRUE(image_header.IsValid());
+    ASSERT_GE(sizeof(image_header) + space->Size(), static_cast<size_t>(file->Length()));
+  }
 
   // tear down old runtime and make a new one
   delete runtime_.release();