modify the explanation of the sample file.

delete the explanation of TestFixture.

diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index 6d8fe0d..f8318f2 100644 (file)
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -87,23 +87,24 @@ examples 
   - libcomplex.a - complex number library
     - complex.c
     - complex.h
-  - runTestFixture @~japanese - ¤â¤Ã¤È¤âñ½ã¤Ê¥Æ¥¹¥È¥±¡¼¥¹¤ò¼Â¹Ô¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
-    - runTestFixture.c - main program
+  - runTestCase @~japanese - ¤â¤Ã¤È¤âñ½ã¤Ê¥Æ¥¹¥È¥±¡¼¥¹¤ò¼Â¹Ô¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
+    - runTestCase.c - main program
     - testComplex.c - test cases
+  - runTestCaseSetup @~japanese - ¥Æ¥¹¥È¥±¡¼¥¹¤Î½é´ü²½´Ø¿ô¤ò¼«Æ°¸Æ¤Ó½Ð¤·¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
+    - runTestCase.c - main program
+    - testComplexSetup.c - test cases
   - runTestSuite @~japanese - ¥Æ¥¹¥È¥¹¡¼¥Ä¤Î¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
     - runTestSuite.c - main program
-    - testComplex.c - test cases
-    - testComplexMulDiv.c - test cases
-    - complexTestSuite.c - create test suite function
+    - testComplexSetup.c - test cases
+    - testComplexArith.c - test cases
+  - runTestSuiteAuto @~japanese - ¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¼«Æ°À¸À®¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
+    - runTestSuite.c - main program
+    - testComplexSetup.c - test cases
+    - suiteTestComplex.c - auto generated test suite from testComplexSetup.c
   - runTestRunner @~japanese - ¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¥Æ¥¹¥È¥é¥ó¥Ê¡¼¤Ç¼Â¹Ô¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
     - runTestRunner.c - main program
-    - testComplex.c - test cases
-    - testComplexMulDiv.c - test cases
-    - complexTestSuite.c - create test suite function
-  - runTest @~japanese - ¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¼«Æ°À¸À®¤¹¤ë¥µ¥ó¥×¥ë¤Ç¤¹¡£@~
-    - runTest.c - main program
-    - testComplex.c - test cases
-    - suiteComplex.c - auto generated test suite from testComplex.c
+    - testComplexSetup.c - test cases
+    - suiteTestComplex.c - auto generated test suite from testComplexSetup.c
 
 @english
 @section _documentation Documentation
@@ -200,37 +201,37 @@ This library is released under the GNU
 /**
  * @english
  * @defgroup Construction Construction
- * CCUnit manages test suites, test fixtures, test cases.
+ * CCUnit manages test suites, and test cases.
  * @japanese
  * @defgroup Construction ¹½À®
- * CCUnit ¤Ï¥Æ¥¹¥È¥¹¡¼¥Ä¡¢¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¡¢¥Æ¥¹¥È¥±¡¼¥¹¤ò´ÉÍý¤·¤Þ¤¹¡£
+ * CCUnit ¤Ï¥Æ¥¹¥È¥¹¡¼¥Ä¡¢¥Æ¥¹¥È¥±¡¼¥¹¡¢¥Æ¥¹¥È´Ø¿ô¤«¤é¹½À®¤µ¤ì¤Þ¤¹¡£
  * @endif
  * @dot
 digraph CCUnitTestStructure {
   node [ fontsize=9, fontname=Helvetica ];
   edge [ dir=back, fontsize=9 ];
   TestSuite -> TestSuite [ label="1..n" ];
-  TestSuite -> TestFixture [ label="1..n" ];
-  TestFixture -> setUp [ label="0..1" ];
-  TestFixture -> TestCase [ label="1..n" ];
-  TestFixture -> tearDown [ label="0..1" ];
+  TestSuite -> TestCase [ label="1..n" ];
+  TestCase -> setUp [ label="0..1" ];
+  TestCase -> TestFunc [ label="1..n" ];
+  TestCase -> tearDown [ label="0..1" ];
 }
  * @enddot
  *
  * @english
- * Test cases are packaged into a fixture. Fixtures packaged
+ * Test functions are packaged into a test case. Test cases packaged
  * into a suite. And suites are packaged into a suite.
- * Fixtures can have @c setUp and @c tearDown functions
+ * Test case can have @c setUp and @c tearDown functions
  * which are called before and after running the test cases.
  * @japanese
- * ¤¤¤¯¤Ä¤«¤Î¥Æ¥¹¥È¥±¡¼¥¹¤Ï¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤Ë¤Þ¤È¤á¤é¤ì¡¢
- * ¤Þ¤¿¤¤¤¯¤Ä¤«¤Î¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤Ï¥Æ¥¹¥È¥¹¡¼¥Ä¤Ë¤Þ¤È¤á¤é¤ì¤Þ¤¹¡£
- * ¤½¤·¤Æ¥Æ¥¹¥È¥¹¡¼¥Ä¤â¤Þ¤¿¥Æ¥¹¥È¥¹¡¼¥Ä¤Ë¤Þ¤È¤á¤é¤ì¤Þ¤¹¡£
+ * Ê£¿ô¤Î¥Æ¥¹¥È´Ø¿ô¤Ï¥Æ¥¹¥È¥±¡¼¥¹¤Ë¤Þ¤È¤á¤é¤ì¡¢
+ * ¤¤¤¯¤Ä¤«¤Î¥Æ¥¹¥È¥±¡¼¥¹¤Ï¥Æ¥¹¥È¥¹¡¼¥Ä¤Ë¤Þ¤È¤á¤é¤ì¤Þ¤¹¡£
+ * ¤½¤·¤Æ¥Æ¥¹¥È¥¹¡¼¥Ä¤â¤Þ¤¿¥Æ¥¹¥È¥¹¡¼¥Ä¤Ë¤Þ¤È¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
  * ¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¼Â¹Ô¤¹¤ë¤È¡¢¤½¤ì¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤ë¥Æ¥¹¥È¥¹¡¼¥Ä¡¢
- * ¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤¬½çÈ֤˼¹Ԥµ¤ì¤Þ¤¹¡£
- * ¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤Ë¤Ï @c setUp ¤È @c tearDown ´Ø¿ô¤òÅÐÏ¿¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢
- * ¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤Ë¤Ï¡¢
- * ¤½¤ì¤¾¤ì¤Î¥Æ¥¹¥È¥±¡¼¥¹¤ò¼Â¹Ô¤¹¤ëÁ°¤È¸å¤Ë¡¢
+ * ¥Æ¥¹¥È¥±¡¼¥¹¡¢¥Æ¥¹¥È´Ø¿ô¤¬ÅÐÏ¿¤µ¤ì¤¿½ç¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+ * ¥Æ¥¹¥È¥±¡¼¥¹¤Ë¤Ï @c setUp ¤È @c tearDown ´Ø¿ô¤òÅÐÏ¿¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢
+ * ¥Æ¥¹¥È¥±¡¼¥¹¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤Ë¤Ï¡¢
+ * ¤½¤ì¤¾¤ì¤Î¥Æ¥¹¥È´Ø¿ô¤ò¼Â¹Ô¤¹¤ëÁ°¤È¸å¤Ë¡¢
  * @c setUp ¤È @c teaDown ¤¬¼«Æ°Åª¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
  * @endif
  */
