r7 | charles.nicholson | 2010-03-16 16:18:18 -0500 (Tue, 16 Mar 2010) | 1 line

pjohnmeyer · pjohnmeyer · commit ab8b81859141 · 2013-01-09T23:42:51.000-06:00
add DeferredTestReporter and DeferredTestResult back in, conditional on UNITTEST_USE_DEFERRED_REPORTER
diff --git a/src/Config.h b/src/Config.h
@@ -27,6 +27,7 @@
 // uncomment this line to use the custom MemoryOutStream (no deps on std::ostringstream).
 
 #define UNITTEST_USE_CUSTOM_STREAMS
-//#define UNITTEST_USE_EXCEPTIONS
+#define UNITTEST_USE_DEFERRED_REPORTER
+#define UNITTEST_USE_EXCEPTIONS
 
 #endif
diff --git a/src/DeferredTestReporter.cpp b/src/DeferredTestReporter.cpp
@@ -1,3 +1,6 @@
+#include "Config.h"
+#ifdef UNITTEST_USE_DEFERRED_REPORTER
+
 #include "DeferredTestReporter.h"
 #include "TestDetails.h"
 
@@ -26,3 +29,5 @@ DeferredTestReporter::DeferredTestResultList& DeferredTestReporter::GetResults()
 {
     return m_results;
 }
+
+#endif
diff --git a/src/DeferredTestReporter.h b/src/DeferredTestReporter.h
@@ -1,29 +1,33 @@
-#ifndef UNITTEST_DEFERREDTESTREPORTER_H
-#define UNITTEST_DEFERREDTESTREPORTER_H
-
-#include "TestReporter.h"
-#include "DeferredTestResult.h"
-#include "Config.h"
-
-#include <vector>
-
-namespace UnitTest
-{
-
-class DeferredTestReporter : public TestReporter
-{
-public:
-    virtual void ReportTestStart(TestDetails const& details);
-    virtual void ReportFailure(TestDetails const& details, char const* failure);
-    virtual void ReportTestFinish(TestDetails const& details, float secondsElapsed);
-
-    typedef std::vector< DeferredTestResult > DeferredTestResultList;
-    DeferredTestResultList& GetResults();
-
-private:
-    DeferredTestResultList m_results;
-};
-
-}
-
-#endif
+#ifndef UNITTEST_DEFERREDTESTREPORTER_H
+#define UNITTEST_DEFERREDTESTREPORTER_H
+
+#include "Config.h"
+
+#ifdef UNITTEST_USE_DEFERRED_REPORTER
+
+#include "TestReporter.h"
+#include "DeferredTestResult.h"
+
+#include <vector>
+
+namespace UnitTest
+{
+
+class DeferredTestReporter : public TestReporter
+{
+public:
+    virtual void ReportTestStart(TestDetails const& details);
+    virtual void ReportFailure(TestDetails const& details, char const* failure);
+    virtual void ReportTestFinish(TestDetails const& details, float secondsElapsed);
+
+    typedef std::vector< DeferredTestResult > DeferredTestResultList;
+    DeferredTestResultList& GetResults();
+
+private:
+    DeferredTestResultList m_results;
+};
+
+}
+
+#endif
+#endif
diff --git a/src/DeferredTestResult.cpp b/src/DeferredTestResult.cpp
@@ -1,5 +1,7 @@
-#include "DeferredTestResult.h"
 #include "Config.h"
+#ifdef UNITTEST_USE_DEFERRED_REPORTER
+
+#include "DeferredTestResult.h"
 
 namespace UnitTest
 {
@@ -27,3 +29,5 @@ DeferredTestResult::~DeferredTestResult()
 }
 
 }
+
+#endif
diff --git a/src/DeferredTestResult.h b/src/DeferredTestResult.h
@@ -1,32 +1,35 @@
-#ifndef UNITTEST_DEFERREDTESTRESULT_H
-#define UNITTEST_DEFERREDTESTRESULT_H
-
-#include "Config.h"
-
-#include <string>
-#include <vector>
-
-namespace UnitTest
-{
-
-struct DeferredTestResult
-{
-	DeferredTestResult();
-    DeferredTestResult(char const* suite, char const* test);
-    ~DeferredTestResult();
-    
-    std::string suiteName;
-    std::string testName;
-    std::string failureFile;
-    
-    typedef std::pair< int, std::string > Failure;
-    typedef std::vector< Failure > FailureVec;
-    FailureVec failures;
-    
-    float timeElapsed;
-	bool failed;
-};
-
-}
-
-#endif //UNITTEST_DEFERREDTESTRESULT_H
+#ifndef UNITTEST_DEFERREDTESTRESULT_H
+#define UNITTEST_DEFERREDTESTRESULT_H
+
+#include "Config.h"
+
+#ifdef UNITTEST_USE_DEFERRED_REPORTER
+
+#include <string>
+#include <vector>
+
+namespace UnitTest
+{
+
+struct DeferredTestResult
+{
+	DeferredTestResult();
+    DeferredTestResult(char const* suite, char const* test);
+    ~DeferredTestResult();
+    
+    std::string suiteName;
+    std::string testName;
+    std::string failureFile;
+    
+    typedef std::pair< int, std::string > Failure;
+    typedef std::vector< Failure > FailureVec;
+    FailureVec failures;
+    
+    float timeElapsed;
+	bool failed;
+};
+
+}
+
+#endif
+#endif
diff --git a/src/tests/TestDeferredTestReporter.cpp b/src/tests/TestDeferredTestReporter.cpp
@@ -1,6 +1,9 @@
+#include "../Config.h"
+
+#ifdef UNITTEST_USE_DEFERRED_REPORTER
+
 #include "../unittestpp.h"
 #include "../DeferredTestReporter.h"
-#include "../Config.h"
 #include <cstring>
 
 namespace UnitTest
@@ -115,3 +118,5 @@ TEST_FIXTURE(DeferredTestReporterFixture, DeferredTestReporterTakesCopyOfFailure
 }
 
 }}
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+#include "Config.h"`
	`2`	`+#ifdef UNITTEST_USE_DEFERRED_REPORTER`
	`3`	`+`
`1`	`4`	`#include "DeferredTestReporter.h"`
`2`	`5`	`#include "TestDetails.h"`
`3`	`6`
`@@ -26,3 +29,5 @@ DeferredTestReporter::DeferredTestResultList& DeferredTestReporter::GetResults()`
`26`	`29`	`{`
`27`	`30`	`return m_results;`
`28`	`31`	`}`
	`32`	`+`
	`33`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-#include "DeferredTestResult.h"`
`2`	`1`	`#include "Config.h"`
	`2`	`+#ifdef UNITTEST_USE_DEFERRED_REPORTER`
	`3`	`+`
	`4`	`+#include "DeferredTestResult.h"`
`3`	`5`
`4`	`6`	`namespace UnitTest`
`5`	`7`	`{`
`@@ -27,3 +29,5 @@ DeferredTestResult::~DeferredTestResult()`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`}`
	`32`	`+`
	`33`	`+#endif`