Include/cppunit/Exception.

include/cppunit/Exception.h:
* src/cppunit/Exception.h: added setMessage().

* include/cppunit/Protector.h:
* src/cppunit/Protector.cpp: added class ProtectorGuard. Change the
reportXXX() method to support Exception passing and SourceLine.

* include/cppunit/TestCaller.h: removed 'expect exception' features.
It is now handled by ExceptionTestCaseDecorator and TestCaller no
longer need default template argument support.

* include/cppunit/TestCase.h:
* include/cppunit/extensions/TestCaller.h: runTest() is now public
instead of protected, so that it can be decorated.

* include/cppunit/TestResult.h:
* src/cppunit/TestResult.h: added pushProtector() and popProtector()
methods. This allow user to specify their own exception trap when
running test case.

* include/cppunit/extensions/TestDecorator.h:
* src/cppunit/TestDecorator.cpp: added. Extracted from TestDecorator.h.
The test passed to the constructor is now owned by the decorator.

* include/cppunit/extensions/TestCaseDecorator.h:
* src/cppunit/TestCaseDecorator.cpp: added. Decorator for TestCase
setUp(), tearDown() and runTest().

* include/cppunit/extensions/ExceptionTestCaseDecorator.h: added.
TestCaseDecorator to expect that a specific exception is thrown.

* include/cppunit/extensions/HelperMacros.h: updated against TestCaller
change.

* src/cppunit/DefaultFunctor.h: fixed bug (did not return underlying
test return code).

* src/cppunit/ProtectorChain.cpp: fixed bug in chaing return code.

* src/cppunit/DefaultFunctor.h: fixed bug.

* src/msvc6/testrunner/ActiveTest.h:
* src/msvc6/testrunner/ActiveTest.cpp: updated against
TestCaseDecorator ownership policy change. Moved inline functions
to .cpp.

* examples/cppunittest/TestSetUpTest.cpp: updated to use MockTestCase
and against the new ownership policy.

* examples/cppunittest/TestDecoratorTest.cpp:
* examples/cppunittest/RepeatedTestTest.cpp: updated against
TestDecorator ownership policy change.

* examples/cppunittest/ExceptionTestCaseDecoratorTest.h:
* examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp: added. Unit
tests for ExceptionTestCaseDecoratorTest.

1 files changed, 9 insertions, 10 deletions

diff --git a/include/cppunit/TestCaller.h b/include/cppunit/TestCaller.h
index f9f6516..dc4d82e 100644
--- a/include/cppunit/TestCaller.h
+++ b/include/cppunit/TestCaller.h
@@ -12,7 +12,7 @@
 
 CPPUNIT_NS_BEGIN
 
-
+#if 0
 /*! \brief Marker class indicating that no exception is expected by TestCaller.
  * This class is an implementation detail. You should never use this class directly.
  */
@@ -59,6 +59,7 @@ struct ExpectedExceptionTraits<NoExceptionExpected>
 };
 
 
+#endif
 
 //*** FIXME: rework this when class Fixture is implemented. ***//
 
@@ -99,8 +100,7 @@ struct ExpectedExceptionTraits<NoExceptionExpected>
  * \see TestCase
  */
 
-template <class Fixture,  
-          class ExpectedException = NoExceptionExpected>
+template <class Fixture>
 class TestCaller : public TestCase
 { 
   typedef void (Fixture::*TestMethod)();
@@ -160,17 +160,16 @@ public:
       delete m_fixture;
   }
 
-protected:
   void runTest()
   { 
-	  try {
+//	  try {
 	    (m_fixture->*m_test)();
-	  }
-	  catch ( ExpectedException & ) {
-	    return;
-	  }
+//	  }
+//	  catch ( ExpectedException & ) {
+//	    return;
+//	  }
 
-  	ExpectedExceptionTraits<ExpectedException>::expectedException();
+//  	ExpectedExceptionTraits<ExpectedException>::expectedException();
   }  
 
   void setUp()