mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-26 07:16:10 +01:00
Merge branch 'matcher-not' into develop
* matcher-not: Add matcher: Not()
This commit is contained in:
commit
7fd7c5b8c8
@ -32,6 +32,23 @@ namespace Matchers {
|
|||||||
};
|
};
|
||||||
|
|
||||||
namespace Generic {
|
namespace Generic {
|
||||||
|
template<typename ExpressionT>
|
||||||
|
struct Not : public MatcherImpl<Not<ExpressionT>, ExpressionT>
|
||||||
|
{
|
||||||
|
Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
|
||||||
|
Not( Not const& other ) : m_matcher( other.m_matcher ) {}
|
||||||
|
|
||||||
|
virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE
|
||||||
|
{
|
||||||
|
return !m_matcher->match( expr );
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual std::string toString() const CATCH_OVERRIDE {
|
||||||
|
return "not " + m_matcher->toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
Ptr< Matcher<ExpressionT> > m_matcher;
|
||||||
|
};
|
||||||
|
|
||||||
template<typename ExpressionT>
|
template<typename ExpressionT>
|
||||||
class AllOf : public MatcherImpl<AllOf<ExpressionT>, ExpressionT> {
|
class AllOf : public MatcherImpl<AllOf<ExpressionT>, ExpressionT> {
|
||||||
@ -204,6 +221,11 @@ namespace Matchers {
|
|||||||
|
|
||||||
// The following functions create the actual matcher objects.
|
// The following functions create the actual matcher objects.
|
||||||
// This allows the types to be inferred
|
// This allows the types to be inferred
|
||||||
|
template<typename ExpressionT>
|
||||||
|
inline Impl::Generic::Not<ExpressionT> Not( Impl::Matcher<ExpressionT> const& m ) {
|
||||||
|
return Impl::Generic::Not<ExpressionT>( m );
|
||||||
|
}
|
||||||
|
|
||||||
template<typename ExpressionT>
|
template<typename ExpressionT>
|
||||||
inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
|
inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
|
||||||
Impl::Matcher<ExpressionT> const& m2 ) {
|
Impl::Matcher<ExpressionT> const& m2 ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user