diff -r 2f2b67218332 src/core/test.cc --- a/src/core/test.cc Sun Sep 12 14:35:26 2010 +0200 +++ b/src/core/test.cc Thu Sep 16 13:39:48 2010 -0700 @@ -149,10 +149,7 @@ DoReportStart (); DoSetup (); - - bool result = DoRun (); - UpdateErrorStatus (result); - + DoRun (); DoTeardown (); if (GetErrorStatus () == false) @@ -454,12 +451,8 @@ TestSuite::Run (void) { DoReportStart (); - DoSetup (); - - bool result = DoRun (); - UpdateErrorStatus (result); - + DoRun (); DoTeardown (); if (GetErrorStatus () == false) @@ -663,7 +656,7 @@ { } -bool +void TestSuite::DoRun (void) { SetErrorStatus (false); @@ -682,19 +675,17 @@ // // Run the test case // - bool result = (*i)->Run (); - UpdateErrorStatus (result); + (*i)->Run (); // // Exit if we have detected an error and we are not allowing multiple filures // if (GetErrorStatus () && m_continueOnFailure == false) { - return GetErrorStatus (); + return; } } - return GetErrorStatus (); } void diff -r 2f2b67218332 src/core/test.h --- a/src/core/test.h Sun Sep 12 14:35:26 2010 +0200 +++ b/src/core/test.h Thu Sep 16 13:39:48 2010 -0700 @@ -830,9 +830,8 @@ * \internal * \brief Implementation to actually run this test case. * \param verbose Turn on any output the test case may provide - * \returns Boolean sense of "an error has occurred." */ - virtual bool DoRun (void) = 0; + virtual void DoRun (void) = 0; /** * \internal @@ -1076,9 +1075,8 @@ * \internal * \brief Implementation to actually run this test suite. * \param verbose Turn on any output the test case may provide - * \returns Boolean sense of "an error has occurred." */ - virtual bool DoRun (void); + virtual void DoRun (void); /** * \internal diff -r 2f2b67218332 src/test/sample-test-suite.cc --- a/src/test/sample-test-suite.cc Sun Sep 12 14:35:26 2010 +0200 +++ b/src/test/sample-test-suite.cc Thu Sep 16 13:39:48 2010 -0700 @@ -15,7 +15,7 @@ virtual ~SampleTestCase1 (); private: - virtual bool DoRun (void); + virtual void DoRun (void); }; // Add some help text to this case to describe what it is intended to test @@ -34,7 +34,7 @@ // This method is the pure virtual method from class TestCase that every // TestCase must implement // -bool +void SampleTestCase1::DoRun (void) { // A wide variety of test macros are available in src/core/test.h @@ -42,8 +42,6 @@ // Use this one for floating point comparisons NS_TEST_ASSERT_MSG_EQ_TOL (0.01, 0.01, 0.001, "Numbers are not equal within tolerance"); - // Return false if an error has _not_ occurred - return false; } // The TestSuite class names the TestSuite, identifies what type of TestSuite,