3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ../../Catch

This commit is contained in:
Phil Nash 2011-09-19 18:20:11 +01:00
parent 8152825e9f 08a1b51987
commit 5680fe4237
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_capture.hpp
View File

@ -367,7 +367,7 @@ public:
Expression Expression
( (
MutableResultInfo& result, MutableResultInfo& result,
const T& lhs T lhs
) )
: m_result( result ), : m_result( result ),
m_lhs( lhs ) m_lhs( lhs )
@ -475,7 +475,7 @@ public:
private: private:
MutableResultInfo& m_result; MutableResultInfo& m_result;
const T& m_lhs; T m_lhs;
}; };
template<typename LhsT> template<typename LhsT>
@ -564,12 +564,12 @@ public:
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
template<typename T> template<typename T>
Expression<T> operator->* Expression<const T&> operator->*
( (
const T & operand const T & operand
) )
{ {
Expression<T> expr( m_result, operand ); Expression<const T&> expr( m_result, operand );
return expr; return expr;
} }

4
projects/SelfTest/ConditionTests.cpp
View File

@ -241,6 +241,8 @@ TEST_CASE( "./succeeding/conditions/not",
{ {
bool falseValue = false; bool falseValue = false;
REQUIRE( false == false );
REQUIRE( true == true );
REQUIRE( !false ); REQUIRE( !false );
REQUIRE_FALSE( false ); REQUIRE_FALSE( false );
@ -256,6 +258,8 @@ TEST_CASE( "./failing/conditions/not",
{ {
bool trueValue = true; bool trueValue = true;
CHECK( false != false );
CHECK( true != true );
CHECK( !true ); CHECK( !true );
CHECK_FALSE( true ); CHECK_FALSE( true );

4
projects/SelfTest/TestMain.cpp
View File

@ -47,7 +47,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
"Number of 'succeeding' tests is fixed" ) "Number of 'succeeding' tests is fixed" )
{ {
runner.runMatching( "./succeeding/*" ); runner.runMatching( "./succeeding/*" );
CHECK( runner.getSuccessCount() == 257 ); CHECK( runner.getSuccessCount() == 259 );
CHECK( runner.getFailureCount() == 0 ); CHECK( runner.getFailureCount() == 0 );
} }
@ -56,7 +56,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
{ {
runner.runMatching( "./failing/*" ); runner.runMatching( "./failing/*" );
CHECK( runner.getSuccessCount() == 0 ); CHECK( runner.getSuccessCount() == 0 );
CHECK( runner.getFailureCount() == 60 ); CHECK( runner.getFailureCount() == 62 );
} }
} }
} }