Exception message assertions now work with matchers

This commit is contained in:
Phil Nash
2015-07-15 23:02:25 +01:00
parent 8342ae8dfb
commit 72868920bb
13 changed files with 116 additions and 92 deletions

View File

@@ -1611,10 +1611,10 @@
<Section name="different case">
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;expecteD Exception&quot;
thisThrows(), Equals( &quot;expecteD Exception&quot;, Catch::CaseSensitive::No )
</Original>
<Expanded>
thisThrows(), &quot;expecteD Exception&quot;
thisThrows(), Equals( &quot;expecteD Exception&quot;, Catch::CaseSensitive::No )
</Expanded>
</Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -1622,34 +1622,34 @@
<Section name="wildcarded">
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;expected*&quot;
thisThrows(), StartsWith( &quot;expected&quot; )
</Original>
<Expanded>
thisThrows(), &quot;expected*&quot;
thisThrows(), StartsWith( &quot;expected&quot; )
</Expanded>
</Expression>
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;*exception&quot;
thisThrows(), EndsWith( &quot;exception&quot; )
</Original>
<Expanded>
thisThrows(), &quot;*exception&quot;
thisThrows(), EndsWith( &quot;exception&quot; )
</Expanded>
</Expression>
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;*except*&quot;
thisThrows(), Contains( &quot;except&quot; )
</Original>
<Expanded>
thisThrows(), &quot;*except*&quot;
thisThrows(), Contains( &quot;except&quot; )
</Expanded>
</Expression>
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;*exCept*&quot;
thisThrows(), Contains( &quot;exCept&quot;, Catch::CaseSensitive::No )
</Original>
<Expanded>
thisThrows(), &quot;*exCept*&quot;
thisThrows(), Contains( &quot;exCept&quot;, Catch::CaseSensitive::No )
</Expanded>
</Expression>
<OverallResults successes="4" failures="0" expectedFailures="0"/>
@@ -1657,14 +1657,6 @@
<OverallResult success="true"/>
</TestCase>
<TestCase name="Mismatching exception messages failing the test">
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;expected exception&quot;
</Original>
<Expanded>
thisThrows(), &quot;expected exception&quot;
</Expanded>
</Expression>
<Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
<Original>
thisThrows(), &quot;expected exception&quot;
@@ -8307,7 +8299,7 @@ there&quot;
</Section>
<OverallResult success="true"/>
</TestCase>
<OverallResults successes="681" failures="100" expectedFailures="13"/>
<OverallResults successes="680" failures="100" expectedFailures="13"/>
</Group>
<OverallResults successes="681" failures="100" expectedFailures="13"/>
<OverallResults successes="680" failures="100" expectedFailures="13"/>
</Catch>