unittest-cpp · ohz10 · Nov 15, 2012 · Jan 26, 2013 · Jan 26, 2013 · Jan 26, 2013
diff --git a/UnitTest++/CheckMacros.h b/UnitTest++/CheckMacros.h
@@ -41,6 +41,10 @@
 			if (!UnitTest::Check(value)) \
 				UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), #value); \
 		}) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+         UT_THROW(); \
+      }) \
 		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \
@@ -61,6 +65,10 @@
 		({ \
             UnitTest::CheckEqual(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
         }) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+         UT_THROW(); \
+      }) \
 		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \
@@ -81,6 +89,10 @@
 		({ \
             UnitTest::CheckClose(*UnitTest::CurrentTest::Results(), expected, actual, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
         }) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+          UT_THROW(); \
+      }) \
 		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \
@@ -101,6 +113,10 @@
 		({ \
             UnitTest::CheckArrayEqual(*UnitTest::CurrentTest::Results(), expected, actual, count, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
         }) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+         UT_THROW(); \
+      }) \
  		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \
@@ -121,6 +137,10 @@
 		({ \
             UnitTest::CheckArrayClose(*UnitTest::CurrentTest::Results(), expected, actual, count, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
         }) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+          UT_THROW(); \
+      }) \
  		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \
@@ -141,6 +161,10 @@
 		({ \
             UnitTest::CheckArray2DClose(*UnitTest::CurrentTest::Results(), expected, actual, rows, columns, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
         }) \
+      UT_CATCH (UnitTest::AssertException, , \
+      { \
+          UT_THROW(); \
+      }) \
  		UT_CATCH (std::exception, e, \
 		{ \
 			UnitTest::MemoryOutStream message; \

diff --git a/UnitTest++/RequireMacros.h b/UnitTest++/RequireMacros.h
@@ -0,0 +1,18 @@
+#ifndef UNITTEST_REQUIREMACROS_H
+#define UNITTEST_REQUIREMACROS_H
+
+#include "RequiredCheckTestReporter.h"
+
+#ifdef REQUIRE
+    #error UnitTest++ redefines REQUIRE
+#endif
+
+#ifndef UNITTEST_NO_EXCEPTIONS
+    #define REQUIRE for(UnitTest::RequiredCheckTestReporter decoratedReporter(UnitTest::CurrentTest::Results()); decoratedReporter.next(); )
+#endif
+
+#ifdef UNITTEST_NO_EXCEPTIONS
+    #define REQUIRE
+#endif
+
+#endif
diff --git a/UnitTest++/RequiredCheckTestReporter.cpp b/UnitTest++/RequiredCheckTestReporter.cpp
@@ -0,0 +1,29 @@
+#include "RequiredCheckTestReporter.h"
+
+#include "CurrentTest.h"
+#include "TestResults.h"
+
+namespace UnitTest {
+
+    RequiredCheckTestReporter::RequiredCheckTestReporter(TestResults* results)
+        : m_results(results)
+        , m_throwingReporter(0)
+        , m_continue(0)
+    {
+        if(m_results)
+        {
+            m_throwingReporter.setDecorated(m_results->m_testReporter);
+            m_results->m_testReporter = &m_throwingReporter;
+        }
+    }
+
+    RequiredCheckTestReporter::~RequiredCheckTestReporter()
+    {
+        if(m_results) m_results->m_testReporter = m_throwingReporter.getDecorated();
+    }
+
+    bool RequiredCheckTestReporter::next()
+    {
+        return m_continue++ == 0;
+    }
+}
diff --git a/UnitTest++/RequiredCheckTestReporter.h b/UnitTest++/RequiredCheckTestReporter.h
@@ -0,0 +1,29 @@
+#ifndef UNITTEST_REQUIRED_CHECK_TEST_REPORTER_H
+#define UNITTEST_REQUIRED_CHECK_TEST_REPORTER_H
+
+#include "HelperMacros.h"
+#include "ThrowingTestReporter.h"
+
+namespace UnitTest {
+
+    class TestResults;
+
+    // This RAII class decorates the current TestReporter with
+    // a version that throws after reporting a failure.
+    class UNITTEST_LINKAGE RequiredCheckTestReporter
+    {
+    public:
+        explicit RequiredCheckTestReporter(TestResults* results);
+        ~RequiredCheckTestReporter();
+
+        bool next();
+
+    private:
+        TestResults* m_results;
+        ThrowingTestReporter m_throwingReporter;
+        int m_continue;
+    };
+}
+
+#endif
+
diff --git a/UnitTest++/TestResults.h b/UnitTest++/TestResults.h
@@ -5,6 +5,7 @@
 
 namespace UnitTest {
 
+class RequiredCheckTestReporter;
 class TestReporter;
 class TestDetails;
 
@@ -21,6 +22,9 @@ class UNITTEST_LINKAGE TestResults
     int GetFailedTestCount() const;
     int GetFailureCount() const;
 
+private:
+    friend class RequiredCheckTestReporter;
+
 private:
     TestReporter* m_testReporter;
     int m_totalTestCount;

diff --git a/UnitTest++/ThrowingTestReporter.cpp b/UnitTest++/ThrowingTestReporter.cpp
@@ -0,0 +1,51 @@
+#include "ThrowingTestReporter.h"
+#include "AssertException.h"
+
+namespace UnitTest {
+
+    ThrowingTestReporter::ThrowingTestReporter(TestReporter* decoratedReporter)
+        : m_decoratedReporter(decoratedReporter)
+    {
+    }
+
+    //virtual
+    ThrowingTestReporter::~ThrowingTestReporter()
+    {
+    }
+
+    //virtual
+    void ThrowingTestReporter::ReportTestStart(TestDetails const& test)
+    {
+        if(m_decoratedReporter) m_decoratedReporter->ReportTestStart(test);
+    }
+
+    //virtual
+    void ThrowingTestReporter::ReportFailure(TestDetails const& test, char const* failure)
+    {
+        if(m_decoratedReporter) m_decoratedReporter->ReportFailure(test, failure);
+        throw AssertException();
+    }
+
+    //virtual
+    void ThrowingTestReporter::ReportTestFinish(TestDetails const& test, float secondsElapsed)
+    {
+        if(m_decoratedReporter) m_decoratedReporter->ReportTestFinish(test, secondsElapsed);
+    }
+
+    //virtual
+    void ThrowingTestReporter::ReportSummary(int totalTestCount, int failedTestCount, int failureCount, float secondsElapsed)
+    {
+        if(m_decoratedReporter) m_decoratedReporter->ReportSummary(totalTestCount, failedTestCount, failureCount, secondsElapsed);
+    }
+
+    TestReporter* ThrowingTestReporter::getDecorated() const
+    {
+        return m_decoratedReporter;
+    }
+
+    void ThrowingTestReporter::setDecorated(TestReporter* reporter)
+    {
+        m_decoratedReporter = reporter;
+    }
+
+}
diff --git a/UnitTest++/ThrowingTestReporter.h b/UnitTest++/ThrowingTestReporter.h
@@ -0,0 +1,29 @@
+#ifndef UNITTEST_THROWINGTESTREPORTER_H
+#define UNITTEST_THROWINGTESTREPORTER_H
+
+#include "TestReporter.h"
+
+namespace UnitTest {
+
+    // A TestReporter that throws when ReportFailure is called. Otherwise it
+    // forwards the calls to a decorated TestReporter
+    class ThrowingTestReporter : public TestReporter
+    {
+    public:
+        explicit ThrowingTestReporter(TestReporter* reporter);
+
+        virtual ~ThrowingTestReporter();
+        virtual void ReportTestStart(TestDetails const& test);
+        virtual void ReportFailure(TestDetails const& test, char const* failure);
+        virtual void ReportTestFinish(TestDetails const& test, float secondsElapsed);
+        virtual void ReportSummary(int totalTestCount, int failedTestCount, int failureCount, float secondsElapsed);
+
+        TestReporter* getDecorated() const;
+        void setDecorated(TestReporter* reporter);
+
+    private:
+        TestReporter* m_decoratedReporter;
+    };
+}
+
+#endif
diff --git a/UnitTest++/UnitTestPP.h b/UnitTest++/UnitTestPP.h
@@ -4,6 +4,7 @@
 #include "Config.h"
 #include "TestMacros.h"
 #include "CheckMacros.h"
+#include "RequireMacros.h"
 #include "TestRunner.h"
 #include "TimeConstraint.h"
 #include "ReportAssert.h"