INFO and CAPTURE are now scoped
- SCOPED_INFO and SCOPED_CAPTURE are now just aliases
diff --git a/include/catch.hpp b/include/catch.hpp
index d2ebab6..600815f 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -74,9 +74,9 @@
#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "CATCH_WARN" )
#define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL" )
#define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED" )
-#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_SCOPED_INFO( msg, "CATCH_SCOPED_INFO" )
+#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_SCOPED_INFO( #msg " := " << msg, "CATCH_SCOPED_CAPTURE" )
+#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
#ifdef CATCH_CONFIG_VARIADIC_MACROS
#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
@@ -135,9 +135,9 @@
#define WARN( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "WARN" )
#define FAIL( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL" )
#define SUCCEED( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED" )
-#define SCOPED_INFO( msg ) INTERNAL_CATCH_SCOPED_INFO( msg, "SCOPED_INFO" )
+#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
#define CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
-#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_SCOPED_INFO( #msg " := " << msg, "SCOPED_CAPTURE" )
+#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
#ifdef CATCH_CONFIG_VARIADIC_MACROS
#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index cf14324..4aa6bc8 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -145,11 +145,6 @@
} \
} while( Catch::isTrue( false ) )
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( log, macroName ) \
- do { \
- Catch::getResultCapture().acceptMessage( Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log ); \
- } while( Catch::isTrue( false ) )
///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_MSG( log, messageType, resultDisposition, macroName ) \
@@ -159,10 +154,8 @@
} while( Catch::isTrue( false ) )
///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_SCOPED_INFO( log, macroName ) \
- Catch::ScopedMessageBuilder INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ); \
- INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) << log; \
- Catch::getResultCapture().pushScopedMessage( INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) )
+#define INTERNAL_CATCH_INFO( log, macroName ) \
+ Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
///////////////////////////////////////////////////////////////////////////////
diff --git a/include/internal/catch_interfaces_capture.h b/include/internal/catch_interfaces_capture.h
index 8cc68cc..5b1619a 100644
--- a/include/internal/catch_interfaces_capture.h
+++ b/include/internal/catch_interfaces_capture.h
@@ -20,7 +20,7 @@
class AssertionResult;
struct AssertionInfo;
struct SectionInfo;
- class MessageBuilder;
+ struct MessageInfo;
class ScopedMessageBuilder;
struct IResultCapture {
@@ -31,12 +31,11 @@
virtual bool sectionStarted( SectionInfo const& sectionInfo,
Counts& assertions ) = 0;
virtual void sectionEnded( SectionInfo const& name, Counts const& assertions ) = 0;
- virtual void pushScopedMessage( ScopedMessageBuilder const& _builder ) = 0;
- virtual void popScopedMessage( ScopedMessageBuilder const& _builder ) = 0;
+ virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+ virtual void popScopedMessage( MessageInfo const& message ) = 0;
virtual bool shouldDebugBreak() const = 0;
- virtual void acceptMessage( MessageBuilder const& messageBuilder ) = 0;
virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) = 0;
virtual std::string getCurrentTestName() const = 0;
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index 654abf3..57db9d7 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -102,7 +102,9 @@
// !TBD This should have been done earlier, somewhere
MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
builder << assertionResult.getMessage();
- infoMessages.push_back( builder.build() );
+ builder.m_info.message = builder.m_stream.str();
+
+ infoMessages.push_back( builder.m_info );
}
}
virtual ~AssertionStats();
diff --git a/include/internal/catch_message.h b/include/internal/catch_message.h
index b3d4af1..f90d64c 100644
--- a/include/internal/catch_message.h
+++ b/include/internal/catch_message.h
@@ -35,30 +35,29 @@
static unsigned int globalCount;
};
-
- class MessageBuilder : public MessageInfo {
- public:
- MessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type );
-
- MessageInfo build() const;
+ struct MessageBuilder {
+ MessageBuilder( std::string const& macroName,
+ SourceLineInfo const& lineInfo,
+ ResultWas::OfType type )
+ : m_info( macroName, lineInfo, type )
+ {}
template<typename T>
- MessageBuilder& operator << ( T const& _value ) {
- stream << _value;
+ MessageBuilder& operator << ( T const& value ) {
+ m_stream << value;
return *this;
}
- private:
- std::ostringstream stream;
+
+ MessageInfo m_info;
+ std::ostringstream m_stream;
};
-
- class ScopedMessageBuilder : public MessageBuilder {
+
+ class ScopedMessage {
public:
- ScopedMessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type );
- ~ScopedMessageBuilder();
+ ScopedMessage( MessageBuilder const& builder );
+ ~ScopedMessage();
+
+ MessageInfo m_info;
};
} // end namespace Catch
diff --git a/include/internal/catch_message.hpp b/include/internal/catch_message.hpp
index c6996aa..949391b 100644
--- a/include/internal/catch_message.hpp
+++ b/include/internal/catch_message.hpp
@@ -24,31 +24,17 @@
// This may need protecting if threading support is added
unsigned int MessageInfo::globalCount = 0;
+
////////////////////////////////////////////////////////////////////////////
- MessageBuilder::MessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type )
- : MessageInfo( _macroName, _lineInfo, _type )
- {}
-
- MessageInfo MessageBuilder::build() const {
- MessageInfo message = *this;
- message.message = stream.str();
- return message;
+ ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+ : m_info( builder.m_info )
+ {
+ m_info.message = builder.m_stream.str();
+ getResultCapture().pushScopedMessage( m_info );
}
-
- ////////////////////////////////////////////////////////////////////////////
-
- ScopedMessageBuilder::ScopedMessageBuilder
- ( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type )
- : MessageBuilder( _macroName, _lineInfo, _type )
- {}
-
- ScopedMessageBuilder::~ScopedMessageBuilder() {
- getResultCapture().popScopedMessage( *this );
+ ScopedMessage::~ScopedMessage() {
+ getResultCapture().popScopedMessage( m_info );
}
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp
index 5191d7f..b67f2eb 100644
--- a/include/internal/catch_runner_impl.hpp
+++ b/include/internal/catch_runner_impl.hpp
@@ -154,10 +154,6 @@
private: // IResultCapture
- virtual void acceptMessage( MessageBuilder const& messageBuilder ) {
- m_messages.push_back( messageBuilder.build() );
- }
-
virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) {
m_lastAssertionInfo = assertionInfo;
return actOnCurrentResult( assertionResult.buildResult( assertionInfo ) );
@@ -221,12 +217,12 @@
m_messages.clear();
}
- virtual void pushScopedMessage( ScopedMessageBuilder const& _builder ) {
- m_messages.push_back( _builder.build() );
+ virtual void pushScopedMessage( MessageInfo const& message ) {
+ m_messages.push_back( message );
}
- virtual void popScopedMessage( ScopedMessageBuilder const& _builder ) {
- m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), _builder ), m_messages.end() );
+ virtual void popScopedMessage( MessageInfo const& message ) {
+ m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() );
}
virtual bool shouldDebugBreak() const {
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 215ed60..9191ed3 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -390,10 +390,10 @@
-------------------------------------------------------------------------------
./mixed/message/info/2
-------------------------------------------------------------------------------
-MessageTests.cpp:29
+MessageTests.cpp:30
...............................................................................
-MessageTests.cpp:37: FAILED:
+MessageTests.cpp:39: FAILED:
CHECK( a == 1 )
with expansion:
2 == 1
@@ -401,7 +401,7 @@
this message may be logged later
this message should be logged
-MessageTests.cpp:41: FAILED:
+MessageTests.cpp:43: FAILED:
CHECK( a == 0 )
with expansion:
2 == 0
@@ -411,10 +411,10 @@
-------------------------------------------------------------------------------
./failing/message/fail
-------------------------------------------------------------------------------
-MessageTests.cpp:48
+MessageTests.cpp:50
...............................................................................
-MessageTests.cpp:51: FAILED:
+MessageTests.cpp:53: FAILED:
explicitly with message:
This is a failure
@@ -422,10 +422,10 @@
./failing/message/sections
one
-------------------------------------------------------------------------------
-MessageTests.cpp:56
+MessageTests.cpp:58
...............................................................................
-MessageTests.cpp:58: FAILED:
+MessageTests.cpp:60: FAILED:
explicitly with message:
Message from section one
@@ -433,10 +433,10 @@
./failing/message/sections
two
-------------------------------------------------------------------------------
-MessageTests.cpp:61
+MessageTests.cpp:63
...............................................................................
-MessageTests.cpp:63: FAILED:
+MessageTests.cpp:65: FAILED:
explicitly with message:
Message from section two
@@ -445,10 +445,10 @@
-------------------------------------------------------------------------------
./mixed/message/scoped
-------------------------------------------------------------------------------
-MessageTests.cpp:80
+MessageTests.cpp:82
...............................................................................
-MessageTests.cpp:86: FAILED:
+MessageTests.cpp:88: FAILED:
REQUIRE( i < 10 )
with expansion:
10 < 10
@@ -459,10 +459,10 @@
-------------------------------------------------------------------------------
just failure
-------------------------------------------------------------------------------
-MessageTests.cpp:99
+MessageTests.cpp:101
...............................................................................
-MessageTests.cpp:101: FAILED:
+MessageTests.cpp:103: FAILED:
explicitly with message:
Previous info should not be seen
@@ -515,8 +515,7 @@
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
-with messages:
- Testing if fib[2] (2) is even
+with message:
Testing if fib[3] (3) is even
MiscTests.cpp:111: FAILED:
@@ -530,8 +529,7 @@
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
-with messages:
- Testing if fib[5] (8) is even
+with message:
Testing if fib[6] (13) is even
MiscTests.cpp:111: FAILED:
@@ -2780,10 +2778,10 @@
-------------------------------------------------------------------------------
./mixed/message/info/2
-------------------------------------------------------------------------------
-MessageTests.cpp:29
+MessageTests.cpp:30
...............................................................................
-MessageTests.cpp:33:
+MessageTests.cpp:35:
PASSED:
CHECK( a == 2 )
with expansion:
@@ -2791,21 +2789,21 @@
with message:
this message may be logged later
-MessageTests.cpp:37: FAILED:
+MessageTests.cpp:39: FAILED:
CHECK( a == 1 )
with expansion:
2 == 1
with message:
this message should be logged
-MessageTests.cpp:41: FAILED:
+MessageTests.cpp:43: FAILED:
CHECK( a == 0 )
with expansion:
2 == 0
with message:
and this, but later
-MessageTests.cpp:45:
+MessageTests.cpp:47:
PASSED:
CHECK( a == 2 )
with expansion:
@@ -2816,10 +2814,10 @@
-------------------------------------------------------------------------------
./failing/message/fail
-------------------------------------------------------------------------------
-MessageTests.cpp:48
+MessageTests.cpp:50
...............................................................................
-MessageTests.cpp:51: FAILED:
+MessageTests.cpp:53: FAILED:
explicitly with message:
This is a failure
@@ -2827,10 +2825,10 @@
./failing/message/sections
one
-------------------------------------------------------------------------------
-MessageTests.cpp:56
+MessageTests.cpp:58
...............................................................................
-MessageTests.cpp:58: FAILED:
+MessageTests.cpp:60: FAILED:
explicitly with message:
Message from section one
@@ -2838,10 +2836,10 @@
./failing/message/sections
two
-------------------------------------------------------------------------------
-MessageTests.cpp:61
+MessageTests.cpp:63
...............................................................................
-MessageTests.cpp:63: FAILED:
+MessageTests.cpp:65: FAILED:
explicitly with message:
Message from section two
@@ -2850,7 +2848,7 @@
./succeeding/message/sections/stdout
one
-------------------------------------------------------------------------------
-MessageTests.cpp:69
+MessageTests.cpp:71
...............................................................................
@@ -2861,7 +2859,7 @@
./succeeding/message/sections/stdout
two
-------------------------------------------------------------------------------
-MessageTests.cpp:74
+MessageTests.cpp:76
...............................................................................
@@ -2870,10 +2868,10 @@
-------------------------------------------------------------------------------
./mixed/message/scoped
-------------------------------------------------------------------------------
-MessageTests.cpp:80
+MessageTests.cpp:82
...............................................................................
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2882,7 +2880,7 @@
current counter 0
i := 0
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2891,7 +2889,7 @@
current counter 1
i := 1
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2900,7 +2898,7 @@
current counter 2
i := 2
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2909,7 +2907,7 @@
current counter 3
i := 3
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2918,7 +2916,7 @@
current counter 4
i := 4
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2927,7 +2925,7 @@
current counter 5
i := 5
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2936,7 +2934,7 @@
current counter 6
i := 6
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2945,7 +2943,7 @@
current counter 7
i := 7
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2954,7 +2952,7 @@
current counter 8
i := 8
-MessageTests.cpp:86:
+MessageTests.cpp:88:
PASSED:
REQUIRE( i < 10 )
with expansion:
@@ -2963,7 +2961,7 @@
current counter 9
i := 9
-MessageTests.cpp:86: FAILED:
+MessageTests.cpp:88: FAILED:
REQUIRE( i < 10 )
with expansion:
10 < 10
@@ -2974,10 +2972,10 @@
-------------------------------------------------------------------------------
./succeeding/nofail
-------------------------------------------------------------------------------
-MessageTests.cpp:90
+MessageTests.cpp:92
...............................................................................
-MessageTests.cpp:92:
+MessageTests.cpp:94:
FAILED - but was ok:
CHECK_NOFAIL( 1 == 2 )
@@ -2987,7 +2985,7 @@
-------------------------------------------------------------------------------
just info
-------------------------------------------------------------------------------
-MessageTests.cpp:95
+MessageTests.cpp:97
...............................................................................
@@ -2996,10 +2994,10 @@
-------------------------------------------------------------------------------
just failure
-------------------------------------------------------------------------------
-MessageTests.cpp:99
+MessageTests.cpp:101
...............................................................................
-MessageTests.cpp:101: FAILED:
+MessageTests.cpp:103: FAILED:
explicitly with message:
Previous info should not be seen
@@ -6505,29 +6503,29 @@
</testcase>
<testcase classname="global" name="./mixed/message/info/2" time="tbd">
<info type="INFO">
-MessageTests.cpp:35
+MessageTests.cpp:37
</info>
<failure message="2 == 1" type="CHECK">
-MessageTests.cpp:37
+MessageTests.cpp:39
</failure>
<info type="INFO">
-MessageTests.cpp:39
+MessageTests.cpp:41
</info>
<failure message="2 == 0" type="CHECK">
-MessageTests.cpp:41
+MessageTests.cpp:43
</failure>
</testcase>
<testcase classname="global" name="./failing/message/fail" time="tbd">
<failure type="FAIL">
-MessageTests.cpp:51
+MessageTests.cpp:53
</failure>
</testcase>
<testcase classname="global" name="./failing/message/sections" time="tbd">
<failure type="FAIL">
-MessageTests.cpp:58
+MessageTests.cpp:60
</failure>
<failure type="FAIL">
-MessageTests.cpp:63
+MessageTests.cpp:65
</failure>
</testcase>
<testcase classname="global" name="./succeeding/message/sections/stdout" time="tbd">
@@ -6537,25 +6535,25 @@
</system-out>
</testcase>
<testcase classname="global" name="./mixed/message/scoped" time="tbd">
- <info type="SCOPED_INFO">
-MessageTests.cpp:84
+ <info type="INFO">
+MessageTests.cpp:86
</info>
- <info type="SCOPED_CAPTURE">
-MessageTests.cpp:85
+ <info type="CAPTURE">
+MessageTests.cpp:87
</info>
<failure message="10 < 10" type="REQUIRE">
-MessageTests.cpp:86
+MessageTests.cpp:88
</failure>
</testcase>
<testcase classname="global" name="./succeeding/nofail" time="tbd">
<failure message="1 == 2" type="CHECK_NOFAIL">
-MessageTests.cpp:92
+MessageTests.cpp:94
</failure>
</testcase>
<testcase classname="global" name="just info" time="tbd"/>
<testcase classname="global" name="just failure" time="tbd">
<failure type="FAIL">
-MessageTests.cpp:101
+MessageTests.cpp:103
</failure>
</testcase>
<testcase classname="global" name="./succeeding/Misc/Sections" time="tbd"/>
@@ -9471,7 +9469,7 @@
<OverallResult success="false"/>
</TestCase>
<TestCase name="./mixed/message/info/2">
-MessageTests.cpp" line="33">
+MessageTests.cpp" line="35">
<Original>
a == 2
</Original>
@@ -9482,7 +9480,7 @@
<Info>
this message should be logged
</Info>
-MessageTests.cpp" line="37">
+MessageTests.cpp" line="39">
<Original>
a == 1
</Original>
@@ -9493,7 +9491,7 @@
<Info>
and this, but later
</Info>
-MessageTests.cpp" line="41">
+MessageTests.cpp" line="43">
<Original>
a == 0
</Original>
@@ -9501,7 +9499,7 @@
2 == 0
</Expanded>
</Expression>
-MessageTests.cpp" line="45">
+MessageTests.cpp" line="47">
<Original>
a == 2
</Original>
@@ -9542,7 +9540,7 @@
<OverallResult success="true"/>
</TestCase>
<TestCase name="./mixed/message/scoped">
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9550,7 +9548,7 @@
0 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9558,7 +9556,7 @@
1 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9566,7 +9564,7 @@
2 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9574,7 +9572,7 @@
3 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9582,7 +9580,7 @@
4 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9590,7 +9588,7 @@
5 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9598,7 +9596,7 @@
6 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9606,7 +9604,7 @@
7 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9614,7 +9612,7 @@
8 < 10
</Expanded>
</Expression>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9628,7 +9626,7 @@
<Info>
i := 10
</Info>
-MessageTests.cpp" line="86">
+MessageTests.cpp" line="88">
<Original>
i < 10
</Original>
@@ -9639,7 +9637,7 @@
<OverallResult success="false"/>
</TestCase>
<TestCase name="./succeeding/nofail">
-MessageTests.cpp" line="92">
+MessageTests.cpp" line="94">
<Original>
1 == 2
</Original>
@@ -13157,25 +13155,25 @@
[Finished: './failing/message/info/1' 1 test case failed (1 assertion failed)]
[Running: ./mixed/message/info/2]
-MessageTests.cpp:33: a == 2 succeeded for: 2 == 2
-MessageTests.cpp:35: [info: this message should be logged]
-MessageTests.cpp:37: a == 1 failed for: 2 == 1
-MessageTests.cpp:39: [info: and this, but later]
-MessageTests.cpp:41: a == 0 failed for: 2 == 0
-MessageTests.cpp:45: a == 2 succeeded for: 2 == 2
+MessageTests.cpp:35: a == 2 succeeded for: 2 == 2
+MessageTests.cpp:37: [info: this message should be logged]
+MessageTests.cpp:39: a == 1 failed for: 2 == 1
+MessageTests.cpp:41: [info: and this, but later]
+MessageTests.cpp:43: a == 0 failed for: 2 == 0
+MessageTests.cpp:47: a == 2 succeeded for: 2 == 2
[Finished: './mixed/message/info/2' 1 test case failed (2 of 4 assertions failed)]
[Running: ./failing/message/fail]
-MessageTests.cpp:51: failed with message: 'This is a failure'
+MessageTests.cpp:53: failed with message: 'This is a failure'
[Finished: './failing/message/fail' 1 test case failed (1 assertion failed)]
[Running: ./failing/message/sections]
[Started section: 'one']
-MessageTests.cpp:58: failed with message: 'Message from section one'
+MessageTests.cpp:60: failed with message: 'Message from section one'
[End of section: 'one' 1 assertion failed]
[Started section: 'two']
-MessageTests.cpp:63: failed with message: 'Message from section two'
+MessageTests.cpp:65: failed with message: 'Message from section two'
[End of section: 'two' 1 assertion failed]
[Finished: './failing/message/sections' 1 test case failed (All 2 assertions failed)]
@@ -13198,23 +13196,23 @@
[Finished: './succeeding/message/sections/stdout' 1 test case failed (All 2 assertions failed)]
[Running: ./mixed/message/scoped]
-MessageTests.cpp:86: i < 10 succeeded for: 0 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 1 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 2 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 3 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 4 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 5 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 6 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 7 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 8 < 10
-MessageTests.cpp:86: i < 10 succeeded for: 9 < 10
-MessageTests.cpp:84: [info: current counter 10]
-MessageTests.cpp:85: [info: i := 10]
-MessageTests.cpp:86: i < 10 failed for: 10 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 0 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 1 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 2 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 3 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 4 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 5 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 6 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 7 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 8 < 10
+MessageTests.cpp:88: i < 10 succeeded for: 9 < 10
+MessageTests.cpp:86: [info: current counter 10]
+MessageTests.cpp:87: [info: i := 10]
+MessageTests.cpp:88: i < 10 failed for: 10 < 10
[Finished: './mixed/message/scoped' 1 test case failed (1 of 11 assertions failed)]
[Running: ./succeeding/nofail]
-MessageTests.cpp:92: 1 == 2 failed - but was ok
+MessageTests.cpp:94: 1 == 2 failed - but was ok
No assertions in test case, './succeeding/nofail'
@@ -13227,7 +13225,7 @@
[Finished: 'just info' 1 test case failed (1 assertion failed)]
[Running: just failure]
-MessageTests.cpp:101: failed with message: 'Previous info should not be seen'
+MessageTests.cpp:103: failed with message: 'Previous info should not be seen'
[Finished: 'just failure' 1 test case failed (1 assertion failed)]
[Running: ./succeeding/Misc/Sections]
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index e7be4ff..778985c 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
/*
* CATCH v1.0 build 1 (master branch)
- * Generated: 2013-06-28 14:07:23.869597
+ * Generated: 2013-06-28 17:08:06.313616
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -1294,29 +1294,29 @@
static unsigned int globalCount;
};
- class MessageBuilder : public MessageInfo {
- public:
- MessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type );
-
- MessageInfo build() const;
+ struct MessageBuilder {
+ MessageBuilder( std::string const& macroName,
+ SourceLineInfo const& lineInfo,
+ ResultWas::OfType type )
+ : m_info( macroName, lineInfo, type )
+ {}
template<typename T>
- MessageBuilder& operator << ( T const& _value ) {
- stream << _value;
+ MessageBuilder& operator << ( T const& value ) {
+ m_stream << value;
return *this;
}
- private:
- std::ostringstream stream;
+
+ MessageInfo m_info;
+ std::ostringstream m_stream;
};
- class ScopedMessageBuilder : public MessageBuilder {
+ class ScopedMessage {
public:
- ScopedMessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type );
- ~ScopedMessageBuilder();
+ ScopedMessage( MessageBuilder const& builder );
+ ~ScopedMessage();
+
+ MessageInfo m_info;
};
} // end namespace Catch
@@ -1392,7 +1392,7 @@
class AssertionResult;
struct AssertionInfo;
struct SectionInfo;
- class MessageBuilder;
+ struct MessageInfo;
class ScopedMessageBuilder;
struct IResultCapture {
@@ -1403,12 +1403,11 @@
virtual bool sectionStarted( SectionInfo const& sectionInfo,
Counts& assertions ) = 0;
virtual void sectionEnded( SectionInfo const& name, Counts const& assertions ) = 0;
- virtual void pushScopedMessage( ScopedMessageBuilder const& _builder ) = 0;
- virtual void popScopedMessage( ScopedMessageBuilder const& _builder ) = 0;
+ virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+ virtual void popScopedMessage( MessageInfo const& message ) = 0;
virtual bool shouldDebugBreak() const = 0;
- virtual void acceptMessage( MessageBuilder const& messageBuilder ) = 0;
virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) = 0;
virtual std::string getCurrentTestName() const = 0;
@@ -2358,7 +2357,9 @@
// !TBD This should have been done earlier, somewhere
MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
builder << assertionResult.getMessage();
- infoMessages.push_back( builder.build() );
+ builder.m_info.message = builder.m_stream.str();
+
+ infoMessages.push_back( builder.m_info );
}
}
virtual ~AssertionStats();
@@ -2464,7 +2465,7 @@
virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
- virtual void assertionEnded( AssertionStats const& assertionStats ) = 0;
+ virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
@@ -2748,12 +2749,6 @@
} while( Catch::isTrue( false ) )
///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( log, macroName ) \
- do { \
- Catch::getResultCapture().acceptMessage( Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log ); \
- } while( Catch::isTrue( false ) )
-
-///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_MSG( log, messageType, resultDisposition, macroName ) \
do { \
INTERNAL_CATCH_ACCEPT_INFO( "", macroName, resultDisposition ); \
@@ -2761,10 +2756,8 @@
} while( Catch::isTrue( false ) )
///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_SCOPED_INFO( log, macroName ) \
- Catch::ScopedMessageBuilder INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ); \
- INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) << log; \
- Catch::getResultCapture().pushScopedMessage( INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) )
+#define INTERNAL_CATCH_INFO( log, macroName ) \
+ Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CHECK_THAT( arg, matcher, resultDisposition, macroName ) \
@@ -4889,10 +4882,6 @@
private: // IResultCapture
- virtual void acceptMessage( MessageBuilder const& messageBuilder ) {
- m_messages.push_back( messageBuilder.build() );
- }
-
virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) {
m_lastAssertionInfo = assertionInfo;
return actOnCurrentResult( assertionResult.buildResult( assertionInfo ) );
@@ -4906,11 +4895,11 @@
m_totals.assertions.failed++;
}
- m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) );
+ if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) )
+ m_messages.clear();
// Reset working state
m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
- m_messages.clear();
}
virtual bool sectionStarted (
@@ -4955,12 +4944,12 @@
m_messages.clear();
}
- virtual void pushScopedMessage( ScopedMessageBuilder const& _builder ) {
- m_messages.push_back( _builder.build() );
+ virtual void pushScopedMessage( MessageInfo const& message ) {
+ m_messages.push_back( message );
}
- virtual void popScopedMessage( ScopedMessageBuilder const& _builder ) {
- m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), _builder ), m_messages.end() );
+ virtual void popScopedMessage( MessageInfo const& message ) {
+ m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() );
}
virtual bool shouldDebugBreak() const {
@@ -6125,7 +6114,7 @@
bool isHidden( startsWith( _name, "./" ) );
std::set<std::string> tags;
TagExtracter( tags ).parse( desc );
- if( tags.find( "hide" ) != tags.end() )
+ if( tags.find( "hide" ) != tags.end() || tags.find( "." ) != tags.end() )
isHidden = true;
TestCaseInfo info( _name, _className, desc, tags, isHidden, _lineInfo );
@@ -6336,29 +6325,14 @@
////////////////////////////////////////////////////////////////////////////
- MessageBuilder::MessageBuilder( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type )
- : MessageInfo( _macroName, _lineInfo, _type )
- {}
-
- MessageInfo MessageBuilder::build() const {
- MessageInfo message = *this;
- message.message = stream.str();
- return message;
+ ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+ : m_info( builder.m_info )
+ {
+ m_info.message = builder.m_stream.str();
+ getResultCapture().pushScopedMessage( m_info );
}
-
- ////////////////////////////////////////////////////////////////////////////
-
- ScopedMessageBuilder::ScopedMessageBuilder
- ( std::string const& _macroName,
- SourceLineInfo const& _lineInfo,
- ResultWas::OfType _type )
- : MessageBuilder( _macroName, _lineInfo, _type )
- {}
-
- ScopedMessageBuilder::~ScopedMessageBuilder() {
- getResultCapture().popScopedMessage( *this );
+ ScopedMessage::~ScopedMessage() {
+ getResultCapture().popScopedMessage( m_info );
}
} // end namespace Catch
@@ -6384,7 +6358,7 @@
virtual void testCaseStarting( TestCaseInfo const& testInfo );
virtual void sectionStarting( SectionInfo const& sectionInfo );
virtual void assertionStarting( AssertionInfo const& );
- virtual void assertionEnded( AssertionStats const& assertionStats );
+ virtual bool assertionEnded( AssertionStats const& assertionStats );
virtual void sectionEnded( SectionStats const& sectionStats );
virtual void testCaseEnded( TestCaseStats const& testCaseStats );
virtual void testGroupEnded( TestGroupStats const& testGroupStats );
@@ -6425,7 +6399,7 @@
// Not on legacy interface
}
- void LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) {
+ bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) {
if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
it != itEnd;
@@ -6440,6 +6414,7 @@
}
}
m_legacyReporter->Result( assertionStats.assertionResult );
+ return true;
}
void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) {
if( sectionStats.missingAssertions )
@@ -7472,18 +7447,19 @@
virtual void assertionStarting( AssertionInfo const& ) {
}
- virtual void assertionEnded( AssertionStats const& _assertionStats ) {
+ virtual bool assertionEnded( AssertionStats const& _assertionStats ) {
AssertionResult const& result = _assertionStats.assertionResult;
// Drop out if result was successful and we're not printing those
if( !m_config->includeSuccessfulResults() && result.isOk() )
- return;
+ return false;
lazyPrint();
AssertionPrinter printer( stream, _assertionStats );
printer.print();
stream << std::endl;
+ return true;
}
virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
@@ -7948,9 +7924,9 @@
#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "CATCH_WARN" )
#define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL" )
#define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED" )
-#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_SCOPED_INFO( msg, "CATCH_SCOPED_INFO" )
+#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_SCOPED_INFO( #msg " := " << msg, "CATCH_SCOPED_CAPTURE" )
+#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
#ifdef CATCH_CONFIG_VARIADIC_MACROS
#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
@@ -8009,9 +7985,9 @@
#define WARN( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "WARN" )
#define FAIL( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL" )
#define SUCCEED( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED" )
-#define SCOPED_INFO( msg ) INTERNAL_CATCH_SCOPED_INFO( msg, "SCOPED_INFO" )
+#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
#define CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
-#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_SCOPED_INFO( #msg " := " << msg, "SCOPED_CAPTURE" )
+#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
#ifdef CATCH_CONFIG_VARIADIC_MACROS
#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )