r5 | charles.nicholson | 2010-03-15 17:46:01 -0500 (Mon, 15 Mar 2010) | 1 line

pjohnmeyer · pjohnmeyer · commit 23c7368d9288 · 2013-01-09T23:42:35.000-06:00
remove leftover exception test structures, fix ReportAssert for no-exceptions build
diff --git a/src/AssertException.cpp b/src/AssertException.cpp
@@ -1,4 +1,7 @@
 #include "AssertException.h"
+
+#ifdef UNITTEST_USE_EXCEPTIONS
+
 #include <cstring>
 
 namespace UnitTest {
@@ -12,11 +15,11 @@ AssertException::AssertException(char const* description, char const* filename,
     strcpy(m_filename, filename);
 }
 
-AssertException::~AssertException() throw()
+AssertException::~AssertException()
 {
 }
 
-char const* AssertException::what() const throw()
+char const* AssertException::what() const
 {
     return m_description;
 }
@@ -32,3 +35,5 @@ int AssertException::LineNumber() const
 }
 
 }
+
+#endif
diff --git a/src/AssertException.h b/src/AssertException.h
@@ -1,18 +1,21 @@
 #ifndef UNITTEST_ASSERTEXCEPTION_H
 #define UNITTEST_ASSERTEXCEPTION_H
 
-#include <exception>
+#include "Config.h"
+
+#ifdef UNITTEST_USE_EXCEPTIONS
 
+#include <exception>
 
 namespace UnitTest {
 
 class AssertException : public std::exception
 {
 public:
     AssertException(char const* description, char const* filename, int lineNumber);
-    virtual ~AssertException() throw();
+    virtual ~AssertException();
 
-    virtual char const* what() const throw();
+    virtual char const* what() const;
 
     char const* Filename() const;
     int LineNumber() const;
@@ -26,3 +29,5 @@ class AssertException : public std::exception
 }
 
 #endif
+
+#endif
diff --git a/src/Config.h b/src/Config.h
@@ -27,6 +27,6 @@
 // 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_EXCEPTIONS
 
 #endif
diff --git a/src/ReportAssert.cpp b/src/ReportAssert.cpp
@@ -1,11 +1,17 @@
-#include "ReportAssert.h"
-#include "AssertException.h"
-
-namespace UnitTest {
-
-void ReportAssert(char const* description, char const* filename, int lineNumber)
-{
-    throw AssertException(description, filename, lineNumber);
-}
-
-}
+#include "ReportAssert.h"
+#include "AssertException.h"
+
+namespace UnitTest {
+
+void ReportAssert(char const* description, char const* filename, int lineNumber)
+{
+	(void)description;
+	(void)filename;
+	(void)lineNumber;
+
+#ifdef UNITTEST_USE_EXCEPTIONS
+    throw AssertException(description, filename, lineNumber);
+#endif
+}
+
+}
diff --git a/src/tests/TestCheckMacros.cpp b/src/tests/TestCheckMacros.cpp
@@ -206,17 +206,6 @@ TEST(CheckCloseDoesNotHaveSideEffectsWhenFailing)
     CHECK_EQUAL(1, g_sideEffect);
 }
 
-
-class ThrowingObject
-{
-public:
-    float operator[](int) const
-    {
-        throw "Test throw";
-    }
-};
-
-
 TEST(CheckArrayCloseSucceedsOnEqual)
 {
     bool failure = true;
@@ -404,16 +393,6 @@ TEST(CheckArrayCloseDoesNotHaveSideEffectsWhenFailing)
 	CHECK_EQUAL(1, g_sideEffect);
 }
 
-class ThrowingObject2D
-{
-public:
-    float* operator[](int) const
-    {
-        throw "Test throw";
-    }
-};
-
-
 TEST(CheckArray2DCloseSucceedsOnEqual)
 {
     bool failure = true;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`#include "AssertException.h"`
	`2`	`+`
	`3`	`+#ifdef UNITTEST_USE_EXCEPTIONS`
	`4`	`+`
`2`	`5`	`#include <cstring>`
`3`	`6`
`4`	`7`	`namespace UnitTest {`
`@@ -12,11 +15,11 @@ AssertException::AssertException(char const* description, char const* filename,`
`12`	`15`	`strcpy(m_filename, filename);`
`13`	`16`	`}`
`14`	`17`
`15`		`-AssertException::~AssertException() throw()`
	`18`	`+AssertException::~AssertException()`
`16`	`19`	`{`
`17`	`20`	`}`
`18`	`21`
`19`		`-char const* AssertException::what() const throw()`
	`22`	`+char const* AssertException::what() const`
`20`	`23`	`{`
`21`	`24`	`return m_description;`
`22`	`25`	`}`
`@@ -32,3 +35,5 @@ int AssertException::LineNumber() const`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`}`
	`38`	`+`
	`39`	`+#endif`