In tests, use ASSERT_NO_FATAL_FAILURE()

minidump/minidump_system_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 33 matching lines @@
   const size_t kCSDVersionOffset =
       kSystemInfoStreamOffset + sizeof(MINIDUMP_SYSTEM_INFO);
   const size_t kFileSize =
       kCSDVersionOffset + sizeof(MINIDUMP_STRING) + kCSDVersionBytesWithNUL;
 
   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(kMinidumpStreamTypeSystemInfo, directory->StreamType);
   ASSERT_EQ(sizeof(MINIDUMP_SYSTEM_INFO), directory->Location.DataSize);
   ASSERT_EQ(kSystemInfoStreamOffset, directory->Location.Rva);
 
   *system_info = reinterpret_cast<const MINIDUMP_SYSTEM_INFO*>(
@@ skipping 14 matching lines @@
   system_info_writer.SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(&system_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_SYSTEM_INFO* system_info;
   const MINIDUMP_STRING* csd_version;
 
-  GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kMinidumpCPUArchitectureUnknown,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(0u, system_info->ProcessorRevision);
   EXPECT_EQ(0u, system_info->NumberOfProcessors);
   EXPECT_EQ(0u, system_info->ProductType);
   EXPECT_EQ(0u, system_info->MajorVersion);
   EXPECT_EQ(0u, system_info->MinorVersion);
   EXPECT_EQ(0u, system_info->BuildNumber);
@@ skipping 49 matching lines @@
   system_info_writer.SetCPUX86AMDExtendedFeatures(kAMDFeatures);
 
   minidump_file_writer.AddStream(&system_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_SYSTEM_INFO* system_info;
   const MINIDUMP_STRING* csd_version;
 
-  GetSystemInfoStream(
-      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
+      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
   EXPECT_EQ(kOSVersionMajor, system_info->MajorVersion);
   EXPECT_EQ(kOSVersionMinor, system_info->MinorVersion);
   EXPECT_EQ(kOSVersionBuild, system_info->BuildNumber);
   EXPECT_EQ(kOS, system_info->PlatformId);
@@ skipping 38 matching lines @@
   system_info_writer.SetCPUOtherFeatures(kCPUFeatures[0], kCPUFeatures[1]);
 
   minidump_file_writer.AddStream(&system_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_SYSTEM_INFO* system_info;
   const MINIDUMP_STRING* csd_version;
 
-  GetSystemInfoStream(
-      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
+      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
   EXPECT_EQ(kOSVersionMajor, system_info->MajorVersion);
   EXPECT_EQ(kOSVersionMinor, system_info->MinorVersion);
   EXPECT_EQ(kOSVersionBuild, system_info->BuildNumber);
   EXPECT_EQ(kOS, system_info->PlatformId);
@@ skipping 20 matching lines @@
   system_info_writer.SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(&system_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_SYSTEM_INFO* system_info;
   const MINIDUMP_STRING* csd_version;
 
-  GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(kCPUVendor[0], system_info->Cpu.X86CpuInfo.VendorId[0]);
   EXPECT_EQ(kCPUVendor[1], system_info->Cpu.X86CpuInfo.VendorId[1]);
   EXPECT_EQ(kCPUVendor[2], system_info->Cpu.X86CpuInfo.VendorId[2]);
   EXPECT_EQ(0u, system_info->Cpu.X86CpuInfo.VersionInformation);
 }
 
 TEST(MinidumpSystemInfoWriterDeathTest, NoCSDVersion) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpSystemInfoWriter system_info_writer;
   minidump_file_writer.AddStream(&system_info_writer);
 
   StringFileWriter file_writer;
   ASSERT_DEATH(minidump_file_writer.WriteEverything(&file_writer),
                "csd_version_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad