build 33

README.md

@@ -1,6 +1,6 @@
 ![catch logo](https://raw.github.com/philsquared/Catch/Integration/catch-logo-small.png)
 
-## CATCH v0.9 build 32 (integration branch)
+## CATCH v0.9 build 33 (integration branch)
 An automated test framework for C, C++ and Objective-C.
 
 This branch may contain code that is experimental or not yet fully tested.

include/internal/catch_version.hpp

@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 0, 9, 32, "integration" );
+    Version libraryVersion( 0, 9, 33, "integration" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

projects/SelfTest/Baselines/approvedResults.txt

@@ -1,6 +1,6 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a CATCH v0.9 b32 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b33 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
@@ -5452,7 +5452,7 @@ with message:
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a CATCH v0.9 b32 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b33 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------

projects/SelfTest/TrickyTests.cpp

@@ -336,3 +336,15 @@ TEST_CASE( "Assertions then sections", "" )
         }
     }
 }
+
+class Awkward
+{
+    operator int() const { return 7; }
+};
+
+//TEST_CASE( "non streamable", "" )
+//{
+//    Awkward awkward;
+//    std::string s = Catch::toString( awkward );
+//    REQUIRE( s == "{?}" );
+//}

single_include/catch.hpp

@@ -1,6 +1,6 @@
 /*
- *  CATCH v0.9 build 32 (integration branch)
+ *  CATCH v0.9 build 33 (integration branch)
- *  Generated: 2013-04-08 11:50:07.907187
+ *  Generated: 2013-04-11 16:33:19.541792
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -22,7 +22,7 @@
 #endif
 
 // Use variadic macros if the compiler supports them
-#if ( defined _MSC_VER && _MSC_VER >= 1400 && !defined __EDGE__) || \
+#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
     ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
     ( defined __GNUC__ && __GNUC__ >= 3 ) || \
     ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )
@@ -5616,7 +5616,7 @@ namespace {
 
                 case Colour::LightGrey:     return setColour( "[0;37m" );
                 case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;33m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
                 case Colour::BrightWhite:   return setColour( "[1;37m" );
 
                 case Colour::Bright: throw std::logic_error( "not a colour" );
@@ -6018,7 +6018,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 0, 9, 32, "integration" );
+    Version libraryVersion( 0, 9, 33, "integration" );
 }
 
 // #included from: catch_line_wrap.hpp
@@ -6174,7 +6174,7 @@ namespace Catch {
 
 } // end namespace Catch
 
-// #included from: ../reporters/catch_legacy_reporter_adapter.hpp
+// #included from: catch_legacy_reporter_adapter.hpp
 #define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED
 
 // #included from: catch_legacy_reporter_adapter.h
@@ -7150,10 +7150,14 @@ namespace Catch {
                     case ResultWas::Ok:
                         stats.m_element = "success";
                         break;
+                    case ResultWas::DidntThrowException:
+                        stats.m_element = "failure";
+                        m_currentStats->m_failuresCount++;
+                        break;
                     case ResultWas::Unknown:
                     case ResultWas::FailureBit:
                     case ResultWas::Exception:
-                    case ResultWas::DidntThrowException:
+                        stats.m_element = "* internal error *";
                         break;
                 }
                 testCaseStats.m_testStats.push_back( stats );
@@ -7398,18 +7402,10 @@ namespace Catch {
                         if( _stats.infoMessages.size() > 1 )
                             messageLabel = "explicitly with messages";
                         break;
-                    case ResultWas::Exception:
-                        passOrFail = "FAILED";
-                        colour = Colour::Error;
-                        if( _stats.infoMessages.size() == 1 )
-                            messageLabel = "with message";
-                        if( _stats.infoMessages.size() > 1 )
-                            messageLabel = "with messages";
-                        break;
-
                     // These cases are here to prevent compiler warnings
                     case ResultWas::Unknown:
                     case ResultWas::FailureBit:
+                    case ResultWas::Exception:
                         passOrFail = "** internal error **";
                         colour = Colour::Error;
                         break;