diff options
Diffstat (limited to 'clang-tools-extra/unittests')
| -rw-r--r-- | clang-tools-extra/unittests/clangd/Annotations.cpp | 6 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/clangd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/clangd/SourceCodeTests.cpp | 72 |
3 files changed, 58 insertions, 21 deletions
diff --git a/clang-tools-extra/unittests/clangd/Annotations.cpp b/clang-tools-extra/unittests/clangd/Annotations.cpp index 92d1cb1d1a2..fc9c4cb05f0 100644 --- a/clang-tools-extra/unittests/clangd/Annotations.cpp +++ b/clang-tools-extra/unittests/clangd/Annotations.cpp @@ -86,7 +86,11 @@ std::vector<Range> Annotations::ranges(llvm::StringRef Name) const { std::pair<std::size_t, std::size_t> Annotations::offsetRange(llvm::StringRef Name) const { auto R = range(Name); - return {positionToOffset(Code, R.start), positionToOffset(Code, R.end)}; + llvm::Expected<size_t> Start = positionToOffset(Code, R.start); + llvm::Expected<size_t> End = positionToOffset(Code, R.end); + assert(Start); + assert(End); + return {*Start, *End}; } } // namespace clangd diff --git a/clang-tools-extra/unittests/clangd/CMakeLists.txt b/clang-tools-extra/unittests/clangd/CMakeLists.txt index 6017868f2b3..214866ab364 100644 --- a/clang-tools-extra/unittests/clangd/CMakeLists.txt +++ b/clang-tools-extra/unittests/clangd/CMakeLists.txt @@ -43,4 +43,5 @@ target_link_libraries(ClangdTests clangTooling clangToolingCore LLVMSupport + LLVMTestingSupport ) diff --git a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp b/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp index 86c8a0984b4..d7876414f2f 100644 --- a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp +++ b/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp @@ -7,7 +7,9 @@ // //===----------------------------------------------------------------------===// #include "SourceCode.h" +#include "llvm/Support/Error.h" #include "llvm/Support/raw_os_ostream.h" +#include "llvm/Testing/Support/Error.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -15,6 +17,9 @@ namespace clang{ namespace clangd { namespace { +using llvm::Failed; +using llvm::HasValue; + MATCHER_P2(Pos, Line, Col, "") { return arg.line == Line && arg.character == Col; } @@ -33,30 +38,57 @@ Position position(int line, int character) { TEST(SourceCodeTests, PositionToOffset) { // line out of bounds - EXPECT_EQ(0u, positionToOffset(File, position(-1, 2))); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(-1, 2)), Failed()); // first line - EXPECT_EQ(0u, positionToOffset(File, position(0, -1))); // out of range - EXPECT_EQ(0u, positionToOffset(File, position(0, 0))); // first character - EXPECT_EQ(3u, positionToOffset(File, position(0, 3))); // middle character - EXPECT_EQ(6u, positionToOffset(File, position(0, 6))); // last character - EXPECT_EQ(7u, positionToOffset(File, position(0, 7))); // the newline itself - EXPECT_EQ(8u, positionToOffset(File, position(0, 8))); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, -1)), + Failed()); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 0)), + HasValue(0)); // first character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 3)), + HasValue(3)); // middle character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 6)), + HasValue(6)); // last character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 7)), + HasValue(7)); // the newline itself + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 7), false), + HasValue(7)); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 8)), + HasValue(7)); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 8), false), + Failed()); // out of range // middle line - EXPECT_EQ(8u, positionToOffset(File, position(1, -1))); // out of range - EXPECT_EQ(8u, positionToOffset(File, position(1, 0))); // first character - EXPECT_EQ(11u, positionToOffset(File, position(1, 3))); // middle character - EXPECT_EQ(14u, positionToOffset(File, position(1, 6))); // last character - EXPECT_EQ(15u, positionToOffset(File, position(1, 7))); // the newline itself - EXPECT_EQ(16u, positionToOffset(File, position(1, 8))); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, -1)), + Failed()); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 0)), + HasValue(8)); // first character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 3)), + HasValue(11)); // middle character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 3), false), + HasValue(11)); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 6)), + HasValue(14)); // last character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 7)), + HasValue(15)); // the newline itself + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 8)), + HasValue(15)); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 8), false), + Failed()); // out of range // last line - EXPECT_EQ(16u, positionToOffset(File, position(2, -1))); // out of range - EXPECT_EQ(16u, positionToOffset(File, position(2, 0))); // first character - EXPECT_EQ(19u, positionToOffset(File, position(2, 3))); // middle character - EXPECT_EQ(23u, positionToOffset(File, position(2, 7))); // last character - EXPECT_EQ(24u, positionToOffset(File, position(2, 8))); // EOF - EXPECT_EQ(24u, positionToOffset(File, position(2, 9))); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, -1)), + Failed()); // out of range + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 0)), + HasValue(16)); // first character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 3)), + HasValue(19)); // middle character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 7)), + HasValue(23)); // last character + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 8)), + HasValue(24)); // EOF + EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 9), false), + Failed()); // out of range // line out of bounds - EXPECT_EQ(24u, positionToOffset(File, position(3, 1))); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 0)), Failed()); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 1)), Failed()); } TEST(SourceCodeTests, OffsetToPosition) { |
