Use ASSERT_THAT_ERROR instead of logAllUnhandledErrors/exit

Summary: ASSERT_THAT_ERROR looks like the intended helper for use in tests.

Reviewers: plotfi, jkorous, compnerd

Subscribers: mgorny, dexonsmith, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D65853

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@368399 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/DirectoryWatcher/CMakeLists.txt b/unittests/DirectoryWatcher/CMakeLists.txt
index fc93323b37417fdc23512fdfa9e81cb44030cbdf..0355525a86b0aa68caa872878122d09925f69eea 100644 (file)
--- a/unittests/DirectoryWatcher/CMakeLists.txt
+++ b/unittests/DirectoryWatcher/CMakeLists.txt
@@ -10,8 +10,9 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux")
 
   target_link_libraries(DirectoryWatcherTests
     PRIVATE
+    LLVMTestingSupport
     clangDirectoryWatcher
     clangBasic
     )
 
-endif()
\ No newline at end of file
+endif()

diff --git a/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp b/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
index 6dc9ab994c990869525303fb5c0f2c78fb8eee7e..7a898cd0a743e46e3786092e6ecf2c0ed285bdb0 100644 (file)
--- a/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
+++ b/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
@@ -10,6 +10,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"
 #include <condition_variable>
 #include <future>
@@ -284,12 +285,7 @@ TEST(DirectoryWatcherTest, InitialScanSync) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/true);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   checkEventualResultWithTimeout(TestConsumer);
 }
@@ -322,12 +318,7 @@ TEST(DirectoryWatcherTest, InitialScanAsync) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/false);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   checkEventualResultWithTimeout(TestConsumer);
 }
@@ -349,12 +340,7 @@ TEST(DirectoryWatcherTest, AddFiles) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/true);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   fixture.addFile("a");
   fixture.addFile("b");
@@ -381,12 +367,7 @@ TEST(DirectoryWatcherTest, ModifyFile) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/true);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   // modify the file
   {
@@ -418,12 +399,7 @@ TEST(DirectoryWatcherTest, DeleteFile) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/true);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   fixture.deleteFile("a");
 
@@ -446,12 +422,7 @@ TEST(DirectoryWatcherTest, DeleteWatchedDir) {
             TestConsumer.consume(Events, IsInitial);
           },
           /*waitForInitialSync=*/true);
-  if (!DW) {
-    logAllUnhandledErrors(
-        DW.takeError(), llvm::errs(),
-        "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-    exit(EXIT_FAILURE);
-  }
+  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
 
   remove_directories(fixture.TestWatchedDir);
 
@@ -473,12 +444,7 @@ TEST(DirectoryWatcherTest, InvalidatedWatcher) {
               TestConsumer.consume(Events, IsInitial);
             },
             /*waitForInitialSync=*/true);
-    if (!DW) {
-      logAllUnhandledErrors(
-          DW.takeError(), llvm::errs(),
-          "DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
-      exit(EXIT_FAILURE);
-    }
+    ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
   } // DW is destructed here.
 
   checkEventualResultWithTimeout(TestConsumer);