Fixed unit tests for windows. Boiled down to not resetting a pointer with the return...

diff --git a/source/opts.c b/source/opts.c
index 9c81f490a9be67a7dbf13d9ba267d7b30bb80198..1fd3314559956ff0d82a2a49e2d2010d007a528c 100644 (file)
--- a/source/opts.c
+++ b/source/opts.c
@@ -173,7 +173,7 @@ char* OPTS_NextToken( StreamContext_T* ctx )
         (void)OPTS_NextCharacter( ctx );
         while( (EOF != ctx->current) && (' ' != ctx->current) )
         {
-            OPTS_AppendCharacter( tok, ctx->current );
+            tok = OPTS_AppendCharacter( tok, ctx->current );
             (void)OPTS_NextCharacter( ctx );
         }
     }
@@ -209,6 +209,7 @@ char OPTS_ConsumeWhitespace( StreamContext_T* ctx )
     }
 }
 
+#include <stdio.h>
 char OPTS_NextCharacter( StreamContext_T* ctx )
 {
     char current = EOF;
@@ -236,7 +237,6 @@ char OPTS_NextCharacter( StreamContext_T* ctx )
             }
         }
     }
-
     return current;
 }
 

diff --git a/tests/test_opts.cpp b/tests/test_opts.cpp
index cd548cd673e14a89cb323d4f1735c54b1a8aea41..77bd33dcbb7d80976db59b269e394d995b362dfd 100644 (file)
--- a/tests/test_opts.cpp
+++ b/tests/test_opts.cpp
@@ -24,16 +24,18 @@ OptionConfig_T Options_Config[] = {
 //-----------------------------------------------------------------------------
 // Global Test Variables
 //-----------------------------------------------------------------------------
-static int Expected_Exit_Code = -1;
 static jmp_buf Exit_Point = {0};
 
 //-----------------------------------------------------------------------------
 // Helper Functions
 //-----------------------------------------------------------------------------
+#define CHECK_DOES_NOT_EXIT() \
+    if( 0 != setjmp(Exit_Point) ) { CHECK( false ); } else
+
 void exit(int code)
 {
     // Simulate an exit by longjmping to the jmp_buf with the desired error code
-    longjmp( Exit_Point, Expected_Exit_Code);
+    longjmp( Exit_Point, code);
 }
 
 //-----------------------------------------------------------------------------
@@ -70,121 +72,142 @@ namespace {
     {
         char* args[] = { (char*)"-a" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "a" ) );
-        CHECK( NULL == result->tail->val );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "a" ) );
+            CHECK( NULL == result->tail->val );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Short_Option_With_A_Param_And_A_Space)
     {
         char* args[] = { (char*)"-b", (char*)"5" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 2, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 2, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "b" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "5" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "b" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "5" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Short_Option_With_A_Param_And_No_Space)
     {
         char* args[] = { (char*)"-b5" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "b" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "5" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "b" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "5" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Long_Option_With_No_Param)
     {
         char* args[] = { (char*)"--foo" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "foo" ) );
-        CHECK( NULL == result->tail->val );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "foo" ) );
+            CHECK( NULL == result->tail->val );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Long_Option_With_A_Param_And_A_Space)
     {
         char* args[] = { (char*)"--bar", (char*)"baz" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 2, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 2, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "bar" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "baz" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "bar" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "baz" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Long_Option_With_A_Param_And_An_Equals_Sign)
     {
         char* args[] = { (char*)"--bar=baz" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
 
-        OptionList_T* result = results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "bar" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "baz" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "bar" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "baz" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseOptions_Parses_A_Floating_Argument)
     {
         char* args[] = { (char*)"baz1" };
 
-        Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
+        CHECK_DOES_NOT_EXIT()
+        {
+            Result_T* results = OPTS_ParseOptions( Options_Config, 1, args );
 
-        ArgumentList_T* result = results->arguments;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( 0 == strcmp( result->tail->val, (char*)"baz1" ) );
-        CHECK( NULL == result->tail->next );
+            ArgumentList_T* result = results->arguments;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( 0 == strcmp( result->tail->val, (char*)"baz1" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     //-------------------------------------------------------------------------
@@ -197,9 +220,8 @@ namespace {
         StreamContext_T ctx;
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
-        Expected_Exit_Code = 1;
-        exit_code = setjmp( Exit_Point );
 
+        exit_code = setjmp( Exit_Point );
         if( 0 == exit_code )
         {
             OPTS_ParseShortOption( &ctx );
@@ -223,17 +245,19 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 2, args );
 
-        OPTS_ParseShortOption( &ctx );
-
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "a" ) );
-        CHECK( NULL == result->tail->val );
-        CHECK( NULL == result->tail->next );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseShortOption( &ctx );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "a" ) );
+            CHECK( NULL == result->tail->val );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseShortOption_Parses_A_Single_Valid_Option_With_Arg_And_No_Space)
@@ -243,18 +267,21 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
 
-        OPTS_ParseShortOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseShortOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "b" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "5" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "b" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "5" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseShortOption_Parses_A_Single_Valid_Option_With_Arg_And_Space)
@@ -264,18 +291,21 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 2, args );
 
-        OPTS_ParseShortOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseShortOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "b" ) );
-        CHECK( NULL != result->tail->val );
-        CHECK( 0 == strcmp( result->tail->val, "5" ) );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "b" ) );
+            CHECK( NULL != result->tail->val );
+            CHECK( 0 == strcmp( result->tail->val, "5" ) );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseShortOption_Exits_With_Error_When_No_Arg_Received_When_Expected)
@@ -285,9 +315,8 @@ namespace {
         StreamContext_T ctx;
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
-        Expected_Exit_Code = 1;
-        exit_code = setjmp( Exit_Point );
 
+        exit_code = setjmp( Exit_Point );
         if( 0 == exit_code )
         {
             OPTS_ParseShortOption( &ctx );
@@ -311,23 +340,26 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
 
-        OPTS_ParseShortOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseShortOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head != result->tail );
-        // First option
-        CHECK( NULL != result->head->key );
-        CHECK( 0 == strcmp( result->head->key, "a" ) );
-        CHECK( NULL == result->head->val );
-        CHECK( NULL != result->head->next );
-        // Second option
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "a" ) );
-        CHECK( NULL == result->tail->val );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head != result->tail );
+            // First option
+            CHECK( NULL != result->head->key );
+            CHECK( 0 == strcmp( result->head->key, "a" ) );
+            CHECK( NULL == result->head->val );
+            CHECK( NULL != result->head->next );
+            // Second option
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "a" ) );
+            CHECK( NULL == result->tail->val );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     TEST(Verify_ParseShortOption_Parses_A_Group_Of_Valid_Options_With_The_Last_Having_An_Arg)
@@ -337,24 +369,27 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
 
-        OPTS_ParseShortOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseShortOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head != result->tail );
-        // First option
-        CHECK( NULL != result->head->key );
-        CHECK( 0 == strcmp( result->head->key, "b" ) );
-        CHECK( NULL != result->head->val );
-        CHECK( 0 == strcmp( result->head->val, "5" ) );
-        CHECK( NULL != result->head->next );
-        // Second option
-        CHECK( NULL != result->tail->key );
-        CHECK( 0 == strcmp( result->tail->key, "a" ) );
-        CHECK( NULL == result->tail->val );
-        CHECK( NULL == result->tail->next );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head != result->tail );
+            // First option
+            CHECK( NULL != result->head->key );
+            CHECK( 0 == strcmp( result->head->key, "b" ) );
+            CHECK( NULL != result->head->val );
+            CHECK( 0 == strcmp( result->head->val, "5" ) );
+            CHECK( NULL != result->head->next );
+            // Second option
+            CHECK( NULL != result->tail->key );
+            CHECK( 0 == strcmp( result->tail->key, "a" ) );
+            CHECK( NULL == result->tail->val );
+            CHECK( NULL == result->tail->next );
+        }
     }
 
     //-------------------------------------------------------------------------
@@ -367,9 +402,8 @@ namespace {
         StreamContext_T ctx;
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
-        Expected_Exit_Code = 1;
-        exit_code = setjmp( Exit_Point );
 
+        exit_code = setjmp( Exit_Point );
         if( 0 == exit_code )
         {
             OPTS_ParseLongOption( &ctx );
@@ -393,9 +427,8 @@ namespace {
         StreamContext_T ctx;
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 2, args );
-        Expected_Exit_Code = 1;
-        exit_code = setjmp( Exit_Point );
 
+        exit_code = setjmp( Exit_Point );
         if( 0 == exit_code )
         {
             OPTS_ParseLongOption( &ctx );
@@ -419,9 +452,8 @@ namespace {
         StreamContext_T ctx;
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
-        Expected_Exit_Code = 1;
-        exit_code = setjmp( Exit_Point );
 
+        exit_code = setjmp( Exit_Point );
         if( 0 == exit_code )
         {
             OPTS_ParseLongOption( &ctx );
@@ -445,15 +477,18 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
 
-        OPTS_ParseLongOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseLongOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( 0 == strcmp( result->head->key, (char*)"foo") );
-        CHECK( NULL == result->tail->val );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( 0 == strcmp( result->head->key, (char*)"foo") );
+            CHECK( NULL == result->tail->val );
+        }
     }
 
     TEST(Verify_ParseLongOption_Parses_Option_With_Arg_Using_Equals_Sign)
@@ -463,15 +498,18 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 1, args );
 
-        OPTS_ParseLongOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseLongOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( 0 == strcmp( result->head->key, (char*)"bar") );
-        CHECK( 0 == strcmp( result->head->val, (char*)"baz") );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( 0 == strcmp( result->head->key, (char*)"bar") );
+            CHECK( 0 == strcmp( result->head->val, (char*)"baz") );
+        }
     }
 
     TEST(Verify_ParseLongOption_Parses_Option_With_Arg_Not_Using_Equals_Sign)
@@ -481,15 +519,18 @@ namespace {
         ctx.options = Options_Config;
         OPTS_InitContext( &ctx, 2, args );
 
-        OPTS_ParseLongOption( &ctx );
+        CHECK_DOES_NOT_EXIT()
+        {
+            OPTS_ParseLongOption( &ctx );
 
-        OptionList_T* result = ctx.results->options;
-        CHECK( NULL != result );
-        CHECK( NULL != result->head );
-        CHECK( NULL != result->tail );
-        CHECK( result->head == result->tail );
-        CHECK( 0 == strcmp( result->head->key, (char*)"bar") );
-        CHECK( 0 == strcmp( result->head->val, (char*)"baz") );
+            OptionList_T* result = ctx.results->options;
+            CHECK( NULL != result );
+            CHECK( NULL != result->head );
+            CHECK( NULL != result->tail );
+            CHECK( result->head == result->tail );
+            CHECK( 0 == strcmp( result->head->key, (char*)"bar") );
+            CHECK( 0 == strcmp( result->head->val, (char*)"baz") );
+        }
     }
 
     //-------------------------------------------------------------------------

diff --git a/tools/UnitTest++/src/CheckMacros.h b/tools/UnitTest++/src/CheckMacros.h
index 8fbdae77ab4c2bc9e7748ea32baff2376a99414d..a3449c09c24d37e56b7bf277b17f6a690ae34fa0 100644 (file)
--- a/tools/UnitTest++/src/CheckMacros.h
+++ b/tools/UnitTest++/src/CheckMacros.h
@@ -1,4 +1,4 @@
-#ifndef UNITTEST_CHECKMACROS_H 
+#ifndef UNITTEST_CHECKMACROS_H
 #define UNITTEST_CHECKMACROS_H
 
 #include "Checks.h"
@@ -12,35 +12,38 @@
 #endif
 
 #ifdef CHECK_EQUAL
-       #error UnitTest++ redefines CHECK_EQUAL
+    #error UnitTest++ redefines CHECK_EQUAL
 #endif
 
 #ifdef CHECK_CLOSE
-       #error UnitTest++ redefines CHECK_CLOSE
+    #error UnitTest++ redefines CHECK_CLOSE
 #endif
 
 #ifdef CHECK_ARRAY_EQUAL
-       #error UnitTest++ redefines CHECK_ARRAY_EQUAL
+    #error UnitTest++ redefines CHECK_ARRAY_EQUAL
 #endif
 
 #ifdef CHECK_ARRAY_CLOSE
-       #error UnitTest++ redefines CHECK_ARRAY_CLOSE
+    #error UnitTest++ redefines CHECK_ARRAY_CLOSE
 #endif
 
 #ifdef CHECK_ARRAY2D_CLOSE
-       #error UnitTest++ redefines CHECK_ARRAY2D_CLOSE
+    #error UnitTest++ redefines CHECK_ARRAY2D_CLOSE
 #endif
 
 #define CHECK(value) \
     do \
     { \
         try { \
-            if (!UnitTest::Check(value)) \
+            if (!UnitTest::Check(value)) { \
                 UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), #value); \
+                return; \
+            } \
         } \
         catch (...) { \
             UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), \
                     "Unhandled exception in CHECK(" #value ")"); \
+            return;\
         } \
     } while (0)