[PATCH] D65853: Use ASSERT_THAT_ERROR instead of logAllUnhandledErrors/exit

[Dmitri Gribenko via Phabricator via cfe-commits]

gribozavr created this revision.
gribozavr added reviewers: plotfi, jkorous, compnerd.
Herald added subscribers: cfe-commits, dexonsmith, mgorny.
Herald added a project: clang.

ASSERT_THAT_ERROR looks like the intended helper for use in tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D65853

Files:
  clang/unittests/DirectoryWatcher/CMakeLists.txt
  clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp


Index: clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
===================================================================
--- clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
+++ clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
@@ -11,6 +11,7 @@
 #include "llvm/Support/Mutex.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>
@@ -285,12 +286,7 @@
             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);
 }
@@ -323,12 +319,7 @@
             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);
 }
@@ -350,12 +341,7 @@
             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");
@@ -382,12 +368,7 @@
             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
   {
@@ -419,12 +400,7 @@
             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");
 
@@ -447,12 +423,7 @@
             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);
 
@@ -474,12 +445,7 @@
               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);
Index: clang/unittests/DirectoryWatcher/CMakeLists.txt
===================================================================
--- clang/unittests/DirectoryWatcher/CMakeLists.txt
+++ clang/unittests/DirectoryWatcher/CMakeLists.txt
@@ -10,8 +10,9 @@
 
   target_link_libraries(DirectoryWatcherTests
     PRIVATE
+    LLVMTestingSupport
     clangDirectoryWatcher
     clangBasic
     )
 
-endif()
\ No newline at end of file
+endif()

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits