OSDN Git Service

ctor/dtor is deleted.
authortsutsumi <>
Wed, 1 Oct 2003 20:50:58 +0000 (20:50 +0000)
committertsutsumi <>
Wed, 1 Oct 2003 20:50:58 +0000 (20:50 +0000)
src/ccunit/CCUnitTestFixture.h

index e0ea12a..568c9d3 100644 (file)
@@ -128,10 +128,8 @@ typedef struct CCUnitTestFixture
 {
   CCUnitTest test;                             /**< super class */
   const char* name;                            /**< test fixture name */
-  void (*ctor) ();                             /**< constructor */
-  void (*dtor) ();                             /**< destructor */
-  void (*setUp) ();                            /**< setUp function */
-  void (*tearDown) ();                         /**< tearDown function */
+  CCUnitTestFunc* setUp;                       /**< setUp function */
+  CCUnitTestFunc* tearDown;                    /**< tearDown function */
   CCUnitList testCases;                                /**< test cases */
 } CCUnitTestFixture;
 
@@ -142,11 +140,9 @@ typedef struct CCUnitTestFixtureDfn
 {
   CCUnitTestDfn test;                          /**< super class */
   const char* name;                            /**< test fixture name */
-  void (*ctor) ();                             /**< constructor */
-  void (*dtor) ();                             /**< destructor */
-  void (*setUp) ();                            /**< setUp function */
-  void (*tearDown) ();                         /**< tearDown function */
-  CCUnitTestCase testCases[];                  /**< test cases */
+  CCUnitTestFunc setUp;                                /**< setUp function */
+  CCUnitTestFunc tearDown;                     /**< tearDown function */
+  CCUnitTestFunc testCases[];                  /**< test cases */
 } CCUnitTestFixtureDfn;
 
 /**
@@ -155,16 +151,12 @@ typedef struct CCUnitTestFixtureDfn
  * @param name test fixture name.
  * @param setUp test fixture setUp function.
  * @param tearDown test fixture tearDown function.
- * @param ctor constructor.
- * @param dtor destrocutor.
  * @return new test fixture.
  * @ingroup WritingTestFixture
  */
 extern CCUnitTestFixture* ccunit_newTestFixture (const char* name,
-                                                void (*setUp)(),
-                                                void (*tearDown)(),
-                                                void (*ctor)(),
-                                                void (*dtor)());
+                                                CCUnitTestFunc* setUp,
+                                                CCUnitTestFunc* tearDown);
 
 /**
  * add test case to test fixture.