minidump: Migrate the rest of the tests to MinidumpWritableAtLocationDescriptor<>()

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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_crashpad_info_writer.h"
 
 #include <dbghelp.h>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
+#include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetCrashpadInfoStream(
     const std::string& file_contents,
     const MinidumpCrashpadInfo** crashpad_info,
     const MinidumpSimpleStringDictionary** simple_annotations) {
@@ skipping 13 matching lines @@
     EXPECT_GE(file_contents.size(), kFileSize);
   }
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(file_contents, &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
   ASSERT_TRUE(directory);
 
   ASSERT_EQ(kMinidumpStreamTypeCrashpadInfo, directory[0].StreamType);
-  ASSERT_EQ(sizeof(MinidumpCrashpadInfo), directory[0].Location.DataSize);
-  ASSERT_EQ(kCrashpadInfoStreamOffset, directory[0].Location.Rva);
+  EXPECT_EQ(kCrashpadInfoStreamOffset, directory[0].Location.Rva);
 
-  *crashpad_info = reinterpret_cast<const MinidumpCrashpadInfo*>(
-      &file_contents[kCrashpadInfoStreamOffset]);
+  *crashpad_info = MinidumpWritableAtLocationDescriptor<MinidumpCrashpadInfo>(
+      file_contents, directory[0].Location);
+  ASSERT_TRUE(*crashpad_info);
 
   if (simple_annotations) {
-    ASSERT_GE((*crashpad_info)->simple_annotations.DataSize,
-              sizeof(MinidumpSimpleStringDictionary));
-    ASSERT_EQ(kSimpleAnnotationsOffset,
+    EXPECT_EQ(kSimpleAnnotationsOffset,
               (*crashpad_info)->simple_annotations.Rva);
     *simple_annotations =
-        reinterpret_cast<const MinidumpSimpleStringDictionary*>(
-            &file_contents[kSimpleAnnotationsOffset]);
+        MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
+            file_contents, (*crashpad_info)->simple_annotations);
+    ASSERT_TRUE(*simple_annotations);
   } else {
     ASSERT_EQ(0u, (*crashpad_info)->simple_annotations.DataSize);
     ASSERT_EQ(0u, (*crashpad_info)->simple_annotations.Rva);
   }
 }
 
 TEST(MinidumpCrashpadInfoWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpCrashpadInfoWriter crashpad_info_writer;
 
@@ skipping 61 matching lines @@
             MinidumpUTF8StringAtRVAAsString(
                 file_writer.string(), simple_annotations->entries[1].key));
   EXPECT_EQ(kValue0,
             MinidumpUTF8StringAtRVAAsString(
                 file_writer.string(), simple_annotations->entries[1].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad