Refactor minidump test utilities for MinidumpWritable, …

minidump/minidump_crashpad_info_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 30 matching lines @@
     end += sizeof(MinidumpSimpleStringDictionary);
   }
   const size_t kFileSize = end;
 
   if (!simple_annotations) {
     ASSERT_EQ(kFileSize, file_contents.size());
   } else {
     EXPECT_GE(file_contents.size(), kFileSize);
   }
 
+  const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
-      reinterpret_cast<const MINIDUMP_HEADER*>(&file_contents[0]);
+      MinidumpHeaderAtStart(file_contents, &directory);
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
+  ASSERT_TRUE(directory);
 
-  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
-
-  const MINIDUMP_DIRECTORY* directory =
-      reinterpret_cast<const MINIDUMP_DIRECTORY*>(
-          &file_contents[kDirectoryOffset]);
-
-  ASSERT_EQ(kMinidumpStreamTypeCrashpadInfo, directory->StreamType);
-  ASSERT_EQ(sizeof(MinidumpCrashpadInfo), directory->Location.DataSize);
-  ASSERT_EQ(kCrashpadInfoStreamOffset, directory->Location.Rva);
+  ASSERT_EQ(kMinidumpStreamTypeCrashpadInfo, directory[0].StreamType);
+  ASSERT_EQ(sizeof(MinidumpCrashpadInfo), directory[0].Location.DataSize);
+  ASSERT_EQ(kCrashpadInfoStreamOffset, directory[0].Location.Rva);
 
   *crashpad_info = reinterpret_cast<const MinidumpCrashpadInfo*>(
       &file_contents[kCrashpadInfoStreamOffset]);
 
   if (simple_annotations) {
     ASSERT_GE((*crashpad_info)->simple_annotations.DataSize,
               sizeof(MinidumpSimpleStringDictionary));
     ASSERT_EQ(kSimpleAnnotationsOffset,
               (*crashpad_info)->simple_annotations.Rva);
     *simple_annotations =
@@ skipping 56 matching lines @@
   const MinidumpSimpleStringDictionary* simple_annotations;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       file_writer.string(), &crashpad_info, &simple_annotations));
 
   EXPECT_EQ(sizeof(*crashpad_info), crashpad_info->size);
   EXPECT_EQ(1u, crashpad_info->version);
 
   ASSERT_EQ(2u, simple_annotations->count);
 
-  EXPECT_EQ(
-      kKey1,
-      MinidumpUTF8StringAtRVA(file_writer, simple_annotations->entries[0].key));
+  EXPECT_EQ(kKey1,
+            MinidumpUTF8StringAtRVAAsString(
+                file_writer.string(), simple_annotations->entries[0].key));
   EXPECT_EQ(kValue1,
-            MinidumpUTF8StringAtRVA(file_writer,
-                                    simple_annotations->entries[0].value));
-  EXPECT_EQ(
-      kKey0,
-      MinidumpUTF8StringAtRVA(file_writer, simple_annotations->entries[1].key));
+            MinidumpUTF8StringAtRVAAsString(
+                file_writer.string(), simple_annotations->entries[0].value));
+  EXPECT_EQ(kKey0,
+            MinidumpUTF8StringAtRVAAsString(
+                file_writer.string(), simple_annotations->entries[1].key));
   EXPECT_EQ(kValue0,
-            MinidumpUTF8StringAtRVA(file_writer,
-                                    simple_annotations->entries[1].value));
+            MinidumpUTF8StringAtRVAAsString(
+                file_writer.string(), simple_annotations->entries[1].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad