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.

4 files changed, 75 insertions, 1 deletions

diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 909d061..5d6703c 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am,v 1.41 2002-08-27 22:00:54 blep Exp $
+# $Id: Makefile.am,v 1.42 2002-08-28 22:20:52 blep Exp $
 #
 
 EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp
@@ -47,6 +47,7 @@ libcppunit_la_SOURCES = \
   TestSetUp.cpp \
   TestSuccessListener.cpp \
   TestSuite.cpp \
+  TestSuiteBuilderContext.cpp \
   TextOutputter.cpp \
   TextTestProgressListener.cpp \
   TextTestResult.cpp \
diff --git a/src/cppunit/TestSuiteBuilderContext.cpp b/src/cppunit/TestSuiteBuilderContext.cpp
new file mode 100644
index 0000000..259dec0
--- /dev/null
+++ b/src/cppunit/TestSuiteBuilderContext.cpp
@@ -0,0 +1,49 @@
+#include <cppunit/TestSuite.h>
+#include <cppunit/extensions/TestFixtureFactory.h>
+#include <cppunit/extensions/TestNamer.h>
+#include <cppunit/extensions/TestSuiteBuilderContext.h>
+
+
+CPPUNIT_NS_BEGIN
+
+TestSuiteBuilderContextBase::TestSuiteBuilderContextBase( 
+                                 TestSuite &suite,
+                                 const TestNamer &namer,
+                                 TestFixtureFactory &factory )
+  : m_suite( suite )
+  , m_namer( namer )
+  , m_factory( factory )
+{
+}
+
+
+void 
+TestSuiteBuilderContextBase::addTest( Test *test )
+{
+  m_suite.addTest( test );
+}
+
+
+std::string 
+TestSuiteBuilderContextBase::getFixtureName() const
+{
+  return m_namer.getFixtureName();
+}
+
+
+std::string 
+TestSuiteBuilderContextBase::getTestNameFor( 
+                                 const std::string &testMethodName ) const
+{
+  return m_namer.getTestNameFor( testMethodName );
+}
+
+
+TestFixture *
+TestSuiteBuilderContextBase::makeTestFixture() const
+{
+  return m_factory.makeFixture();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index 285a2b3..50326de 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -464,6 +464,10 @@ SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\cppunit\extensions\TestFixtureFactory.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\TestNamer.cpp
 # End Source File
 # Begin Source File
@@ -476,6 +480,14 @@ SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\TestSuiteBuilderContext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilderContext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h
 # End Source File
 # Begin Source File
diff --git a/src/cppunit/cppunit_dll.dsp b/src/cppunit/cppunit_dll.dsp
index d4cbabb..0fa5f4d 100644
--- a/src/cppunit/cppunit_dll.dsp
+++ b/src/cppunit/cppunit_dll.dsp
@@ -187,6 +187,10 @@ SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\cppunit\extensions\TestFixtureFactory.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\TestNamer.cpp
 # End Source File
 # Begin Source File
@@ -199,6 +203,14 @@ SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\TestSuiteBuilderContext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilderContext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h
 # End Source File
 # Begin Source File