mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Merge ../../Catch
This commit is contained in:
commit
5680fe4237
@ -367,7 +367,7 @@ public:
|
||||
Expression
|
||||
(
|
||||
MutableResultInfo& result,
|
||||
const T& lhs
|
||||
T lhs
|
||||
)
|
||||
: m_result( result ),
|
||||
m_lhs( lhs )
|
||||
@ -475,7 +475,7 @@ public:
|
||||
|
||||
private:
|
||||
MutableResultInfo& m_result;
|
||||
const T& m_lhs;
|
||||
T m_lhs;
|
||||
};
|
||||
|
||||
template<typename LhsT>
|
||||
@ -564,12 +564,12 @@ public:
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
template<typename T>
|
||||
Expression<T> operator->*
|
||||
Expression<const T&> operator->*
|
||||
(
|
||||
const T & operand
|
||||
)
|
||||
{
|
||||
Expression<T> expr( m_result, operand );
|
||||
Expression<const T&> expr( m_result, operand );
|
||||
|
||||
return expr;
|
||||
}
|
||||
|
@ -241,6 +241,8 @@ TEST_CASE( "./succeeding/conditions/not",
|
||||
{
|
||||
bool falseValue = false;
|
||||
|
||||
REQUIRE( false == false );
|
||||
REQUIRE( true == true );
|
||||
REQUIRE( !false );
|
||||
REQUIRE_FALSE( false );
|
||||
|
||||
@ -256,6 +258,8 @@ TEST_CASE( "./failing/conditions/not",
|
||||
{
|
||||
bool trueValue = true;
|
||||
|
||||
CHECK( false != false );
|
||||
CHECK( true != true );
|
||||
CHECK( !true );
|
||||
CHECK_FALSE( true );
|
||||
|
||||
|
@ -47,7 +47,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
|
||||
"Number of 'succeeding' tests is fixed" )
|
||||
{
|
||||
runner.runMatching( "./succeeding/*" );
|
||||
CHECK( runner.getSuccessCount() == 257 );
|
||||
CHECK( runner.getSuccessCount() == 259 );
|
||||
CHECK( runner.getFailureCount() == 0 );
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
|
||||
{
|
||||
runner.runMatching( "./failing/*" );
|
||||
CHECK( runner.getSuccessCount() == 0 );
|
||||
CHECK( runner.getFailureCount() == 60 );
|
||||
CHECK( runner.getFailureCount() == 62 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user