eden-emu/Catch2
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Generalised Matchers so objects and comparators can be different types

Browse source
This commit is contained in:
Phil Nash 2017-02-21 15:52:03 +00:00
parent 4e6938d78e
commit 45d4096756
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
include/internal/catch_matchers.hpp
View file

@ -33,14 +33,14 @@ namespace Matchers {
MatcherUntypedBase& operator = (MatcherUntypedBase const&);
};
template<typename ArgT>
template<typename ObjectT, typename ComparatorT = ObjectT>
struct MatcherBase : MatcherUntypedBase {
virtual bool match( ArgT const& arg ) const = 0;
virtual bool match( ObjectT const& arg ) const = 0;
MatchAllOf<ArgT> operator && ( MatcherBase const& other ) const;
MatchAnyOf<ArgT> operator || ( MatcherBase const& other ) const;
MatchNotOf<ArgT> operator ! () const;
MatchAllOf<ComparatorT> operator && ( MatcherBase const& other ) const;
MatchAnyOf<ComparatorT> operator || ( MatcherBase const& other ) const;
MatchNotOf<ComparatorT> operator ! () const;
};
template<typename ArgT>
@ -118,17 +118,17 @@ namespace Matchers {
MatcherBase<ArgT> const& m_underlyingMatcher;
};
template<typename ArgT>
MatchAllOf<ArgT> MatcherBase<ArgT>::operator && ( MatcherBase const& other ) const {
return MatchAllOf<ArgT>() && *this && other;
template<typename ObjectT, typename ComparatorT>
MatchAllOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator && ( MatcherBase const& other ) const {
return MatchAllOf<ComparatorT>() && *this && other;
}
template<typename ArgT>
MatchAnyOf<ArgT> MatcherBase<ArgT>::operator || ( MatcherBase const& other ) const {
return MatchAnyOf<ArgT>() || *this || other;
template<typename ObjectT, typename ComparatorT>
MatchAnyOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator || ( MatcherBase const& other ) const {
return MatchAnyOf<ComparatorT>() || *this || other;
}
template<typename ArgT>
MatchNotOf<ArgT> MatcherBase<ArgT>::operator ! () const {
return MatchNotOf<ArgT>( *this );
template<typename ObjectT, typename ComparatorT>
MatchNotOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator ! () const {
return MatchNotOf<ComparatorT>( *this );
}
} // namespace Impl