@@ -240,17 +241,15 @@ digraph CCUnitTestStructure {
  * @defgroup Assertions Making assertions
  * @japanese
  * @defgroup Assertions ¥¢¥µ¡¼¥È¤ÎÀë¸À
- * ¥Æ¥¹¥È¥±¡¼¥¹¤Ç»ÈÍѤ¹¤ë¥¢¥µ¡¼¥È¥Þ¥¯¥í¤Ç¤¹¡£
+ * ¥Æ¥¹¥È´Ø¿ô¤Ç»ÈÍѤ¹¤ë¥¢¥µ¡¼¥È¥Þ¥¯¥í¤Ç¤¹¡£
  * @endif
  */
 
 /**
  * @english
- * @defgroup WritingTestFixture Writing test fixture
+ * @defgroup WritingTestCase Writing test case
  * @japanese
- * @defgroup WritingTestFixture ¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤ò½ñ¤¯
- * °ìÏ¢¤Î¥Æ¥¹¥È¥±¡¼¥¹¤ò¡¢
- * ½àÈ÷¤ò¤¹¤ë´Ø¿ô¤È¸å½èÍý¤ò¤¹¤ë´Ø¿ô¤Ç¤Þ¤È¤á¤¿¤â¤Î¤ò¥Õ¥£¥¯¥¹¥Á¥ã¤È¸Æ¤Ó¤Þ¤¹¡£
+ * @defgroup WritingTestCase ¥Æ¥¹¥È¥±¡¼¥¹¤ò½ñ¤¯
  * @endif
  */
 
@@ -259,7 +258,7 @@ digraph CCUnitTestStructure {
  * @defgroup CreatingTestSuite Creating TestSuite
  * @japanese
  * @defgroup CreatingTestSuite ¥Æ¥¹¥È¥¹¡¼¥Ä¤ÎÀ¸À®
- * ¤¤¤¯¤Ä¤«¤Î¥Æ¥¹¥È¥Õ¥£¥¯¥¹¥Á¥ã¤ä¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¤Þ¤È¤á¤Æ¡¢
+ * ¤¤¤¯¤Ä¤«¤Î¥Æ¥¹¥È¥±¡¼¥¹¤ä¥Æ¥¹¥È¥¹¡¼¥Ä¤ò¤Þ¤È¤á¤Æ¡¢
  * ¤Ò¤È¤Ä¤Î¥Æ¥¹¥È¥¹¡¼¥Ä¤Ë¤·¤Þ¤¹¡£
  * @endif
  * @sa CCUnitMakeSuite