Author: Duncan P. N. Exon Smith Date: 2021-10-25T13:44:45-07:00 New Revision: da47ec3ca076477b994a5fdd7b777aed9b8cbdf4
URL: https://github.com/llvm/llvm-project/commit/da47ec3ca076477b994a5fdd7b777aed9b8cbdf4 DIFF: https://github.com/llvm/llvm-project/commit/da47ec3ca076477b994a5fdd7b777aed9b8cbdf4.diff LOG: Basic: Stop using expectedToOptional() in FileManagerTest, NFC Remove a couple of uses of expectedToOptional() in FileManagerTest, using Expected<T>::moveInto() to extract the value instead instead. Added: Modified: clang/unittests/Basic/CMakeLists.txt clang/unittests/Basic/FileManagerTest.cpp Removed: ################################################################################ diff --git a/clang/unittests/Basic/CMakeLists.txt b/clang/unittests/Basic/CMakeLists.txt index cbb18ca87a80c..e633040eac153 100644 --- a/clang/unittests/Basic/CMakeLists.txt +++ b/clang/unittests/Basic/CMakeLists.txt @@ -18,4 +18,5 @@ clang_target_link_libraries(BasicTests clangAST clangBasic clangLex + LLVMTestingSupport ) diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp index b40ba01121f8f..a122747efdc11 100644 --- a/clang/unittests/Basic/FileManagerTest.cpp +++ b/clang/unittests/Basic/FileManagerTest.cpp @@ -12,6 +12,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/Support/Path.h" #include "llvm/Support/VirtualFileSystem.h" +#include "llvm/Testing/Support/Error.h" #include "gtest/gtest.h" using namespace llvm; @@ -559,9 +560,10 @@ TEST_F(FileManagerTest, getBypassFile) { // Calling a second time should not affect the UID or size. unsigned VirtualUID = FE.getUID(); - EXPECT_EQ( - &FE, - &expectedToOptional(Manager.getFileRef("/tmp/test"))->getFileEntry()); + llvm::Optional<FileEntryRef> SearchRef; + ASSERT_THAT_ERROR(Manager.getFileRef("/tmp/test").moveInto(SearchRef), + Succeeded()); + EXPECT_EQ(&FE, &SearchRef->getFileEntry()); EXPECT_EQ(FE.getUID(), VirtualUID); EXPECT_EQ(FE.getSize(), 10); @@ -578,9 +580,9 @@ TEST_F(FileManagerTest, getBypassFile) { EXPECT_NE(BypassRef->getSize(), FE.getSize()); // The virtual file should still be returned when searching. - EXPECT_EQ( - &FE, - &expectedToOptional(Manager.getFileRef("/tmp/test"))->getFileEntry()); + ASSERT_THAT_ERROR(Manager.getFileRef("/tmp/test").moveInto(SearchRef), + Succeeded()); + EXPECT_EQ(&FE, &SearchRef->getFileEntry()); } } // anonymous namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
