In tests, use ASSERT_NO_FATAL_FAILURE()

minidump/minidump_file_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 21 matching lines @@
 
 TEST(MinidumpFileWriter, Empty) {
   MinidumpFileWriter minidump_file;
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MINIDUMP_HEADER), file_writer.string().size());
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_writer.string()[0]);
 
-  VerifyMinidumpHeader(header, 0, 0);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 0, 0));
 }
 
 class TestStream final : public internal::MinidumpStreamWriter {
  public:
   TestStream(MinidumpStreamType stream_type,
              size_t stream_size,
              uint8_t stream_value)
       : stream_data_(stream_size, stream_value), stream_type_(stream_type) {}
 
   ~TestStream() {}
@@ skipping 38 matching lines @@
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, file_writer.string().size());
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_writer.string()[0]);
 
-  VerifyMinidumpHeader(header, 1, kTimestamp);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, kTimestamp));
 
   const MINIDUMP_DIRECTORY* directory =
       reinterpret_cast<const MINIDUMP_DIRECTORY*>(
           &file_writer.string()[kDirectoryOffset]);
 
   EXPECT_EQ(kStreamType, directory->StreamType);
   EXPECT_EQ(kStreamSize, directory->Location.DataSize);
   EXPECT_EQ(kStreamOffset, directory->Location.Rva);
 
   const uint8_t* stream_data =
@@ skipping 39 matching lines @@
   const size_t kStream2Offset = kStream1Offset + kStream1Size + kStream2Padding;
   const size_t kStream3Padding = 1;
   const size_t kStream3Offset = kStream2Offset + kStream2Size + kStream3Padding;
   const size_t kFileSize = kStream3Offset + kStream3Size;
 
   ASSERT_EQ(kFileSize, file_writer.string().size());
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_writer.string()[0]);
 
-  VerifyMinidumpHeader(header, 3, kTimestamp);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 3, kTimestamp));
 
   const MINIDUMP_DIRECTORY* directory =
       reinterpret_cast<const MINIDUMP_DIRECTORY*>(
           &file_writer.string()[kDirectoryOffset]);
 
   EXPECT_EQ(kStream1Type, directory[0].StreamType);
   EXPECT_EQ(kStream1Size, directory[0].Location.DataSize);
   EXPECT_EQ(kStream1Offset, directory[0].Location.Rva);
   EXPECT_EQ(kStream2Type, directory[1].StreamType);
   EXPECT_EQ(kStream2Size, directory[1].Location.DataSize);
@@ skipping 41 matching lines @@
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, file_writer.string().size());
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_writer.string()[0]);
 
-  VerifyMinidumpHeader(header, 1, 0);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
 
   const MINIDUMP_DIRECTORY* directory =
       reinterpret_cast<const MINIDUMP_DIRECTORY*>(
           &file_writer.string()[kDirectoryOffset]);
 
   EXPECT_EQ(kStreamType, directory->StreamType);
   EXPECT_EQ(kStreamSize, directory->Location.DataSize);
   EXPECT_EQ(kStreamOffset, directory->Location.Rva);
 }
 
@@ skipping 10 matching lines @@
   const size_t kStream2Size = 3;
   const MinidumpStreamType kStream2Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream2Value = 0xa5;
   TestStream stream2(kStream2Type, kStream2Size, kStream2Value);
   ASSERT_DEATH(minidump_file.AddStream(&stream2), "already present");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad