Added approvals for “failed as expected” tests

projects/SelfTest/Baselines/console.std.approved.txt

@@ -3,6 +3,19 @@
 <exe-name> is a <version> host application.
 Run with -? for options
 
+-------------------------------------------------------------------------------
+#748 - captures with unexpected exceptions
+  inside REQUIRE_NOTHROW
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_NOTHROW( thisThrows() )
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
+
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
@@ -102,17 +115,6 @@ TrickyTests.cpp:<line number>: FAILED:
 with expansion:
   {?} == {?}
 
--------------------------------------------------------------------------------
-An unchecked exception reports the line of the last assertion
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-  {Unknown expression after the reported line}
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 Contains string matcher
 -------------------------------------------------------------------------------
@@ -146,16 +148,6 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception - not std
 
--------------------------------------------------------------------------------
-Custom std-exceptions can be custom translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom std exception
-
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
@@ -421,16 +413,6 @@ MiscTests.cpp:<line number>:
 warning:
   This one ran
 
--------------------------------------------------------------------------------
-Non-std exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom exception
-
 -------------------------------------------------------------------------------
 Ordering comparison checks that should fail
 -------------------------------------------------------------------------------
@@ -617,16 +599,6 @@ with expansion:
   }
   "
 
--------------------------------------------------------------------------------
-Unexpected exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  3.14
-
 -------------------------------------------------------------------------------
 Vector matchers that fail
   Contains (element)
@@ -688,16 +660,6 @@ MatchersTests.cpp:<line number>: FAILED:
 with expansion:
   { 1, 2, 3 } Equals: {  }
 
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown directly they are always failures
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
@@ -732,17 +694,6 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   expected exception
 
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown from sections they are always failures
-  section name
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
@@ -915,6 +866,6 @@ with expansion:
   "first" == "second"
 
 ===============================================================================
-test cases: 166 | 119 passed | 44 failed |  3 failed as expected
+test cases: 167 | 125 passed | 38 failed |  4 failed as expected
-assertions: 961 | 855 passed | 87 failed | 19 failed as expected
+assertions: 960 | 859 passed | 81 failed | 20 failed as expected
 

projects/SelfTest/Baselines/console.sw.approved.txt

@@ -15,26 +15,30 @@ with message:
   yay
 
 -------------------------------------------------------------------------------
-#542
+#748 - captures with unexpected exceptions
+  inside REQUIRE_NOTHROW
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>: FAILED:
-PASSED:
+  REQUIRE_NOTHROW( thisThrows() )
-  CHECK_THROWS_AS( throws_int(true), int )
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
 
-CompilationTests.cpp:<line number>:
+-------------------------------------------------------------------------------
-PASSED:
+#748 - captures with unexpected exceptions
-  CHECK_THROWS_AS( throws_int(true), int& )
+  inside REQUIRE_THROWS
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
 
-CompilationTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  CHECK_THROWS_AS( throws_int(true), const int )
+  REQUIRE_THROWS( thisThrows() )
-
+with message:
-CompilationTests.cpp:<line number>:
+  answer := 42
-PASSED:
-  CHECK_THROWS_AS( throws_int(true), const int& )
 
 -------------------------------------------------------------------------------
 #809
@@ -48,6 +52,48 @@ PASSED:
 with expansion:
   42 == {?}
 
+-------------------------------------------------------------------------------
+#833
+-------------------------------------------------------------------------------
+CompilationTests.cpp:<line number>
+...............................................................................
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a == t )
+with expansion:
+  3 == 3
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  CHECK( a == t )
+with expansion:
+  3 == 3
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( throws_int(true) )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  CHECK_THROWS_AS( throws_int(true), const int& )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_NOTHROW( throws_int(false) )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") )
+with expansion:
+  "aaa" ends with: "aaa"
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE( templated_tests<int>(3) )
+with expansion:
+  true
+
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
@@ -398,11 +444,6 @@ ExceptionTests.cpp:<line number>:
 PASSED:
   CHECK( 1 == 1 )
 
-ExceptionTests.cpp:<line number>: FAILED:
-  {Unknown expression after the reported line}
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 Anonymous test case 1
 -------------------------------------------------------------------------------
@@ -957,16 +998,6 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception - not std
 
--------------------------------------------------------------------------------
-Custom std-exceptions can be custom translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom std exception
-
 -------------------------------------------------------------------------------
 Demonstrate that a non-const == is not used
 -------------------------------------------------------------------------------
@@ -4477,16 +4508,6 @@ MiscTests.cpp:<line number>:
 warning:
   This one ran
 
--------------------------------------------------------------------------------
-Non-std exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom exception
-
 -------------------------------------------------------------------------------
 NotImplemented exception
 -------------------------------------------------------------------------------
@@ -6807,7 +6828,8 @@ PASSED:
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   	First seen at file:2
-  	Redefined at file:10" contains: "[@zzz]"
+  	Redefined at file:10
+  " contains: "[@zzz]"
 
 TagAliasTests.cpp:<line number>:
 PASSED:
@@ -6815,7 +6837,8 @@ PASSED:
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   	First seen at file:2
-  	Redefined at file:10" contains: "file"
+  	Redefined at file:10
+  " contains: "file"
 
 TagAliasTests.cpp:<line number>:
 PASSED:
@@ -6823,7 +6846,8 @@ PASSED:
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   	First seen at file:2
-  	Redefined at file:10" contains: "2"
+  	Redefined at file:10
+  " contains: "2"
 
 TagAliasTests.cpp:<line number>:
 PASSED:
@@ -6831,7 +6855,8 @@ PASSED:
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   	First seen at file:2
-  	Redefined at file:10" contains: "10"
+  	Redefined at file:10
+  " contains: "10"
 
 -------------------------------------------------------------------------------
 Tag alias can be registered against tag patterns
@@ -7920,16 +7945,6 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-Unexpected exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  3.14
-
 -------------------------------------------------------------------------------
 Use a custom approx
 -------------------------------------------------------------------------------
@@ -8150,16 +8165,6 @@ ExceptionTests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown directly they are always failures
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
@@ -8194,17 +8199,6 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   expected exception
 
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown from sections they are always failures
-  section name
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
@@ -9404,6 +9398,6 @@ MiscTests.cpp:<line number>:
 PASSED:
 
 ===============================================================================
-test cases: 166 | 118 passed | 45 failed |  3 failed as expected
+test cases: 167 | 124 passed | 39 failed |  4 failed as expected
-assertions: 963 | 855 passed | 89 failed | 19 failed as expected
+assertions: 962 | 859 passed | 83 failed | 20 failed as expected
 

projects/SelfTest/Baselines/console.swa4.approved.txt

@@ -15,26 +15,30 @@ with message:
   yay
 
 -------------------------------------------------------------------------------
-#542
+#748 - captures with unexpected exceptions
+  inside REQUIRE_NOTHROW
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>: FAILED:
-PASSED:
+  REQUIRE_NOTHROW( thisThrows() )
-  CHECK_THROWS_AS( throws_int(true), int )
+due to unexpected exception with messages:
+  answer := 42
+  expected exception
 
-CompilationTests.cpp:<line number>:
+-------------------------------------------------------------------------------
-PASSED:
+#748 - captures with unexpected exceptions
-  CHECK_THROWS_AS( throws_int(true), int& )
+  inside REQUIRE_THROWS
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
 
-CompilationTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  CHECK_THROWS_AS( throws_int(true), const int )
+  REQUIRE_THROWS( thisThrows() )
-
+with message:
-CompilationTests.cpp:<line number>:
+  answer := 42
-PASSED:
-  CHECK_THROWS_AS( throws_int(true), const int& )
 
 -------------------------------------------------------------------------------
 #809
@@ -48,6 +52,48 @@ PASSED:
 with expansion:
   42 == {?}
 
+-------------------------------------------------------------------------------
+#833
+-------------------------------------------------------------------------------
+CompilationTests.cpp:<line number>
+...............................................................................
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a == t )
+with expansion:
+  3 == 3
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  CHECK( a == t )
+with expansion:
+  3 == 3
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( throws_int(true) )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  CHECK_THROWS_AS( throws_int(true), const int& )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_NOTHROW( throws_int(false) )
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") )
+with expansion:
+  "aaa" ends with: "aaa"
+
+CompilationTests.cpp:<line number>:
+PASSED:
+  REQUIRE( templated_tests<int>(3) )
+with expansion:
+  true
+
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
@@ -86,6 +132,6 @@ ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 
 ===============================================================================
-test cases:  5 | 3 passed | 1 failed | 1 failed as expected
+test cases:  6 |  3 passed | 1 failed | 2 failed as expected
-assertions: 12 | 7 passed | 4 failed | 1 failed as expected
+assertions: 17 | 11 passed | 4 failed | 2 failed as expected
 

projects/SelfTest/Baselines/junit.sw.approved.txt

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesspanner>
-  <testsuite name="<exe-name>" errors="13" failures="77" tests="964" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="8" failures="76" tests="963" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
-    <testcase classname="global" name="#542" time="{duration}"/>
+    <testcase classname="#748 - captures with unexpected exceptions" name="inside REQUIRE_NOTHROW" time="{duration}">
+      <error message="thisThrows()" type="REQUIRE_NOTHROW">
+expected exception
+answer := 42
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="#748 - captures with unexpected exceptions" name="inside REQUIRE_THROWS" time="{duration}"/>
     <testcase classname="global" name="#809" time="{duration}"/>
+    <testcase classname="global" name="#833" time="{duration}"/>
     <testcase classname="global" name="#835 -- errno should not be touched by Catch" time="{duration}">
       <failure message="1 == 0" type="CHECK">
 MiscTests.cpp:<line number>
@@ -71,12 +79,7 @@ TrickyTests.cpp:<line number>
     <testcase classname="global" name="Absolute margin" time="{duration}"/>
     <testcase classname="global" name="AllOf matcher" time="{duration}"/>
     <testcase classname="global" name="An expression with side-effects should only be evaluated once" time="{duration}"/>
-    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}">
+    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}"/>
-      <error message="{Unknown expression after the reported line}">
-unexpected exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
     <testcase classname="global" name="Anonymous test case 1" time="{duration}"/>
     <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
     <testcase classname="global" name="Approximate PI" time="{duration}"/>
@@ -112,12 +115,6 @@ ExceptionTests.cpp:<line number>
     <testcase classname="global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}">
       <error message="throwCustom(), std::exception" type="REQUIRE_THROWS_AS">
 custom exception - not std
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="global" name="Custom std-exceptions can be custom translated" time="{duration}">
-      <error type="TEST_CASE">
-custom std exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
@@ -285,12 +282,6 @@ ExceptionTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="Nice descriptive name" time="{duration}"/>
-    <testcase classname="global" name="Non-std exceptions can be translated" time="{duration}">
-      <error type="TEST_CASE">
-custom exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
     <testcase classname="global" name="NotImplemented exception" time="{duration}"/>
     <testcase classname="global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}"/>
     <testcase classname="global" name="Operators at different namespace levels not hijacked by Koenig lookup" time="{duration}"/>
@@ -506,12 +497,6 @@ MiscTests.cpp:<line number>
     <testcase classname="Tracker" name="start a generator/Start a new inner section/Re-enter for second generation" time="{duration}"/>
     <testcase classname="Tracker" name="start a generator/Fail an inner section" time="{duration}"/>
     <testcase classname="Tracker" name="start a generator/Fail an inner section/Re-enter for second generation" time="{duration}"/>
-    <testcase classname="global" name="Unexpected exceptions can be translated" time="{duration}">
-      <error type="TEST_CASE">
-3.14
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
     <testcase classname="global" name="Use a custom approx" time="{duration}"/>
     <testcase classname="Variadic macros" name="Section with one argument" time="{duration}"/>
     <testcase classname="Vector matchers" name="Contains (element)" time="{duration}"/>
@@ -548,12 +533,6 @@ MatchersTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}"/>
-    <testcase classname="global" name="When unchecked exceptions are thrown directly they are always failures" time="{duration}">
-      <error type="TEST_CASE">
-unexpected exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
     <testcase classname="global" name="When unchecked exceptions are thrown during a CHECK the test should continue" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
@@ -569,12 +548,6 @@ ExceptionTests.cpp:<line number>
     <testcase classname="global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="When unchecked exceptions are thrown from sections they are always failures" name="section name" time="{duration}">
-      <error type="TEST_CASE">
-unexpected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -4,39 +4,41 @@
     <TestCase name="# A test name that starts with a #" filename="projects/<exe-name>/MiscTests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#542" filename="projects/<exe-name>/CompilationTests.cpp" >
+    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/CompilationTests.cpp" >
+      <Section name="outside assertions" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <Original>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
-          throws_int(true), int
+      </Section>
-        </Original>
+      <Section name="inside REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <Expanded>
+        <Info>
-          throws_int(true), int
+          answer := 42
-        </Expanded>
+        </Info>
-      </Expression>
+        <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/CompilationTests.cpp" >
+          <Original>
-        <Original>
+            thisThrows()
-          throws_int(true), int&amp;
+          </Original>
-        </Original>
+          <Expanded>
-        <Expanded>
+            thisThrows()
-          throws_int(true), int&amp;
+          </Expanded>
-        </Expanded>
+          <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
-      </Expression>
+            expected exception
-      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/CompilationTests.cpp" >
+          </Exception>
-        <Original>
+        </Expression>
-          throws_int(true), const int
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
-        </Original>
+      </Section>
-        <Expanded>
+      <Section name="inside REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
-          throws_int(true), const int
+        <Info>
-        </Expanded>
+          answer := 42
-      </Expression>
+        </Info>
-      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <Original>
+          <Original>
-          throws_int(true), const int&amp;
+            thisThrows()
-        </Original>
+          </Original>
-        <Expanded>
+          <Expanded>
-          throws_int(true), const int&amp;
+            thisThrows()
-        </Expanded>
+          </Expanded>
-      </Expression>
+        </Expression>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="#809" filename="projects/<exe-name>/CompilationTests.cpp" >
@@ -50,6 +52,65 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="#833" filename="projects/<exe-name>/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          a == t
+        </Original>
+        <Expanded>
+          3 == 3
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          a == t
+        </Original>
+        <Expanded>
+          3 == 3
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          throws_int(true)
+        </Original>
+        <Expanded>
+          throws_int(true)
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          throws_int(true), const int&amp;
+        </Original>
+        <Expanded>
+          throws_int(true), const int&amp;
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          throws_int(false)
+        </Original>
+        <Expanded>
+          throws_int(false)
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          "aaa", Catch::EndsWith("aaa")
+        </Original>
+        <Expanded>
+          "aaa" ends with: "aaa"
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/CompilationTests.cpp" >
+        <Original>
+          templated_tests&lt;int>(3)
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail]" filename="projects/<exe-name>/MiscTests.cpp" >
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
@@ -445,18 +506,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" filename="projects/<exe-name>/ExceptionTests.cpp" >
+      <OverallResult success="true"/>
-        <Original>
-          {Unknown expression after the reported line}
-        </Original>
-        <Expanded>
-          {Unknown expression after the reported line}
-        </Expanded>
-        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
-          unexpected exception
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Anonymous test case 1" filename="projects/<exe-name>/VariadicMacrosTests.cpp" >
       <OverallResult success="true"/>
@@ -1060,10 +1110,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Custom std-exceptions can be custom translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+      <OverallResult success="true"/>
-        custom std exception
-      </Exception>
-      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Demonstrate that a non-const == is not used" tags="[Tricky]" filename="projects/<exe-name>/TrickyTests.cpp" >
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
@@ -4588,10 +4635,7 @@ re>"
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Non-std exceptions can be translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+      <OverallResult success="true"/>
-        custom exception
-      </Exception>
-      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="NotImplemented exception" tags="[!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
       <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
@@ -7308,7 +7352,8 @@ hello
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
 	First seen at file:2
-	Redefined at file:10" contains: "[@zzz]"
+	Redefined at file:10
+" contains: "[@zzz]"
           </Expanded>
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@@ -7318,7 +7363,8 @@ hello
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
 	First seen at file:2
-	Redefined at file:10" contains: "file"
+	Redefined at file:10
+" contains: "file"
           </Expanded>
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@@ -7328,7 +7374,8 @@ hello
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
 	First seen at file:2
-	Redefined at file:10" contains: "2"
+	Redefined at file:10
+" contains: "2"
           </Expanded>
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@@ -7338,7 +7385,8 @@ hello
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
 	First seen at file:2
-	Redefined at file:10" contains: "10"
+	Redefined at file:10
+" contains: "10"
           </Expanded>
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
@@ -8538,10 +8586,7 @@ there"
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Unexpected exceptions can be translated" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+      <OverallResult success="true"/>
-        3.14
-      </Exception>
-      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Use a custom approx" tags="[Approx][custom]" filename="projects/<exe-name>/ApproxTests.cpp" >
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
@@ -8804,10 +8849,7 @@ there"
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown directly they are always failures" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+      <OverallResult success="true"/>
-        unexpected exception
-      </Exception>
-      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
@@ -8853,12 +8895,9 @@ there"
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown from sections they are always failures" tags="[!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
       <Section name="section name" filename="projects/<exe-name>/ExceptionTests.cpp" >
-        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
-          unexpected exception
-        </Exception>
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" tags="[!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
       <OverallResult success="true"/>
@@ -10043,7 +10082,7 @@ spanner      <OverallResult success="true"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="855" failures="90" expectedFailures="19"/>
+    <OverallResults successes="859" failures="84" expectedFailures="20"/>
   </Group>
-  <OverallResults successes="855" failures="89" expectedFailures="19"/>
+  <OverallResults successes="859" failures="83" expectedFailures="20"/>
 </Catch>