Include/cppunit/Portability.

include/cppunit/Portability.h: added CPPUNIT_STATIC_CAST.

* include/cppunit/extensions/TestFixtureFactory.h: extracted from
HelperMacros.h. Added template class ConcretTestFixtureFactory.

* include/cppunit/extensions/TestSuiteBuilderContext.h:
* src/cppunit/TestSuiteBuilderContext.cpp: added. Context used
to add test case to the fixture suite. Prevent future
compatibility break for custom test API.

* include/cppunit/extensions/HelperMacros.h: mostly rewritten. No
longer use TestSuiteBuilder. Added support for abstract test fixture
through macro CPPUNIT_TEST_SUITE_END_ABSTRACT. Made custom test API
easier to use.

* examples/cppunittest/HelperMacrosTest.h:
* examples/cppunittest/HelperMacrosTest.cpp: updated against
HelperMacros.h changes.

1 files changed, 10 insertions, 39 deletions

diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp
index 4300db6..1bf73b0 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -60,46 +60,29 @@ public:
 };
 
 
-class CustomTestTestFixture : public CPPUNIT_NS::TestFixture
-{
-  CPPUNIT_TEST_SUITE( CustomTestTestFixture );
-  CPPUNIT_TEST_CUSTOM( makeCustomTest );
-  CPPUNIT_TEST_SUITE_END();
-public:
-  static CPPUNIT_NS::Test *makeCustomTest( const ThisTestFixtureFactory &factory,
-                                           const CPPUNIT_NS::TestNamer &namer )
-  {
-    MockTestCase *test = new MockTestCase( namer.getTestNameFor( "myCustomTest" ) );
-    test->makeRunTestThrow();
-    return test;
-  }
-};
-
-
 class CustomsTestTestFixture : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( CustomsTestTestFixture );
-  CPPUNIT_TEST_CUSTOMS( addCustomTests );
+  CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( addCustomTests );
   CPPUNIT_TEST_SUITE_END();
 public:
-  static void addCustomTests( CPPUNIT_NS::TestSuite *suite,
-                              const ThisTestFixtureFactory &factory,
-                              const CPPUNIT_NS::TestNamer &namer )
+  static void addCustomTests( TestSuiteBuilderContextType &context )
   {
-    MockTestCase *test1 = new MockTestCase( namer.getTestNameFor( "myCustomTest1" ) );
+    MockTestCase *test1 = new MockTestCase( context.getTestNameFor( "myCustomTest1" ) );
     test1->makeRunTestThrow();
-    MockTestCase *test2 = new MockTestCase( namer.getTestNameFor( "myCustomTest2" ) );
-    suite->addTest( test1 );
-    suite->addTest( test2 );
+    MockTestCase *test2 = new MockTestCase( context.getTestNameFor( "myCustomTest2" ) );
+    context.addTest( test1 );
+    context.addTest( test2 );
   }
 };
 
 
 #undef TEST_ADD_N_MOCK
 #define TEST_ADD_N_MOCK( totalCount )                                              \
-  {                                                                                \
-    for ( int count = (totalCount); count > 0; --count )                           \
-      CPPUNIT_TEST_ADD( new MockTestCase( namer.getTestNameFor( "dummyName" ) ) ); \
+  {                                                                 \
+    for ( int count = (totalCount); count > 0; --count )            \
+      CPPUNIT_TEST_SUITE_ADD_TEST(                                  \
+         new MockTestCase( context.getTestNameFor( "dummyName" ) ) ); \
   }
 
 
@@ -220,18 +203,6 @@ HelperMacrosTest::testExceptionNotCaught()
 
 
 void 
-HelperMacrosTest::testCustomTest()
-{
-  std::auto_ptr<CPPUNIT_NS::TestSuite> suite( CustomTestTestFixture::suite() );
-  m_testListener->setExpectedStartTestCall( 1 );
-  m_testListener->setExpectedAddFailureCall( 1 );
-
-  suite->run( m_result );
-  m_testListener->verify();
-}
-
-
-void 
 HelperMacrosTest::testCustomTests()
 {
   std::auto_ptr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() );