rename some structure and function

diff --git a/src/ccunit/CCUnitMakeSuite.h b/src/ccunit/CCUnitMakeSuite.h
index dd29737..0d2fdb5 100644 (file)
--- a/src/ccunit/CCUnitMakeSuite.h
+++ b/src/ccunit/CCUnitMakeSuite.h
@@ -35,6 +35,7 @@ typedef struct CCUnitTestDef
 {
   CCUnitTestType_t type;                       /**< test type */
   char* name;                                  /**< test name */
+  void (*dtor) (struct CCUnitTestDef*);                /**< test destcuctor  */
 } CCUnitTestDef;
 
 /**
@@ -42,39 +43,47 @@ typedef struct CCUnitTestDef
  */
 typedef struct CCUnitTestSuiteDef
 {
-  CCUnitTestDef super;                         /**< super class */
+  CCUnitTestDef testdef;                       /**< super class */
   CCUnitList testdefs;                         /**< test defs list */
 } CCUnitTestSuiteDef;
 
 /**
- * Test function definition information.
+ * Test fixture definition information.
  */
-typedef struct CCUnitTestFuncDef
+typedef struct CCUnitTestFixtureDef
 {
   char* type;                                  /**< return type */
   char* name;                                  /**< function name */
   char* desc;                                  /**< description */
-} CCUnitTestFuncDef;
+} CCUnitTestFixtureDef;
 
 /**
  * Test case definition information.
  */
 typedef struct CCUnitTestCaseDef
 {
-  CCUnitTestDef super;                         /**< super class */
-  CCUnitTestFuncDef* runTest;                  /**< test run function */
-  CCUnitTestFuncDef* setUp;                    /**< test setup function */
-  CCUnitTestFuncDef* tearDown;                 /**< test tearDown function */
+  CCUnitTestDef testdef;                       /**< super class */
   char* desc;                                  /**< test case description */
+  CCUnitList fixtures;                         /**< test fixture list */
+  CCUnitTestFixtureDef* setUp;                 /**< test setup function */
+  CCUnitTestFixtureDef* tearDown;              /**< test tearDown function */
 } CCUnitTestCaseDef;
 
 /**
+ * create new test suite def.
+ *
+ * @param name suite name.
+ * @return created testdef.
+ */
+extern CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name);
+
+/**
  * read test unit suite from specified stream.
  *
  * @param fname test unit source code file.
  * @param suite [out] test suite to read.
  */
-extern void ccunit_readTestDef (const char* fname, CCUnitTestSuiteDef* suite);
+extern void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* parent);
 
 /**
  * output test suite add function.
@@ -83,17 +92,9 @@ extern void ccunit_readTestDef (const char* fname, CCUnitTestSuiteDef* suite);
  * @param name add function name.
  * @param suite test suite to print.
  */
-extern void ccunit_writeTestAdd (FILE* ofp,
-                                const char* name,
-                                CCUnitTestSuiteDef* suite);
-
-/**
- * create new test suite def.
- *
- * @param name suite name.
- * @return created testdef.
- */
-extern CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name);
+extern void ccunit_writeSuite (FILE* ofp,
+                              const char* name,
+                              CCUnitTestSuiteDef* suite);
 
 /**
  * delete test suite def.