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

merge from upstream

This commit is contained in:
Malcolm Noyes 2013-12-11 20:57:42 +00:00
parent 9f280a412d a6d74bd55a
commit a3a56158f0
9 changed files with 51 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 16 (master branch)* *v1.0 build 17 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

10
include/internal/catch_common.h
View File

@ -57,16 +57,6 @@ namespace Catch {
delete it->second; delete it->second;
} }
template<typename ContainerT, typename Function>
inline void forEach( ContainerT& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT const& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
bool startsWith( std::string const& s, std::string const& prefix ); bool startsWith( std::string const& s, std::string const& prefix );
bool endsWith( std::string const& s, std::string const& suffix ); bool endsWith( std::string const& s, std::string const& suffix );
bool contains( std::string const& s, std::string const& infix ); bool contains( std::string const& s, std::string const& infix );

2
include/internal/catch_debugger.h
View File

@ -43,7 +43,7 @@ namespace Catch{
#endif #endif
#ifndef CATCH_BREAK_INTO_DEBUGGER #ifndef CATCH_BREAK_INTO_DEBUGGER
#define CATCH_BREAK_INTO_DEBUGGER() #define CATCH_BREAK_INTO_DEBUGGER() Catch::isTrue( true );
#endif #endif
#endif // TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED #endif // TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED

2
include/internal/catch_version.hpp
View File

@ -14,7 +14,7 @@ namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
template <typename T> template <typename T>
const T LibraryVersionInfo<T>::value( 1, 0, 16, "master" ); const T LibraryVersionInfo<T>::value( 1, 0, 17, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

4
include/reporters/catch_reporter_bases.hpp
View File

@ -168,9 +168,9 @@ namespace Catch {
Ptr<TestRunNode> node = new TestRunNode( testRunStats ); Ptr<TestRunNode> node = new TestRunNode( testRunStats );
node->children.swap( m_testGroups ); node->children.swap( m_testGroups );
m_testRuns.push_back( node ); m_testRuns.push_back( node );
testRunEnded(); testRunEndedCumulative();
} }
virtual void testRunEnded() = 0; virtual void testRunEndedCumulative() = 0;
Ptr<IConfig> m_config; Ptr<IConfig> m_config;
std::ostream& stream; std::ostream& stream;

2
include/reporters/catch_reporter_junit.hpp
View File

@ -70,7 +70,7 @@ namespace Catch {
writeGroup( *m_testGroups.back(), suiteTime ); writeGroup( *m_testGroups.back(), suiteTime );
} }
virtual void testRunEnded() { virtual void testRunEndedCumulative() {
xml.endElement(); xml.endElement();
} }

4
include/reporters/catch_reporter_xml.hpp
View File

@ -59,7 +59,7 @@ namespace Catch {
virtual void StartSection( const std::string& sectionName, const std::string& description ) { virtual void StartSection( const std::string& sectionName, const std::string& description ) {
if( m_sectionDepth++ > 0 ) { if( m_sectionDepth++ > 0 ) {
m_xml.startElement( "Section" ) m_xml.startElement( "Section" )
.writeAttribute( "name", sectionName ) .writeAttribute( "name", trim( sectionName ) )
.writeAttribute( "description", description ); .writeAttribute( "description", description );
} }
} }
@ -76,7 +76,7 @@ namespace Catch {
} }
virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) { virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) {
m_xml.startElement( "TestCase" ).writeAttribute( "name", testInfo.name ); m_xml.startElement( "TestCase" ).writeAttribute( "name", trim( testInfo.name ) );
m_currentTestSuccess = true; m_currentTestSuccess = true;
} }

68
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@ -6671,18 +6671,18 @@ there&quot;
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<TestCase name="Scenario: Do that thing with the thing"> <TestCase name="Scenario: Do that thing with the thing">
<Section name=" Given: This stuff exists"> <Section name="Given: This stuff exists">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<Section name=" Given: This stuff exists"> <Section name="Given: This stuff exists">
<Section name=" When: I do this"> <Section name="When: I do this">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<Section name=" Given: This stuff exists"> <Section name="Given: This stuff exists">
<Section name=" When: I do this"> <Section name="When: I do this">
<Section name=" Then: it should do this"> <Section name="Then: it should do this">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
itDoesThis() itDoesThis()
@ -6697,9 +6697,9 @@ there&quot;
</Section> </Section>
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>
</Section> </Section>
<Section name=" Given: This stuff exists"> <Section name="Given: This stuff exists">
<Section name=" When: I do this"> <Section name="When: I do this">
<Section name=" Then: it should do this"> <Section name="Then: it should do this">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
itDoesThis() itDoesThis()
@ -6708,7 +6708,7 @@ there&quot;
true true
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" And: do that"> <Section name="And: do that">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
itDoesThat() itDoesThat()
@ -6728,7 +6728,7 @@ there&quot;
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<TestCase name="Scenario: Vector resizing affects size and capacity"> <TestCase name="Scenario: Vector resizing affects size and capacity">
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6739,7 +6739,7 @@ there&quot;
</Expression> </Expression>
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6748,12 +6748,12 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: it is made larger"> <Section name="When: it is made larger">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6762,8 +6762,8 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: it is made larger"> <Section name="When: it is made larger">
<Section name=" Then: the size and capacity go up"> <Section name="Then: the size and capacity go up">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 10 v.size() == 10
@ -6786,7 +6786,7 @@ there&quot;
</Section> </Section>
<OverallResults successes="3" failures="0"/> <OverallResults successes="3" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6795,8 +6795,8 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: it is made larger"> <Section name="When: it is made larger">
<Section name=" Then: the size and capacity go up"> <Section name="Then: the size and capacity go up">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 10 v.size() == 10
@ -6822,7 +6822,7 @@ there&quot;
</Section> </Section>
<OverallResults successes="3" failures="0"/> <OverallResults successes="3" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6831,8 +6831,8 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: it is made larger"> <Section name="When: it is made larger">
<Section name=" Then: the size and capacity go up"> <Section name="Then: the size and capacity go up">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 10 v.size() == 10
@ -6850,7 +6850,7 @@ there&quot;
</Expanded> </Expanded>
</Expression> </Expression>
<Section name="And when: it is made smaller again"> <Section name="And when: it is made smaller again">
<Section name=" Then: the size goes down but the capacity stays the same"> <Section name="Then: the size goes down but the capacity stays the same">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 5 v.size() == 5
@ -6877,7 +6877,7 @@ there&quot;
</Section> </Section>
<OverallResults successes="5" failures="0"/> <OverallResults successes="5" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6886,12 +6886,12 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: we reserve more space"> <Section name="When: we reserve more space">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>
</Section> </Section>
<Section name=" Given: an empty vector"> <Section name="Given: an empty vector">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.size() == 0 v.size() == 0
@ -6900,8 +6900,8 @@ there&quot;
0 == 0 0 == 0
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" When: we reserve more space"> <Section name="When: we reserve more space">
<Section name=" Then: The capacity is increased but the size remains the same"> <Section name="Then: The capacity is increased but the size remains the same">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" > <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
<Original> <Original>
v.capacity() >= 10 v.capacity() >= 10
@ -6927,18 +6927,18 @@ there&quot;
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping"> <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping">
<Section name=" Given: A section name that is so long that it cannot fit in a single console width"> <Section name="Given: A section name that is so long that it cannot fit in a single console width">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<Section name=" Given: A section name that is so long that it cannot fit in a single console width"> <Section name="Given: A section name that is so long that it cannot fit in a single console width">
<Section name=" When: The test headers are printed as part of the normal running of the scenario"> <Section name="When: The test headers are printed as part of the normal running of the scenario">
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<OverallResults successes="0" failures="0"/> <OverallResults successes="0" failures="0"/>
</Section> </Section>
<Section name=" Given: A section name that is so long that it cannot fit in a single console width"> <Section name="Given: A section name that is so long that it cannot fit in a single console width">
<Section name=" When: The test headers are printed as part of the normal running of the scenario"> <Section name="When: The test headers are printed as part of the normal running of the scenario">
<Section name=" Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent"> <Section name="Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent">
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>
</Section> </Section>
<OverallResults successes="1" failures="0"/> <OverallResults successes="1" failures="0"/>

28
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 16 (master branch) * CATCH v1.0 build 17 (master branch)
* Generated: 2013-12-04 20:23:35.145591 * Generated: 2013-12-11 08:27:45.976816
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -149,16 +149,6 @@ namespace Catch {
delete it->second; delete it->second;
} }
template<typename ContainerT, typename Function>
inline void forEach( ContainerT& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT const& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
bool startsWith( std::string const& s, std::string const& prefix ); bool startsWith( std::string const& s, std::string const& prefix );
bool endsWith( std::string const& s, std::string const& suffix ); bool endsWith( std::string const& s, std::string const& suffix );
bool contains( std::string const& s, std::string const& infix ); bool contains( std::string const& s, std::string const& infix );
@ -1396,7 +1386,7 @@ namespace Catch{
#endif #endif
#ifndef CATCH_BREAK_INTO_DEBUGGER #ifndef CATCH_BREAK_INTO_DEBUGGER
#define CATCH_BREAK_INTO_DEBUGGER() #define CATCH_BREAK_INTO_DEBUGGER() Catch::isTrue( true );
#endif #endif
// #included from: catch_interfaces_registry_hub.h // #included from: catch_interfaces_registry_hub.h
@ -6139,7 +6129,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 16, "master" ); Version libraryVersion( 1, 0, 17, "master" );
} }
// #included from: catch_text.hpp // #included from: catch_text.hpp
@ -6788,9 +6778,9 @@ namespace Catch {
Ptr<TestRunNode> node = new TestRunNode( testRunStats ); Ptr<TestRunNode> node = new TestRunNode( testRunStats );
node->children.swap( m_testGroups ); node->children.swap( m_testGroups );
m_testRuns.push_back( node ); m_testRuns.push_back( node );
testRunEnded(); testRunEndedCumulative();
} }
virtual void testRunEnded() = 0; virtual void testRunEndedCumulative() = 0;
Ptr<IConfig> m_config; Ptr<IConfig> m_config;
std::ostream& stream; std::ostream& stream;
@ -7120,7 +7110,7 @@ namespace Catch {
virtual void StartSection( const std::string& sectionName, const std::string& description ) { virtual void StartSection( const std::string& sectionName, const std::string& description ) {
if( m_sectionDepth++ > 0 ) { if( m_sectionDepth++ > 0 ) {
m_xml.startElement( "Section" ) m_xml.startElement( "Section" )
.writeAttribute( "name", sectionName ) .writeAttribute( "name", trim( sectionName ) )
.writeAttribute( "description", description ); .writeAttribute( "description", description );
} }
} }
@ -7137,7 +7127,7 @@ namespace Catch {
} }
virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) { virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) {
m_xml.startElement( "TestCase" ).writeAttribute( "name", testInfo.name ); m_xml.startElement( "TestCase" ).writeAttribute( "name", trim( testInfo.name ) );
m_currentTestSuccess = true; m_currentTestSuccess = true;
} }
@ -7268,7 +7258,7 @@ namespace Catch {
writeGroup( *m_testGroups.back(), suiteTime ); writeGroup( *m_testGroups.back(), suiteTime );
} }
virtual void testRunEnded() { virtual void testRunEndedCumulative() {
xml.endElement(); xml.endElement();
} }