1 files changed, 40 insertions, 6 deletions

diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp
index b61baa5..7421496 100644
--- a/src/unitsuite.cpp
+++ b/src/unitsuite.cpp
@@ -24,6 +24,10 @@ Bu::UnitSuite::~UnitSuite()
 // Argument handling is coming soon, I promise.
 int Bu::UnitSuite::run( int /*argc*/, char * /*argv */ [] )
 {
+        int iEPass = 0;
+        int iEFail = 0;
+        int iUPass = 0;
+        int iUFail = 0;
         for( TestList::iterator i = lTests.begin(); i != lTests.end(); i++ )
         {
                 printf("%s: ", i->sName.getStr() );
@@ -31,13 +35,22 @@ int Bu::UnitSuite::run( int /*argc*/, char * /*argv */ [] )
                 try
                 {
                         (this->*(i->fTest))();
-                        printf("passed.\n");
+                        switch( i->eExpect )
+                        {
+                                case expectPass: printf("expected pass.\n"); iEPass++; break;
+                                case expectFail: printf("unexpected pass.\n"); iUPass++; break;
+                        }
                 }
                 catch( Failed &e )
                 {
+                        switch( i->eExpect )
+                        {
+                                case expectPass: printf("unexpected "); iUFail++; break;
+                                case expectFail: printf("expected "); iEFail++; break;
+                        }
                         if( e.bFile )
                         {
-                                printf("unitTest(%s) failed. (%s:%d)\n",
+                                printf("fail in unitTest(%s). (%s:%d)\n",
                                         e.str.getStr(),
                                         e.sFile.getStr(),
                                         e.nLine
@@ -45,7 +58,7 @@ int Bu::UnitSuite::run( int /*argc*/, char * /*argv */ [] )
                         }
                         else
                         {
-                                printf("unitTest(%s) failed.\n",
+                                printf("fail in unitTest(%s).\n",
                                         e.str.getStr()
                                         );
                         }
@@ -55,20 +68,40 @@ int Bu::UnitSuite::run( int /*argc*/, char * /*argv */ [] )
                 }
                 catch( std::exception &e )
                 {
-                        printf("failed with unknown exception.  what: %s\n", e.what() );
+                        switch( i->eExpect )
+                        {
+                                case expectPass: printf("unexpected "); iUFail++; break;
+                                case expectFail: printf("expected "); iEFail++; break;
+                        }
+                        printf("fail with unknown exception.  what: %s\n", e.what() );
 
                         if( (iOptions & optStopOnError) )
                                 return 0;
                 }
                 catch( ... )
                 {
-                        printf("failed with external exception.\n");
+                        switch( i->eExpect )
+                        {
+                                case expectPass: printf("unexpected "); iUFail++; break;
+                                case expectFail: printf("expected "); iEFail++; break;
+                        }
+                        printf("fail with external exception.\n");
 
                         if( (iOptions & optStopOnError) )
                                 return 0;
                 }
         }
 
+        printf("\nReport:\n"
+                "\tTotal tests run:     %ld\n"
+                "\tExpected passes:     %d\n"
+                "\tExpected failures:   %d\n"
+                "\tUnexpected passes:   %d\n"
+                "\tUnexpected failures: %d\n\n",
+                lTests.getSize(), iEPass, iEFail, iUPass, iUFail );
+        if( iUPass == 0 && iUFail == 0 )
+                printf("\tNothing unexpected.\n\n");
+
         return 0;
 }
 
@@ -76,6 +109,7 @@ void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e )
 {
         TestInfo ti;
         ti.sName = sName;
+        ti.eExpect = e;
         long index = ti.sName.rfind("::");
         if( index != -1 )
         {
@@ -84,7 +118,7 @@ void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e )
                 ti.sName = tmp;
         }
         ti.fTest = fTest;
-        lTests.push_back( ti );
+        lTests.append( ti );
 }
 
 void Bu::UnitSuite::setName( const FString &sName )