In tests, use ASSERT_NO_FATAL_FAILURE()

minidump/minidump_misc_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 27 matching lines @@
   const size_t kMiscInfoStreamOffset =
       kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kMiscInfoStreamSize = sizeof(T);
   const size_t kFileSize = kMiscInfoStreamOffset + kMiscInfoStreamSize;
 
   ASSERT_EQ(kFileSize, file_contents.size());
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_contents[0]);
 
-  VerifyMinidumpHeader(header, 1, 0);
-  if (testing::Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
 
   const MINIDUMP_DIRECTORY* directory =
       reinterpret_cast<const MINIDUMP_DIRECTORY*>(
           &file_contents[kDirectoryOffset]);
 
   ASSERT_EQ(kMinidumpStreamTypeMiscInfo, directory->StreamType);
   ASSERT_EQ(kMiscInfoStreamSize, directory->Location.DataSize);
   ASSERT_EQ(kMiscInfoStreamOffset, directory->Location.Rva);
 
   *misc_info =
@@ skipping 101 matching lines @@
 TEST(MinidumpMiscInfoWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessId) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   const uint32_t kProcessId = 12345;
 
   misc_info_writer.SetProcessId(kProcessId);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESS_ID;
   expected.ProcessId = kProcessId;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessTimes) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   const time_t kProcessCreateTime = 0x15252f00;
   const uint32_t kProcessUserTime = 10;
   const uint32_t kProcessKernelTime = 5;
 
   misc_info_writer.SetProcessTimes(
       kProcessCreateTime, kProcessUserTime, kProcessKernelTime);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESS_TIMES;
   expected.ProcessCreateTime = kProcessCreateTime;
   expected.ProcessUserTime = kProcessUserTime;
   expected.ProcessKernelTime = kProcessKernelTime;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
@@ skipping 12 matching lines @@
                                          kProcessorMhzLimit,
                                          kProcessorMaxIdleState,
                                          kProcessorCurrentIdleState);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_2* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_2 expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESSOR_POWER_INFO;
   expected.ProcessorMaxMhz = kProcessorMaxMhz;
   expected.ProcessorCurrentMhz = kProcessorCurrentMhz;
   expected.ProcessorMhzLimit = kProcessorMhzLimit;
   expected.ProcessorMaxIdleState = kProcessorMaxIdleState;
   expected.ProcessorCurrentIdleState = kProcessorCurrentIdleState;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessIntegrityLevel) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   const uint32_t kProcessIntegrityLevel = 0x2000;
 
   misc_info_writer.SetProcessIntegrityLevel(kProcessIntegrityLevel);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROCESS_INTEGRITY;
   expected.ProcessIntegrityLevel = kProcessIntegrityLevel;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessExecuteFlags) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   const uint32_t kProcessExecuteFlags = 0x13579bdf;
 
   misc_info_writer.SetProcessExecuteFlags(kProcessExecuteFlags);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS;
   expected.ProcessExecuteFlags = kProcessExecuteFlags;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProtectedProcess) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMiscInfoWriter misc_info_writer;
 
   const uint32_t kProtectedProcess = 1;
 
   misc_info_writer.SetProtectedProcess(kProtectedProcess);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROTECTED_PROCESS;
   expected.ProtectedProcess = kProtectedProcess;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, TimeZone) {
   MinidumpFileWriter minidump_file_writer;
@@ skipping 16 matching lines @@
                                kDaylightName,
                                kDaylightDate,
                                kDaylightBias);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
   expected.TimeZone.Bias = kBias;
   string16 standard_name_utf16 = base::UTF8ToUTF16(kStandardName);
   c16lcpy(expected.TimeZone.StandardName,
           standard_name_utf16.c_str(),
           arraysize(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
@@ skipping 41 matching lines @@
                                daylight_name,
                                kSystemTimeZero,
                                kDaylightBias);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
   expected.TimeZone.Bias = kBias;
   string16 standard_name_utf16 = base::UTF8ToUTF16(standard_name);
   c16lcpy(expected.TimeZone.StandardName,
           standard_name_utf16.c_str(),
           arraysize(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
@@ skipping 20 matching lines @@
   const char kDebugBuildString[] = "debug build string";
 
   misc_info_writer.SetBuildString(kBuildString, kDebugBuildString);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_4* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
   string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
   c16lcpy(expected.BuildString,
           build_string_utf16.c_str(),
           arraysize(expected.BuildString));
   string16 debug_build_string_utf16 = base::UTF8ToUTF16(kDebugBuildString);
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
@@ skipping 15 matching lines @@
                                  'D');
 
   misc_info_writer.SetBuildString(build_string, debug_build_string);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_4* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
   string16 build_string_utf16 = base::UTF8ToUTF16(build_string);
   c16lcpy(expected.BuildString,
           build_string_utf16.c_str(),
           arraysize(expected.BuildString));
   string16 debug_build_string_utf16 = base::UTF8ToUTF16(debug_build_string);
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
@@ skipping 48 matching lines @@
                                kSystemTimeZero,
                                kDaylightBias);
   misc_info_writer.SetBuildString(kBuildString, kDebugBuildString);
 
   minidump_file_writer.AddStream(&misc_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_4* observed;
-  GetMiscInfoStream(file_writer.string(), &observed);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 =
       MINIDUMP_MISC1_PROCESS_ID | MINIDUMP_MISC1_PROCESS_TIMES |
       MINIDUMP_MISC1_PROCESSOR_POWER_INFO | MINIDUMP_MISC3_PROCESS_INTEGRITY |
       MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS | MINIDUMP_MISC3_PROTECTED_PROCESS |
       MINIDUMP_MISC3_TIMEZONE | MINIDUMP_MISC4_BUILDSTRING;
   expected.ProcessId = kProcessId;
   expected.ProcessCreateTime = kProcessCreateTime;
   expected.ProcessUserTime = kProcessUserTime;
@@ skipping 32 matching lines @@
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
           arraysize(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad