[clangd] Remove clangd's HasValue GMock matcher #121309
Merged
+6
−73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An equivalent matcher under the name Optional has since been added upstream to GMock. Fixes llvm#121308
|
@llvm/pr-subscribers-clang-tools-extra Author: Nathan Ridge (HighCommander4) ChangesAn equivalent matcher under the name Optional has since been added upstream to GMock. Fixes #121308 Full diff: https://github.com/llvm/llvm-project/pull/121309.diff 2 Files Affected:
diff --git a/clang-tools-extra/clangd/unittests/Matchers.h b/clang-tools-extra/clangd/unittests/Matchers.h
index 0fbd93b2e68825..17d18dd9b85b65 100644
--- a/clang-tools-extra/clangd/unittests/Matchers.h
+++ b/clang-tools-extra/clangd/unittests/Matchers.h
@@ -127,74 +127,6 @@ PolySubsequenceMatcher<Args...> HasSubsequence(Args &&... M) {
llvm::consumeError(ComputedValue.takeError()); \
} while (false)
-// Implements the HasValue(m) matcher for matching an Optional whose
-// value matches matcher m.
-template <typename InnerMatcher> class OptionalMatcher {
-public:
- explicit OptionalMatcher(const InnerMatcher &matcher) : matcher_(matcher) {}
- OptionalMatcher(const OptionalMatcher&) = default;
- OptionalMatcher &operator=(const OptionalMatcher&) = delete;
-
- // This type conversion operator template allows Optional(m) to be
- // used as a matcher for any Optional type whose value type is
- // compatible with the inner matcher.
- //
- // The reason we do this instead of relying on
- // MakePolymorphicMatcher() is that the latter is not flexible
- // enough for implementing the DescribeTo() method of Optional().
- template <typename Optional> operator Matcher<Optional>() const {
- return MakeMatcher(new Impl<Optional>(matcher_));
- }
-
-private:
- // The monomorphic implementation that works for a particular optional type.
- template <typename Optional>
- class Impl : public ::testing::MatcherInterface<Optional> {
- public:
- using Value = typename std::remove_const<
- typename std::remove_reference<Optional>::type>::type::value_type;
-
- explicit Impl(const InnerMatcher &matcher)
- : matcher_(::testing::MatcherCast<const Value &>(matcher)) {}
-
- Impl(const Impl&) = default;
- Impl &operator=(const Impl&) = delete;
-
- virtual void DescribeTo(::std::ostream *os) const {
- *os << "has a value that ";
- matcher_.DescribeTo(os);
- }
-
- virtual void DescribeNegationTo(::std::ostream *os) const {
- *os << "does not have a value that ";
- matcher_.DescribeTo(os);
- }
-
- virtual bool
- MatchAndExplain(Optional optional,
- ::testing::MatchResultListener *listener) const {
- if (!optional)
- return false;
-
- *listener << "which has a value ";
- return MatchPrintAndExplain(*optional, matcher_, listener);
- }
-
- private:
- const Matcher<const Value &> matcher_;
- };
-
- const InnerMatcher matcher_;
-};
-
-// Creates a matcher that matches an Optional that has a value
-// that matches inner_matcher.
-template <typename InnerMatcher>
-inline OptionalMatcher<InnerMatcher>
-HasValue(const InnerMatcher &inner_matcher) {
- return OptionalMatcher<InnerMatcher>(inner_matcher);
-}
-
} // namespace clangd
} // namespace clang
#endif
diff --git a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
index 15158d8a45ca8b..406a842f5a0081 100644
--- a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
@@ -28,6 +28,7 @@ using ::testing::ElementsAre;
using ::testing::Field;
using ::testing::IsEmpty;
using ::testing::Matcher;
+using ::testing::Optional;
using ::testing::SizeIs;
using ::testing::UnorderedElementsAre;
@@ -38,12 +39,12 @@ MATCHER_P(selectionRangeIs, R, "") { return arg.selectionRange == R; }
template <class... ParentMatchers>
::testing::Matcher<TypeHierarchyItem> parents(ParentMatchers... ParentsM) {
return Field(&TypeHierarchyItem::parents,
- HasValue(UnorderedElementsAre(ParentsM...)));
+ Optional(UnorderedElementsAre(ParentsM...)));
}
template <class... ChildMatchers>
::testing::Matcher<TypeHierarchyItem> children(ChildMatchers... ChildrenM) {
return Field(&TypeHierarchyItem::children,
- HasValue(UnorderedElementsAre(ChildrenM...)));
+ Optional(UnorderedElementsAre(ChildrenM...)));
}
// Note: "not resolved" is different from "resolved but empty"!
MATCHER(parentsNotResolved, "") { return !arg.parents; }
@@ -790,7 +791,7 @@ struct Child : Parent1, Parent2 {};
Children,
UnorderedElementsAre(
AllOf(withName("Child"),
- withResolveParents(HasValue(UnorderedElementsAre(withResolveID(
+ withResolveParents(Optional(UnorderedElementsAre(withResolveID(
getSymbolID(&findDecl(AST, "Parent1")).str())))))));
}
@@ -810,9 +811,9 @@ struct Chil^d : Parent {};
ASSERT_THAT(Result, SizeIs(1));
auto Parents = superTypes(Result.front(), Index.get());
- EXPECT_THAT(Parents, HasValue(UnorderedElementsAre(
+ EXPECT_THAT(Parents, Optional(UnorderedElementsAre(
AllOf(withName("Parent"),
- withResolveParents(HasValue(IsEmpty()))))));
+ withResolveParents(Optional(IsEmpty()))))));
}
} // namespace
} // namespace clangd
|
|
@llvm/pr-subscribers-clangd Author: Nathan Ridge (HighCommander4) ChangesAn equivalent matcher under the name Optional has since been added upstream to GMock. Fixes #121308 Full diff: https://github.com/llvm/llvm-project/pull/121309.diff 2 Files Affected:
diff --git a/clang-tools-extra/clangd/unittests/Matchers.h b/clang-tools-extra/clangd/unittests/Matchers.h
index 0fbd93b2e68825..17d18dd9b85b65 100644
--- a/clang-tools-extra/clangd/unittests/Matchers.h
+++ b/clang-tools-extra/clangd/unittests/Matchers.h
@@ -127,74 +127,6 @@ PolySubsequenceMatcher<Args...> HasSubsequence(Args &&... M) {
llvm::consumeError(ComputedValue.takeError()); \
} while (false)
-// Implements the HasValue(m) matcher for matching an Optional whose
-// value matches matcher m.
-template <typename InnerMatcher> class OptionalMatcher {
-public:
- explicit OptionalMatcher(const InnerMatcher &matcher) : matcher_(matcher) {}
- OptionalMatcher(const OptionalMatcher&) = default;
- OptionalMatcher &operator=(const OptionalMatcher&) = delete;
-
- // This type conversion operator template allows Optional(m) to be
- // used as a matcher for any Optional type whose value type is
- // compatible with the inner matcher.
- //
- // The reason we do this instead of relying on
- // MakePolymorphicMatcher() is that the latter is not flexible
- // enough for implementing the DescribeTo() method of Optional().
- template <typename Optional> operator Matcher<Optional>() const {
- return MakeMatcher(new Impl<Optional>(matcher_));
- }
-
-private:
- // The monomorphic implementation that works for a particular optional type.
- template <typename Optional>
- class Impl : public ::testing::MatcherInterface<Optional> {
- public:
- using Value = typename std::remove_const<
- typename std::remove_reference<Optional>::type>::type::value_type;
-
- explicit Impl(const InnerMatcher &matcher)
- : matcher_(::testing::MatcherCast<const Value &>(matcher)) {}
-
- Impl(const Impl&) = default;
- Impl &operator=(const Impl&) = delete;
-
- virtual void DescribeTo(::std::ostream *os) const {
- *os << "has a value that ";
- matcher_.DescribeTo(os);
- }
-
- virtual void DescribeNegationTo(::std::ostream *os) const {
- *os << "does not have a value that ";
- matcher_.DescribeTo(os);
- }
-
- virtual bool
- MatchAndExplain(Optional optional,
- ::testing::MatchResultListener *listener) const {
- if (!optional)
- return false;
-
- *listener << "which has a value ";
- return MatchPrintAndExplain(*optional, matcher_, listener);
- }
-
- private:
- const Matcher<const Value &> matcher_;
- };
-
- const InnerMatcher matcher_;
-};
-
-// Creates a matcher that matches an Optional that has a value
-// that matches inner_matcher.
-template <typename InnerMatcher>
-inline OptionalMatcher<InnerMatcher>
-HasValue(const InnerMatcher &inner_matcher) {
- return OptionalMatcher<InnerMatcher>(inner_matcher);
-}
-
} // namespace clangd
} // namespace clang
#endif
diff --git a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
index 15158d8a45ca8b..406a842f5a0081 100644
--- a/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
@@ -28,6 +28,7 @@ using ::testing::ElementsAre;
using ::testing::Field;
using ::testing::IsEmpty;
using ::testing::Matcher;
+using ::testing::Optional;
using ::testing::SizeIs;
using ::testing::UnorderedElementsAre;
@@ -38,12 +39,12 @@ MATCHER_P(selectionRangeIs, R, "") { return arg.selectionRange == R; }
template <class... ParentMatchers>
::testing::Matcher<TypeHierarchyItem> parents(ParentMatchers... ParentsM) {
return Field(&TypeHierarchyItem::parents,
- HasValue(UnorderedElementsAre(ParentsM...)));
+ Optional(UnorderedElementsAre(ParentsM...)));
}
template <class... ChildMatchers>
::testing::Matcher<TypeHierarchyItem> children(ChildMatchers... ChildrenM) {
return Field(&TypeHierarchyItem::children,
- HasValue(UnorderedElementsAre(ChildrenM...)));
+ Optional(UnorderedElementsAre(ChildrenM...)));
}
// Note: "not resolved" is different from "resolved but empty"!
MATCHER(parentsNotResolved, "") { return !arg.parents; }
@@ -790,7 +791,7 @@ struct Child : Parent1, Parent2 {};
Children,
UnorderedElementsAre(
AllOf(withName("Child"),
- withResolveParents(HasValue(UnorderedElementsAre(withResolveID(
+ withResolveParents(Optional(UnorderedElementsAre(withResolveID(
getSymbolID(&findDecl(AST, "Parent1")).str())))))));
}
@@ -810,9 +811,9 @@ struct Chil^d : Parent {};
ASSERT_THAT(Result, SizeIs(1));
auto Parents = superTypes(Result.front(), Index.get());
- EXPECT_THAT(Parents, HasValue(UnorderedElementsAre(
+ EXPECT_THAT(Parents, Optional(UnorderedElementsAre(
AllOf(withName("Parent"),
- withResolveParents(HasValue(IsEmpty()))))));
+ withResolveParents(Optional(IsEmpty()))))));
}
} // namespace
} // namespace clangd
|
llvm-beanz
approved these changes
Jan 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An equivalent matcher under the name Optional has since been added upstream to GMock.
Fixes #121308