Add FileReaderInterface. Move StringFileWriter to StringFile and

minidump/minidump_file_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 14 matching lines @@
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "snapshot/test/test_cpu_context.h"
 #include "snapshot/test/test_exception_snapshot.h"
 #include "snapshot/test/test_module_snapshot.h"
 #include "snapshot/test/test_process_snapshot.h"
 #include "snapshot/test/test_system_snapshot.h"
 #include "snapshot/test/test_thread_snapshot.h"
-#include "util/file/file_writer.h"
-#include "util/file/string_file_writer.h"
+#include "util/file/string_file.h"
+#include "util/file/string_file.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(MinidumpFileWriter, Empty) {
   MinidumpFileWriter minidump_file;
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
-  ASSERT_EQ(sizeof(MINIDUMP_HEADER), file_writer.string().size());
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
+  ASSERT_EQ(sizeof(MINIDUMP_HEADER), string_file.string().size());
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 0, 0));
   EXPECT_FALSE(directory);
 }
 
 class TestStream final : public internal::MinidumpStreamWriter {
  public:
   TestStream(MinidumpStreamType stream_type,
              size_t stream_size,
              uint8_t stream_value)
       : stream_data_(stream_size, stream_value), stream_type_(stream_type) {}
@@ skipping 29 matching lines @@
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
 
   const size_t kStreamSize = 5;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStreamValue = 0x5a;
   auto stream =
       make_scoped_ptr(new TestStream(kStreamType, kStreamSize, kStreamValue));
   minidump_file.AddStream(stream.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
-  ASSERT_EQ(kFileSize, file_writer.string().size());
+  ASSERT_EQ(kFileSize, string_file.string().size());
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, kTimestamp));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kStreamType, directory[0].StreamType);
   EXPECT_EQ(kStreamSize, directory[0].Location.DataSize);
   EXPECT_EQ(kStreamOffset, directory[0].Location.Rva);
 
   const uint8_t* stream_data = MinidumpWritableAtLocationDescriptor<uint8_t>(
-      file_writer.string(), directory[0].Location);
+      string_file.string(), directory[0].Location);
   ASSERT_TRUE(stream_data);
 
   std::string expected_stream(kStreamSize, kStreamValue);
   EXPECT_EQ(0, memcmp(stream_data, expected_stream.c_str(), kStreamSize));
 }
 
 TEST(MinidumpFileWriter, ThreeStreams) {
   MinidumpFileWriter minidump_file;
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
@@ skipping 15 matching lines @@
       new TestStream(kStream1Type, kStream1Size, kStream1Value));
   minidump_file.AddStream(stream1.Pass());
 
   const size_t kStream2Size = 1;
   const MinidumpStreamType kStream2Type = static_cast<MinidumpStreamType>(0x7e);
   const uint8_t kStream2Value = 0x36;
   auto stream2 = make_scoped_ptr(
       new TestStream(kStream2Type, kStream2Size, kStream2Value));
   minidump_file.AddStream(stream2.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStream0Offset =
       kDirectoryOffset + 3 * sizeof(MINIDUMP_DIRECTORY);
   const size_t kStream1Padding = 3;
   const size_t kStream1Offset = kStream0Offset + kStream0Size + kStream1Padding;
   const size_t kStream2Padding = 1;
   const size_t kStream2Offset = kStream1Offset + kStream1Size + kStream2Padding;
   const size_t kFileSize = kStream2Offset + kStream2Size;
 
-  ASSERT_EQ(kFileSize, file_writer.string().size());
+  ASSERT_EQ(kFileSize, string_file.string().size());
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 3, kTimestamp));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kStream0Type, directory[0].StreamType);
   EXPECT_EQ(kStream0Size, directory[0].Location.DataSize);
   EXPECT_EQ(kStream0Offset, directory[0].Location.Rva);
   EXPECT_EQ(kStream1Type, directory[1].StreamType);
   EXPECT_EQ(kStream1Size, directory[1].Location.DataSize);
   EXPECT_EQ(kStream1Offset, directory[1].Location.Rva);
   EXPECT_EQ(kStream2Type, directory[2].StreamType);
   EXPECT_EQ(kStream2Size, directory[2].Location.DataSize);
   EXPECT_EQ(kStream2Offset, directory[2].Location.Rva);
 
   const uint8_t* stream0_data = MinidumpWritableAtLocationDescriptor<uint8_t>(
-      file_writer.string(), directory[0].Location);
+      string_file.string(), directory[0].Location);
   ASSERT_TRUE(stream0_data);
 
   std::string expected_stream0(kStream0Size, kStream0Value);
   EXPECT_EQ(0, memcmp(stream0_data, expected_stream0.c_str(), kStream0Size));
 
   const int kZeroes[16] = {};
   ASSERT_GE(sizeof(kZeroes), kStream1Padding);
   EXPECT_EQ(0, memcmp(stream0_data + kStream0Size, kZeroes, kStream1Padding));
 
   const uint8_t* stream1_data = MinidumpWritableAtLocationDescriptor<uint8_t>(
-      file_writer.string(), directory[1].Location);
+      string_file.string(), directory[1].Location);
   ASSERT_TRUE(stream1_data);
 
   std::string expected_stream1(kStream1Size, kStream1Value);
   EXPECT_EQ(0, memcmp(stream1_data, expected_stream1.c_str(), kStream1Size));
 
   ASSERT_GE(sizeof(kZeroes), kStream2Padding);
   EXPECT_EQ(0, memcmp(stream1_data + kStream1Size, kZeroes, kStream2Padding));
 
   const uint8_t* stream2_data = MinidumpWritableAtLocationDescriptor<uint8_t>(
-      file_writer.string(), directory[2].Location);
+      string_file.string(), directory[2].Location);
   ASSERT_TRUE(stream2_data);
 
   std::string expected_stream2(kStream2Size, kStream2Value);
   EXPECT_EQ(0, memcmp(stream2_data, expected_stream2.c_str(), kStream2Size));
 }
 
 TEST(MinidumpFileWriter, ZeroLengthStream) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStreamSize = 0;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
   auto stream = make_scoped_ptr(new TestStream(kStreamType, kStreamSize, 0));
   minidump_file.AddStream(stream.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
-  ASSERT_EQ(kFileSize, file_writer.string().size());
+  ASSERT_EQ(kFileSize, string_file.string().size());
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kStreamType, directory[0].StreamType);
   EXPECT_EQ(kStreamSize, directory[0].Location.DataSize);
   EXPECT_EQ(kStreamOffset, directory[0].Location.Rva);
 }
 
 TEST(MinidumpFileWriter, InitializeFromSnapshot_Basic) {
   const uint32_t kSnapshotTime = 0x4976043c;
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
   system_snapshot->SetCPUArchitecture(kCPUArchitectureX86_64);
   system_snapshot->SetOperatingSystem(SystemSnapshot::kOperatingSystemMacOSX);
   process_snapshot.SetSystem(system_snapshot.Pass());
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 5, kSnapshotTime));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kMinidumpStreamTypeSystemInfo, directory[0].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_SYSTEM_INFO>(
-                  file_writer.string(), directory[0].Location));
+                  string_file.string(), directory[0].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMiscInfo, directory[1].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MISC_INFO_4>(
-                  file_writer.string(), directory[1].Location));
+                  string_file.string(), directory[1].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeThreadList, directory[2].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
-                  file_writer.string(), directory[2].Location));
+                  string_file.string(), directory[2].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeModuleList, directory[3].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MODULE_LIST>(
-                  file_writer.string(), directory[3].Location));
+                  string_file.string(), directory[3].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMemoryList, directory[4].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MEMORY_LIST>(
-                  file_writer.string(), directory[4].Location));
+                  string_file.string(), directory[4].Location));
 }
 
 TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) {
   // In a 32-bit environment, this will give a “timestamp out of range” warning,
   // but the test should complete without failure.
   const uint32_t kSnapshotTime = 0xfd469ab8;
   MSVC_SUPPRESS_WARNING(4309);  // Truncation of constant value.
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
@@ skipping 15 matching lines @@
   // The module does not have anything that needs to be represented in a
   // MinidumpModuleCrashpadInfo structure, so no such structure is expected to
   // be present, which will in turn suppress the addition of a
   // MinidumpCrashpadInfo stream.
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
   process_snapshot.AddModule(module_snapshot.Pass());
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 6, kSnapshotTime));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kMinidumpStreamTypeSystemInfo, directory[0].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_SYSTEM_INFO>(
-                  file_writer.string(), directory[0].Location));
+                  string_file.string(), directory[0].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMiscInfo, directory[1].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MISC_INFO_4>(
-                  file_writer.string(), directory[1].Location));
+                  string_file.string(), directory[1].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeThreadList, directory[2].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
-                  file_writer.string(), directory[2].Location));
+                  string_file.string(), directory[2].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeException, directory[3].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_EXCEPTION_STREAM>(
-                  file_writer.string(), directory[3].Location));
+                  string_file.string(), directory[3].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeModuleList, directory[4].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MODULE_LIST>(
-                  file_writer.string(), directory[4].Location));
+                  string_file.string(), directory[4].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMemoryList, directory[5].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MEMORY_LIST>(
-                  file_writer.string(), directory[5].Location));
+                  string_file.string(), directory[5].Location));
 }
 
 TEST(MinidumpFileWriter, InitializeFromSnapshot_CrashpadInfo) {
   const uint32_t kSnapshotTime = 0x15393bd3;
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
@@ skipping 12 matching lines @@
   // The module needs an annotation for the MinidumpCrashpadInfo stream to be
   // considered useful and be included.
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
   std::vector<std::string> annotations_list(1, std::string("annotation"));
   module_snapshot->SetAnnotationsVector(annotations_list);
   process_snapshot.AddModule(module_snapshot.Pass());
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      MinidumpHeaderAtStart(file_writer.string(), &directory);
+      MinidumpHeaderAtStart(string_file.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 7, kSnapshotTime));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kMinidumpStreamTypeSystemInfo, directory[0].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_SYSTEM_INFO>(
-                  file_writer.string(), directory[0].Location));
+                  string_file.string(), directory[0].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMiscInfo, directory[1].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MISC_INFO_4>(
-                  file_writer.string(), directory[1].Location));
+                  string_file.string(), directory[1].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeThreadList, directory[2].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
-                  file_writer.string(), directory[2].Location));
+                  string_file.string(), directory[2].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeException, directory[3].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_EXCEPTION_STREAM>(
-                  file_writer.string(), directory[3].Location));
+                  string_file.string(), directory[3].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeModuleList, directory[4].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MODULE_LIST>(
-                  file_writer.string(), directory[4].Location));
+                  string_file.string(), directory[4].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeCrashpadInfo, directory[5].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MinidumpCrashpadInfo>(
-                  file_writer.string(), directory[5].Location));
+                  string_file.string(), directory[5].Location));
 
   EXPECT_EQ(kMinidumpStreamTypeMemoryList, directory[6].StreamType);
   EXPECT_TRUE(MinidumpWritableAtLocationDescriptor<MINIDUMP_MEMORY_LIST>(
-                  file_writer.string(), directory[6].Location));
+                  string_file.string(), directory[6].Location));
 }
 
 TEST(MinidumpFileWriterDeathTest, SameStreamType) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStream0Size = 5;
   const MinidumpStreamType kStream0Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream0Value = 0x5a;
   auto stream0 = make_scoped_ptr(
       new TestStream(kStream0Type, kStream0Size, kStream0Value));
   minidump_file.AddStream(stream0.Pass());
 
   // It is an error to add a second stream of the same type.
   const size_t kStream1Size = 3;
   const MinidumpStreamType kStream1Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream1Value = 0xa5;
   auto stream1 = make_scoped_ptr(
       new TestStream(kStream1Type, kStream1Size, kStream1Value));
   ASSERT_DEATH(minidump_file.AddStream(stream1.Pass()), "already present");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad