NEW: updated and restructured.

NEW: updated and restructured.

* include/cppunit/CompilerOutputter.h:
* src/cppunit/CompilerOutputter.cpp:
updated against TestResultChange. Changed TestResult to TestResultCollector.

* include/cppunit/extensions/HelperMacros.h: minor documentation fix.

* include/cppunit/Outputter.h: added. Abstract base class for all Outputter.

* include/cppunit/Portability.h: made the fix on OStringStream suggested by
Bob Summerwill to remove level 4 warning with VC++.

* include/cppunit/TestAssert.h: added macro CPPUNIT_ASSERT_EQUAL_MESSAGE.

* src/cppunit/TestFailure.cpp:
* include/cppunit/TestFailure.h: added method clone() to duplicate a failure. Made
all method virtual.

* include/cppunit/TestListener.h: changed signature of addFailure() to
addFailure( const TestFailure &failure ). Failure is now only a temporary object.

* include/cppunit/Outputter.h: added. Abstract base class for all outputter. Used
by TextTestRunner.

* include/cppunit/SynchronizedObject.h:
* src/cppunit/SynchronizedObject.cpp: added. Class extracted from TestResult.
Base class for objects that can be accessed from different threads.

* include/cppunit/TestResult.h: TestFailure.h is no longer included.

* include/cppunit/TestResult.h:
* src/cppunit/TestResult.cpp: extracted all methods related to keeping track
of the result to the new TestResultCollector class which is a TestListener.

* include/cppunit/TestResultCollector.h:
* src/cppunit/TestResultCollector.cpp: added. TestListener which kept track
of the result of the test run. All failure/error, and tests are tracked.

* include/cppunit/TestSucessListener.h:
* src/cppunit/TestSucessListener.cpp: added. TestListener extracted from
TestResult. Is responsible for wasSucessful().

* include/cppunit/TestCase.h:
* src/cppunit/TestCase.cpp: reindented.

* include/cppunit/TextOutputter.h:
* src/cppunit/TextOutputter.cpp: added. Copied from the deprecated
TextTestResult and modified to act as an Ouputter.

* include/cppunit/TextTestProgressListener.h:
* src/cppunit/TextTestProgressListener.cpp: Copied from the deprecated
TextTestResult and modified to print the dot while the test are running.

* include/cppunit/TextTestResult.h:
* src/cppunit/TextTestResult.cpp: updated against TestResult change.
No compatiblity break. Deprecated.

* include/cppunit/TextTestRunner.h:
* src/cppunit/TextTestRunner.cpp: updated to work with the new TestResult.
Use TextTestProgressListener and TextOutputter instead of TextTestResult.
Any outputter with interface Outputter can be used to print the test result
(CompilerOutputter, XmlOutputter, TextOutputter...)

* include/cppunit/XmlOutputter.h:
* src/cppunit/XmlOutputter.cpp: updated against TestResultChange.
Changed TestResult to TestResultCollector.

* src/msvc6/TestRunnerDlg.h:
* src/msvc6/TestRunnerDlg.cpp: fixed the 'fullrowselect' feature of the list view.
The dialog is a TestListener itself, it no longer use the GUITestResult class.

* src/msvc6/TestRunner.rc: moved the "autorun test button" in such a way that it
did not overlap the progress bar anymore.

* src/msvc6/MfcSynchronizationObject.h: added. Generic SynchronizedObject
lock for MFC.

* src/msvc6/GUITestResult.h :
* src/msvc6/GUITestResult.cpp : removed.

* src/qttestrunner/TestRunnerModel.h:
* src/qttestrunner/TestRunnerModel.cpp: changed addFailure() signature to reflect
change on TestListener.

* examples/cppunittest/CppUnitTestMain.cpp: updated to use the new Outputter
abstraction and TextTestRunner facilities.

* examples/cppunittest/FailingTestCase.h:
* examples/cppunittest/FailingTestCase.cpp: removed. Replaced by MockTestCase.

* examples/cppunittest/FailingTestCase.h:
* examples/cppunittest/FailingTestCase.h:

* examples/cppunittest/HelperMacrosTest.h:
* examples/cppunittest/HelperMacrosTest.cpp: Updated against TestResult change.
Use MockTestListener instead of TestResult to check for sucess or failure.

* examples/cppunittest/MockTestListener.h:
* examples/cppunittest/MockTestListener.cpp: the class now behave like a mock
object.

* examples/cppunittest/MockTestCase.h:
* examples/cppunittest/MockTestCase.cpp: added. Mock TestCase object.

* examples/cppunittest/OrthodoxTest.h:
* examples/cppunittest/OrthodoxTest.cpp: Updated against TestResult change.
Use MockTestListener instead of TestResult to check for sucess or failure.

* examples/cppunittest/SynchronizedTestResult.h: Updated against TestResult
change.

* examples/cppunittest/TestCallerTest.h:
* examples/cppunittest/TestCallerTest.cpp: Updated against TestResult change.
Use MockTestListener instead of TestResult.

* examples/cppunittest/TestCaseTest.h:
* examples/cppunittest/TestCaseTest.cpp: Updated against TestResult change.
Use MockTestListener and MockTestCase instead of FailingTestCase and TestResult.

* examples/cppunittest/TestDecoratorTest.h:
* examples/cppunittest/TestDecoratorTest.cpp: Updated against TestResult change.
Use MockTestCase instead of FailingTestCase.

* examples/cppunittest/TestListenerTest.h:
* examples/cppunittest/TestListenerTest.cpp: removed. Those unit tests have been
rewrote and moved to TestResultTest.

* examples/cppunittest/TestResultTest.h:
* examples/cppunittest/TestResultTest.cpp: Updated to test the new interface.
Tests from TestListenerTest have been moved here.

* examples/cppunittest/TestResultCollectorTest.h:
* examples/cppunittest/TestResultCollectorTest.cpp: added. Tests for the class
that been extracted from TestResult.

* examples/cppunittest/TestSetUpTest.h:
* examples/cppunittest/TestSetUpTest.cpp: renamed SetUp inner class to MockSetUp.
Changed interface to be more akin to a Mock object.

* examples/cppunittest/TestSuiteTest.h:
* examples/cppunittest/TestSuiteTest.cpp: Updated against TestResult change,
and rewrote to use MockTestCase instead of FailingTestCase.

* examples/cppunittest/XmlOutputterTest.h:
* examples/cppunittest/XmlOutputterTest.cpp: Updated against TestResult change.
Added some utility methods to make the update easier.

1 files changed, 76 insertions, 52 deletions

diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp
index d8326bc..f3cdeeb 100644
--- a/examples/cppunittest/XmlOutputterTest.cpp
+++ b/examples/cppunittest/XmlOutputterTest.cpp
@@ -1,4 +1,5 @@
-#include <cppunit/TestResult.h>
+#include <cppunit/XmlOutputter.h>
+#include <cppunit/TestFailure.h>
 #include <cppunit/XmlOutputter.h>
 #include "OutputSuite.h"
 #include "XmlOutputterTest.h"
@@ -23,12 +24,18 @@ XmlOutputterTest::~XmlOutputterTest()
 void 
 XmlOutputterTest::setUp()
 {
+  m_dummyTests.clear();
+  m_result = new CppUnit::TestResultCollector();
 }
 
 
 void 
 XmlOutputterTest::tearDown()
 {
+  delete m_result;
+  for ( int index =0; index < m_dummyTests.size(); ++index )
+    delete m_dummyTests[index];
+  m_dummyTests.clear();
 }
 
 
@@ -109,10 +116,8 @@ XmlOutputterTest::testNodeWithContentAndChildToString()
 void 
 XmlOutputterTest::testWriteXmlResultWithNoTest()
 {
-  CppUnit::TestResult result;
-
   CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( &result, stream );
+  CppUnit::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -134,16 +139,10 @@ XmlOutputterTest::testWriteXmlResultWithNoTest()
 void 
 XmlOutputterTest::testWriteXmlResultWithOneFailure()
 {
-  CppUnit::TestResult result;
-  CppUnit::TestCase test1( "test1" );
-  result.startTest( &test1 );
-  CppUnit::SourceLine sourceLine( "test.cpp", 3 );
-  result.addFailure( &test1, new CppUnit::Exception( "message failure1", 
-                                                     sourceLine ) );
-  result.endTest( &test1 );
+  addTestFailure( "test1", "message failure1", CppUnit::SourceLine( "test.cpp", 3 ) );
 
   CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( &result, stream );
+  CppUnit::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -175,14 +174,10 @@ XmlOutputterTest::testWriteXmlResultWithOneFailure()
 void 
 XmlOutputterTest::testWriteXmlResultWithOneError()
 {
-  CppUnit::TestResult result;
-  CppUnit::TestCase test1( "test1" );
-  result.startTest( &test1 );
-  result.addError( &test1, new CppUnit::Exception( "message error1" ) );
-  result.endTest( &test1 );
+  addTestError( "test1", "message error1" );
 
   CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( &result, stream );
+  CppUnit::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -210,13 +205,10 @@ XmlOutputterTest::testWriteXmlResultWithOneError()
 void 
 XmlOutputterTest::testWriteXmlResultWithOneSucess()
 {
-  CppUnit::TestResult result;
-  CppUnit::TestCase test1( "test1" );
-  result.startTest( &test1 );
-  result.endTest( &test1 );
+  addTest( "test1" );
 
   CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( &result, stream );
+  CppUnit::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -242,36 +234,16 @@ XmlOutputterTest::testWriteXmlResultWithOneSucess()
 void 
 XmlOutputterTest::testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSucess()
 {
-  CppUnit::TestCase test1( "test1" );
-  CppUnit::TestCase test2( "test2" );
-  CppUnit::TestCase test3( "test3" );
-  CppUnit::TestCase test4( "test4" );
-  CppUnit::TestCase test5( "test5" );
-  CppUnit::TestCase test6( "test6" );
-  CppUnit::TestCase test7( "test7" );
-  CppUnit::TestResult result;
-  result.startTest( &test1 );
-  result.addFailure( &test1, new CppUnit::Exception( "failure1" ) );
-  result.endTest( &test1 );
-  result.startTest( &test2 );
-  result.addError( &test2, new CppUnit::Exception( "error1" ) );
-  result.endTest( &test2 );
-  result.startTest( &test3 );
-  result.addFailure( &test3, new CppUnit::Exception( "failure2" ) );
-  result.endTest( &test3 );
-  result.startTest( &test4 );
-  result.addFailure( &test4, new CppUnit::Exception( "failure3" ) );
-  result.endTest( &test4 );
-  result.startTest( &test5 );
-  result.endTest( &test5 );
-  result.startTest( &test6 );
-  result.addError( &test6, new CppUnit::Exception( "error2" ) );
-  result.endTest( &test6 );
-  result.startTest( &test7 );
-  result.endTest( &test7 );
+  addTestFailure( "test1", "failure1" );
+  addTestError( "test2", "error1" );
+  addTestFailure( "test3", "failure2" );
+  addTestFailure( "test4", "failure3" );
+  addTest( "test5" );
+  addTestError( "test6", "error2" );
+  addTest( "test7" );
 
   CppUnit::OStringStream stream;
-  CppUnit::XmlOutputter outputter( &result, stream );
+  CppUnit::XmlOutputter outputter( m_result, stream );
   outputter.write();
 
   std::string actualXml = stream.str();
@@ -320,4 +292,56 @@ XmlOutputterTest::testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSucess()
       "</Statistics>"
     "</TestRun>";
   CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml );
-}
\ No newline at end of file
+}
+
+
+void 
+XmlOutputterTest::addTest( std::string testName )
+{
+  CppUnit::Test *test = makeDummyTest( testName );
+  m_result->startTest( test );
+  m_result->endTest( test );
+}
+
+
+void 
+XmlOutputterTest::addTestFailure( std::string testName,
+                                  std::string message,
+                                  CppUnit::SourceLine sourceLine )
+{
+  addGenericTestFailure( testName, message, sourceLine, false );
+}
+
+
+void 
+XmlOutputterTest::addTestError( std::string testName,
+                                std::string message,
+                                CppUnit::SourceLine sourceLine )
+{
+  addGenericTestFailure( testName, message, sourceLine, true );
+}
+
+
+void 
+XmlOutputterTest::addGenericTestFailure(  std::string testName,
+                                          std::string message,
+                                          CppUnit::SourceLine sourceLine,
+                                          bool isError )
+{
+  CppUnit::Test *test = makeDummyTest( testName );
+  m_result->startTest( test );
+  CppUnit::TestFailure failure( test, 
+                                new CppUnit::Exception( message, sourceLine ),
+                                isError );
+  m_result->addFailure( failure );
+  m_result->endTest( test );
+}
+
+
+CppUnit::Test *
+XmlOutputterTest::makeDummyTest( std::string testName )
+{
+  CppUnit::Test *test = new CppUnit::TestCase( testName );
+  m_dummyTests.push_back( test );
+  return test;
+}