Revert TestFixture-related changes from 2001-07-15.

3 files changed, 8 insertions, 8 deletions

diff --git a/include/cppunit/Makefile.am b/include/cppunit/Makefile.am
index 7cd590d..8dd451c 100644
--- a/include/cppunit/Makefile.am
+++ b/include/cppunit/Makefile.am
@@ -12,7 +12,6 @@ libcppunitinclude_HEADERS =  \
 	Portability.h \
 	Test.h \
 	TestAssert.h \
-	TestFixture.h \
 	TestCase.h \
 	TestCaller.h \
 	TestFailure.h \
diff --git a/include/cppunit/TestCaller.h b/include/cppunit/TestCaller.h
index 65ae00c..ab7b63f 100644
--- a/include/cppunit/TestCaller.h
+++ b/include/cppunit/TestCaller.h
@@ -3,7 +3,6 @@
 
 #include <cppunit/Exception.h>
 #include <cppunit/TestCase.h>
-#include <cppunit/TestFixture.h>
 
 
 #if CPPUNIT_USE_TYPEINFO_NAME
diff --git a/include/cppunit/TestCase.h b/include/cppunit/TestCase.h
index e8767f9..1c2ee53 100644
--- a/include/cppunit/TestCase.h
+++ b/include/cppunit/TestCase.h
@@ -4,7 +4,6 @@
 #include <cppunit/Portability.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
 #include <string>
 
 
@@ -13,15 +12,14 @@ namespace CppUnit {
 class TestResult;
 
 
+/* FIXME: most of this documentation belongs to proposed class Fixture.
+ */
+
 /*! \brief A single test object.
  *
  * This class is used to implement a simple test case: define a subclass
  * that overrides the runTest method.
  *
- */
-
-/* FIXME: this documentation belongs to proposed class Fixture.
- *
  * A test case defines the fixture to run multiple tests. 
  * To define a test case
  * do the following:
@@ -91,7 +89,7 @@ class TestResult;
  *
  */
 
-class TestCase : public Test, public TestFixture
+class TestCase : public Test
 {
 public:
 
@@ -108,6 +106,10 @@ public:
     //! FIXME: what is this for?
     virtual TestResult  *run             ();
 
+    // FIXME: move back to class TestFixture, in future.
+    virtual void        setUp            ();
+    virtual void        tearDown         ();
+ 
     
 protected:
     //! FIXME: this should probably be pure virtual.