Big assertion capture refactoring.

- moved as much logic out of the macros as possible
- moved most logic into new ResultBuilder class, which wraps ExpressionResultBuilder (may take it over next), subsumes ResultAction and also takes place of ExpressionDecomposer.

This introduces many SRP violations - but all in the name of minimising macro logic!
This commit is contained in:
Phil Nash
2014-05-28 18:53:01 +01:00
parent 14796814b8
commit 9438a03d5b
26 changed files with 312 additions and 260 deletions

View File

@@ -5683,7 +5683,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true
@@ -5696,7 +5696,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true
@@ -5710,7 +5710,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true
@@ -5722,7 +5722,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true
@@ -5735,7 +5735,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true
@@ -5749,7 +5749,7 @@ TrickyTests.cpp:<line number>
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( Catch::isTrue( true ) )
REQUIRE( Catch::alwaysTrue() )
with expansion:
true

View File

@@ -5849,7 +5849,7 @@ there&quot;
<TestCase name="Assertions then sections">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true
@@ -5858,7 +5858,7 @@ there&quot;
<Section name="A section">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true
@@ -5867,7 +5867,7 @@ there&quot;
<Section name="Another section">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true
@@ -5879,7 +5879,7 @@ there&quot;
</Section>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true
@@ -5888,7 +5888,7 @@ there&quot;
<Section name="A section">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true
@@ -5897,7 +5897,7 @@ there&quot;
<Section name="Another other section">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
Catch::isTrue( true )
Catch::alwaysTrue()
</Original>
<Expanded>
true