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

minidump/minidump_thread_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_thread_writer.h"
 
 #include <dbghelp.h>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_memory_writer.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_context_test_util.h"
 #include "minidump/test/minidump_memory_writer_test_util.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
+#include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 // This returns the MINIDUMP_THREAD_LIST stream in |thread_list|. If
 // |memory_list| is not nullptr, a MINIDUMP_MEMORY_LIST stream is also expected
 // in |file_contents|, and that stream will be returned in |memory_list|.
 void GetThreadListStream(const std::string& file_contents,
                          const MINIDUMP_THREAD_LIST** thread_list,
                          const MINIDUMP_MEMORY_LIST** memory_list) {
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const uint32_t kExpectedStreams = memory_list ? 2 : 1;
   const size_t kThreadListStreamOffset =
       kDirectoryOffset + kExpectedStreams * sizeof(MINIDUMP_DIRECTORY);
   const size_t kThreadsOffset =
       kThreadListStreamOffset + sizeof(MINIDUMP_THREAD_LIST);
 
   ASSERT_GE(file_contents.size(), kThreadsOffset);
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(file_contents, &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, kExpectedStreams, 0));
   ASSERT_TRUE(directory);
 
   ASSERT_EQ(kMinidumpStreamTypeThreadList, directory[0].StreamType);
-  ASSERT_GE(directory[0].Location.DataSize, sizeof(MINIDUMP_THREAD_LIST));
-  ASSERT_EQ(kThreadListStreamOffset, directory[0].Location.Rva);
+  EXPECT_EQ(kThreadListStreamOffset, directory[0].Location.Rva);
 
-  *thread_list = reinterpret_cast<const MINIDUMP_THREAD_LIST*>(
-      &file_contents[kThreadListStreamOffset]);
-
-  ASSERT_EQ(sizeof(MINIDUMP_THREAD_LIST) +
-                (*thread_list)->NumberOfThreads * sizeof(MINIDUMP_THREAD),
-            directory[0].Location.DataSize);
+  *thread_list = MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
+      file_contents, directory[0].Location);
+  ASSERT_TRUE(thread_list);
 
   if (memory_list) {
-    *memory_list = reinterpret_cast<const MINIDUMP_MEMORY_LIST*>(
-        &file_contents[directory[1].Location.Rva]);
+    ASSERT_EQ(kMinidumpStreamTypeMemoryList, directory[1].StreamType);
+
+    *memory_list = MinidumpWritableAtLocationDescriptor<MINIDUMP_MEMORY_LIST>(
+        file_contents, directory[1].Location);
+    ASSERT_TRUE(*memory_list);
   }
 }
 
 TEST(MinidumpThreadWriter, EmptyThreadList) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpThreadListWriter thread_list_writer;
 
   minidump_file_writer.AddStream(&thread_list_writer);
 
   StringFileWriter file_writer;
@@ skipping 401 matching lines @@
   thread_list_writer.AddThread(&thread_writer);
   minidump_file_writer.AddStream(&thread_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_DEATH(minidump_file_writer.WriteEverything(&file_writer), "context_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad