Add MinidumpCrashpadInfo::report_id

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 62 matching lines @@
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
 
   EXPECT_EQ(MinidumpCrashpadInfo::kVersion, crashpad_info->version);
+  EXPECT_EQ(UUID(), crashpad_info->report_id);
   EXPECT_EQ(UUID(), crashpad_info->client_id);
   EXPECT_FALSE(simple_annotations);
   EXPECT_FALSE(module_list);
 }
 
-TEST(MinidumpCrashpadInfoWriter, ClientID) {
+TEST(MinidumpCrashpadInfoWriter, ReportAndClientID) {
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
 
+  UUID report_id;
+  ASSERT_TRUE(
+      report_id.InitializeFromString("01234567-89ab-cdef-0123-456789abcdef"));
+  crashpad_info_writer->SetReportID(report_id);
+
   UUID client_id;
   ASSERT_TRUE(
       client_id.InitializeFromString("00112233-4455-6677-8899-aabbccddeeff"));
   crashpad_info_writer->SetClientID(client_id);
 
   EXPECT_TRUE(crashpad_info_writer->IsUseful());
 
   minidump_file_writer.AddStream(crashpad_info_writer.Pass());
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
 
   EXPECT_EQ(MinidumpCrashpadInfo::kVersion, crashpad_info->version);
+  EXPECT_EQ(report_id, crashpad_info->report_id);
   EXPECT_EQ(client_id, crashpad_info->client_id);
   EXPECT_FALSE(simple_annotations);
   EXPECT_FALSE(module_list);
 }
 
 TEST(MinidumpCrashpadInfoWriter, SimpleAnnotations) {
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
 
   const char kKey[] =
@@ skipping 79 matching lines @@
   ASSERT_TRUE(module);
 
   EXPECT_EQ(MinidumpModuleCrashpadInfo::kVersion, module->version);
   EXPECT_EQ(0u, module->list_annotations.DataSize);
   EXPECT_EQ(0u, module->list_annotations.Rva);
   EXPECT_EQ(0u, module->simple_annotations.DataSize);
   EXPECT_EQ(0u, module->simple_annotations.Rva);
 }
 
 TEST(MinidumpCrashpadInfoWriter, InitializeFromSnapshot) {
+  UUID report_id;
+  ASSERT_TRUE(
+      report_id.InitializeFromString("fedcba98-7654-3210-fedc-ba9876543210"));
+
   UUID client_id;
   ASSERT_TRUE(
       client_id.InitializeFromString("fedcba98-7654-3210-0123-456789abcdef"));
 
   const char kKey[] = "version";
   const char kValue[] = "40.0.2214.111";
   const char kEntry[] = "This is a simple annotation in a list.";
 
   // Test with a useless module, one that doesn’t carry anything that would
   // require MinidumpCrashpadInfo or any child object.
   auto process_snapshot = make_scoped_ptr(new TestProcessSnapshot());
 
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
   process_snapshot->AddModule(module_snapshot.Pass());
 
   auto info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
   info_writer->InitializeFromSnapshot(process_snapshot.get());
   EXPECT_FALSE(info_writer->IsUseful());
 
   // Try again with a useful module.
   process_snapshot.reset(new TestProcessSnapshot());
 
+  process_snapshot->SetReportID(report_id);
   process_snapshot->SetClientID(client_id);
 
   std::map<std::string, std::string> annotations_simple_map;
   annotations_simple_map[kKey] = kValue;
   process_snapshot->SetAnnotationsSimpleMap(annotations_simple_map);
 
   module_snapshot.reset(new TestModuleSnapshot());
   std::vector<std::string> annotations_list(1, std::string(kEntry));
   module_snapshot->SetAnnotationsVector(annotations_list);
   process_snapshot->AddModule(module_snapshot.Pass());
 
   info_writer.reset(new MinidumpCrashpadInfoWriter());
   info_writer->InitializeFromSnapshot(process_snapshot.get());
   EXPECT_TRUE(info_writer->IsUseful());
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.AddStream(info_writer.Pass());
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations;
   const MinidumpModuleCrashpadInfoList* module_list;
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &info, &simple_annotations, &module_list));
 
   EXPECT_EQ(MinidumpCrashpadInfo::kVersion, info->version);
 
+  EXPECT_EQ(report_id, info->report_id);
   EXPECT_EQ(client_id, info->client_id);
 
   ASSERT_TRUE(simple_annotations);
   ASSERT_EQ(1u, simple_annotations->count);
   EXPECT_EQ(kKey,
             MinidumpUTF8StringAtRVAAsString(
                 string_file.string(), simple_annotations->entries[0].key));
   EXPECT_EQ(kValue,
             MinidumpUTF8StringAtRVAAsString(
                 string_file.string(), simple_annotations->entries[0].value));
@@ skipping 21 matching lines @@
 
   const MinidumpSimpleStringDictionary* module_simple_annotations =
       MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
           string_file.string(), module->simple_annotations);
   EXPECT_FALSE(module_simple_annotations);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad