mirror of https://github.com/catchorg/Catch2.git
build 27
This commit is contained in:
parent
3453639732
commit
bd7f797e09
2
README
2
README
|
@ -1,4 +1,4 @@
|
||||||
CATCH v0.9 build 26 (integration branch)
|
CATCH v0.9 build 27 (integration branch)
|
||||||
---------------------------------------------
|
---------------------------------------------
|
||||||
|
|
||||||
CATCH is an automated test framework for C, C++ and Objective-C.
|
CATCH is an automated test framework for C, C++ and Objective-C.
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 0, 9, 26, "integration" );
|
Version libraryVersion( 0, 9, 27, "integration" );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
CatchSelfTest is a CATCH v0.9 b26 (integration) host application.
|
CatchSelfTest is a CATCH v0.9 b27 (integration) host application.
|
||||||
Run with -? for options
|
Run with -? for options
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
@ -4316,7 +4316,7 @@ with message:
|
||||||
|
|
||||||
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
CatchSelfTest is a CATCH v0.9 b26 (integration) host application.
|
CatchSelfTest is a CATCH v0.9 b27 (integration) host application.
|
||||||
Run with -? for options
|
Run with -? for options
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* CATCH v0.9 build 26 (integration branch)
|
* CATCH v0.9 build 27 (integration branch)
|
||||||
* Generated: 2013-03-16 20:19:56.120579
|
* Generated: 2013-03-21 08:59:28.031778
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* This file has been merged from multiple headers. Please don't edit it directly
|
* This file has been merged from multiple headers. Please don't edit it directly
|
||||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||||
|
@ -1672,11 +1672,11 @@ namespace Catch {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( m_stringToMatch[0] == '*' ) {
|
if( startsWith( m_stringToMatch, "*" ) ) {
|
||||||
m_stringToMatch = m_stringToMatch.substr( 1 );
|
m_stringToMatch = m_stringToMatch.substr( 1 );
|
||||||
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtStart );
|
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtStart );
|
||||||
}
|
}
|
||||||
if( m_stringToMatch[m_stringToMatch.size()-1] == '*' ) {
|
if( endsWith( m_stringToMatch, "*" ) ) {
|
||||||
m_stringToMatch = m_stringToMatch.substr( 0, m_stringToMatch.size()-1 );
|
m_stringToMatch = m_stringToMatch.substr( 0, m_stringToMatch.size()-1 );
|
||||||
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtEnd );
|
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtEnd );
|
||||||
}
|
}
|
||||||
|
@ -3719,8 +3719,12 @@ namespace Catch {
|
||||||
groupName += cmd[i];
|
groupName += cmd[i];
|
||||||
}
|
}
|
||||||
TestCaseFilters filters( groupName );
|
TestCaseFilters filters( groupName );
|
||||||
for( std::size_t i = 0; i < cmd.argsCount(); ++i )
|
for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
|
||||||
|
if( startsWith( cmd[i], "[" ) || startsWith( cmd[i], "~[" ) )
|
||||||
|
filters.addTags( cmd[i] );
|
||||||
|
else
|
||||||
filters.addFilter( TestCaseFilter( cmd[i] ) );
|
filters.addFilter( TestCaseFilter( cmd[i] ) );
|
||||||
|
}
|
||||||
config.filters.push_back( filters );
|
config.filters.push_back( filters );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -5899,7 +5903,7 @@ namespace Catch {
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 0, 9, 26, "integration" );
|
Version libraryVersion( 0, 9, 27, "integration" );
|
||||||
}
|
}
|
||||||
|
|
||||||
// #included from: catch_line_wrap.hpp
|
// #included from: catch_line_wrap.hpp
|
||||||
|
@ -7502,7 +7506,11 @@ int main (int argc, char * const argv[]) {
|
||||||
#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
|
#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
|
||||||
|
|
||||||
// "BDD-style" convenience wrappers
|
// "BDD-style" convenience wrappers
|
||||||
|
#ifdef CATCH_CONFIG_VARIADIC_MACROS
|
||||||
|
#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
|
||||||
|
#else
|
||||||
#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags )
|
#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags )
|
||||||
|
#endif
|
||||||
#define CATCH_GIVEN( desc ) CATCH_SECTION( "Given: " desc, "" )
|
#define CATCH_GIVEN( desc ) CATCH_SECTION( "Given: " desc, "" )
|
||||||
#define CATCH_WHEN( desc ) CATCH_SECTION( " When: " desc, "" )
|
#define CATCH_WHEN( desc ) CATCH_SECTION( " When: " desc, "" )
|
||||||
#define CATCH_AND_WHEN( desc ) CATCH_SECTION( " And: " desc, "" )
|
#define CATCH_AND_WHEN( desc ) CATCH_SECTION( " And: " desc, "" )
|
||||||
|
@ -7563,7 +7571,11 @@ int main (int argc, char * const argv[]) {
|
||||||
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
|
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
|
||||||
|
|
||||||
// "BDD-style" convenience wrappers
|
// "BDD-style" convenience wrappers
|
||||||
|
#ifdef CATCH_CONFIG_VARIADIC_MACROS
|
||||||
|
#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
|
||||||
|
#else
|
||||||
#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
|
#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
|
||||||
|
#endif
|
||||||
#define GIVEN( desc ) SECTION( "Given: " desc, "" )
|
#define GIVEN( desc ) SECTION( "Given: " desc, "" )
|
||||||
#define WHEN( desc ) SECTION( " When: " desc, "" )
|
#define WHEN( desc ) SECTION( " When: " desc, "" )
|
||||||
#define AND_WHEN( desc ) SECTION( " And: " desc, "" )
|
#define AND_WHEN( desc ) SECTION( " And: " desc, "" )
|
||||||
|
|
Loading…
Reference in New Issue