|
|
|
|
@@ -1985,7 +1985,7 @@ namespace Catch {
|
|
|
|
|
|
|
|
|
|
namespace Catch {
|
|
|
|
|
namespace Matchers {
|
|
|
|
|
namespace Impl {
|
|
|
|
|
namespace detail {
|
|
|
|
|
|
|
|
|
|
template<typename ArgT> struct MatchAllOf;
|
|
|
|
|
template<typename ArgT> struct MatchAnyOf;
|
|
|
|
|
@@ -2115,12 +2115,12 @@ namespace Matchers {
|
|
|
|
|
return MatchNotOf<ComparatorT>( *this );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Impl
|
|
|
|
|
} // namespace detail
|
|
|
|
|
|
|
|
|
|
} // namespace Matchers
|
|
|
|
|
|
|
|
|
|
using namespace Matchers;
|
|
|
|
|
using Matchers::Impl::MatcherBase;
|
|
|
|
|
using Matchers::detail::MatcherBase;
|
|
|
|
|
|
|
|
|
|
} // namespace Catch
|
|
|
|
|
|
|
|
|
|
@@ -2317,7 +2317,7 @@ namespace Catch {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
|
|
|
|
|
using StringMatcher = Matchers::detail::MatcherBase<std::string>;
|
|
|
|
|
|
|
|
|
|
void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString );
|
|
|
|
|
|
|
|
|
|
@@ -2550,7 +2550,7 @@ namespace Catch {
|
|
|
|
|
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
|
|
|
|
|
|
|
|
namespace Matchers {
|
|
|
|
|
namespace Impl {
|
|
|
|
|
namespace detail {
|
|
|
|
|
namespace NSStringMatchers {
|
|
|
|
|
|
|
|
|
|
struct StringHolder : MatcherBase<NSString*>{
|
|
|
|
|
@@ -2619,19 +2619,19 @@ namespace Catch {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace NSStringMatchers
|
|
|
|
|
} // namespace Impl
|
|
|
|
|
} // namespace detail
|
|
|
|
|
|
|
|
|
|
inline Impl::NSStringMatchers::Equals
|
|
|
|
|
Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
|
|
|
|
|
inline detail::NSStringMatchers::Equals
|
|
|
|
|
Equals( NSString* substr ){ return detail::NSStringMatchers::Equals( substr ); }
|
|
|
|
|
|
|
|
|
|
inline Impl::NSStringMatchers::Contains
|
|
|
|
|
Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
|
|
|
|
|
inline detail::NSStringMatchers::Contains
|
|
|
|
|
Contains( NSString* substr ){ return detail::NSStringMatchers::Contains( substr ); }
|
|
|
|
|
|
|
|
|
|
inline Impl::NSStringMatchers::StartsWith
|
|
|
|
|
StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
|
|
|
|
|
inline detail::NSStringMatchers::StartsWith
|
|
|
|
|
StartsWith( NSString* substr ){ return detail::NSStringMatchers::StartsWith( substr ); }
|
|
|
|
|
|
|
|
|
|
inline Impl::NSStringMatchers::EndsWith
|
|
|
|
|
EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
|
|
|
|
|
inline detail::NSStringMatchers::EndsWith
|
|
|
|
|
EndsWith( NSString* substr ){ return detail::NSStringMatchers::EndsWith( substr ); }
|
|
|
|
|
|
|
|
|
|
} // namespace Matchers
|
|
|
|
|
|
|
|
|
|
@@ -3373,7 +3373,7 @@ namespace Catch {
|
|
|
|
|
|
|
|
|
|
virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
|
|
|
|
|
|
|
|
|
|
// Default empty impl provided
|
|
|
|
|
// Default empty detail provided
|
|
|
|
|
virtual void fatalErrorEncountered( StringRef name );
|
|
|
|
|
|
|
|
|
|
virtual bool isMulti() const;
|
|
|
|
|
@@ -4316,7 +4316,7 @@ namespace Catch {
|
|
|
|
|
|
|
|
|
|
namespace Catch {
|
|
|
|
|
|
|
|
|
|
using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
|
|
|
|
|
using StringMatcher = Matchers::detail::MatcherBase<std::string>;
|
|
|
|
|
|
|
|
|
|
// This is the general overload that takes a any string matcher
|
|
|
|
|
// There is another overload, in catch_assertinhandler.h/.cpp, that only takes a string and infers
|
|
|
|
|
@@ -5244,7 +5244,7 @@ namespace detail {
|
|
|
|
|
|
|
|
|
|
class Arg : public ParserRefImpl<Arg> {
|
|
|
|
|
public:
|
|
|
|
|
using ParserRefImpl::ParserRefImpl;
|
|
|
|
|
using ParserRefdetail::ParserRefImpl;
|
|
|
|
|
|
|
|
|
|
auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
|
|
|
|
|
auto validationResult = validate();
|
|
|
|
|
@@ -5368,7 +5368,7 @@ namespace detail {
|
|
|
|
|
return Result::logicError( "Option name must begin with '-'" );
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return ParserRefImpl::validate();
|
|
|
|
|
return ParserRefdetail::validate();
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -6002,7 +6002,7 @@ namespace {
|
|
|
|
|
colourMode = UseColour::Yes;
|
|
|
|
|
return colourMode == UseColour::Yes
|
|
|
|
|
? &s_instance
|
|
|
|
|
: NoColourImpl::instance();
|
|
|
|
|
: NoColourdetail::instance();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // end anon namespace
|
|
|
|
|
@@ -6069,8 +6069,8 @@ namespace {
|
|
|
|
|
? UseColour::Yes
|
|
|
|
|
: UseColour::No;
|
|
|
|
|
return colourMode == UseColour::Yes
|
|
|
|
|
? PosixColourImpl::instance()
|
|
|
|
|
: NoColourImpl::instance();
|
|
|
|
|
? PosixColourdetail::instance()
|
|
|
|
|
: NoColourdetail::instance();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // end anon namespace
|
|
|
|
|
@@ -6080,7 +6080,7 @@ namespace {
|
|
|
|
|
|
|
|
|
|
namespace Catch {
|
|
|
|
|
|
|
|
|
|
static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
|
|
|
|
|
static IColourImpl* platformColourInstance() { return NoColourdetail::instance(); }
|
|
|
|
|
|
|
|
|
|
} // end namespace Catch
|
|
|
|
|
|
|
|
|
|
@@ -7053,7 +7053,7 @@ namespace Catch {
|
|
|
|
|
|
|
|
|
|
namespace Catch {
|
|
|
|
|
namespace Matchers {
|
|
|
|
|
namespace Impl {
|
|
|
|
|
namespace detail {
|
|
|
|
|
|
|
|
|
|
std::string MatcherUntypedBase::toString() const {
|
|
|
|
|
if( m_cachedToString.empty() )
|
|
|
|
|
@@ -7063,11 +7063,11 @@ namespace Matchers {
|
|
|
|
|
|
|
|
|
|
MatcherUntypedBase::~MatcherUntypedBase() = default;
|
|
|
|
|
|
|
|
|
|
} // namespace Impl
|
|
|
|
|
} // namespace detail
|
|
|
|
|
} // namespace Matchers
|
|
|
|
|
|
|
|
|
|
using namespace Matchers;
|
|
|
|
|
using Matchers::Impl::MatcherBase;
|
|
|
|
|
using Matchers::detail::MatcherBase;
|
|
|
|
|
|
|
|
|
|
} // namespace Catch
|
|
|
|
|
// end catch_matchers.cpp
|
|
|
|
|
@@ -8394,7 +8394,7 @@ namespace Catch {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~StreamBufImpl() noexcept {
|
|
|
|
|
StreamBufImpl::sync();
|
|
|
|
|
StreamBufdetail::sync();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|