rewrite tokenchecker's unit test for new driver.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchanf/trunk@342 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/parse/test_parse.h b/src/parse/test_parse.h
index 7ea81e1..3863cb2 100644 (file)
--- a/src/parse/test_parse.h
+++ b/src/parse/test_parse.h
@@ -30,6 +30,7 @@
 #ifndef __TEST_PARSE_H__
 #define __TEST_PARSE_H__
 
+IMPORT VOID test_tokenchecker_main(unittest_driver_t *driver);
 IMPORT VOID test_charreferparser_main(unittest_driver_t *driver);
 
 #endif

diff --git a/src/parse/test_parselib.c b/src/parse/test_parselib.c
index 4ae8553..1e5b886 100644 (file)
--- a/src/parse/test_parselib.c
+++ b/src/parse/test_parselib.c
@@ -1,7 +1,7 @@
 /*
  * test_parselib.c
  *
- * Copyright (c) 2009-2011 project bchan
+ * Copyright (c) 2009-2012 project bchan
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,14 +24,16 @@
  *
  */
 
+#include "test_parse.h"
+
+#include "parselib.h"
+
 #include    <btron/btron.h>
 #include    <bstdio.h>
 #include    <bstring.h>
 #include    <bstdlib.h>
 
-#include    "test.h"
-
-#include    "parselib.h"
+#include    <unittest_driver.h>
 
 LOCAL tokenchecker_valuetuple_t test_tokenchecker_testdata_tuple_0001[] = {
        {"aaa", 1},
@@ -44,7 +46,7 @@ LOCAL tokenchecker_valuetuple_t test_tokenchecker_testdata_tuple_0001[] = {
 };
 LOCAL UB test_tokenchecker_testdata_etoken_0001[] = ":>";
 
-LOCAL TEST_RESULT test_tokenchecker_1()
+LOCAL UNITTEST_RESULT test_tokenchecker_1()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -63,7 +65,7 @@ LOCAL TEST_RESULT test_tokenchecker_1()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -78,38 +80,38 @@ LOCAL TEST_RESULT test_tokenchecker_1()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 1) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_2()
+LOCAL UNITTEST_RESULT test_tokenchecker_2()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -128,7 +130,7 @@ LOCAL TEST_RESULT test_tokenchecker_2()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -143,38 +145,38 @@ LOCAL TEST_RESULT test_tokenchecker_2()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 2) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_3()
+LOCAL UNITTEST_RESULT test_tokenchecker_3()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -193,7 +195,7 @@ LOCAL TEST_RESULT test_tokenchecker_3()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -208,38 +210,38 @@ LOCAL TEST_RESULT test_tokenchecker_3()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 3) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_4()
+LOCAL UNITTEST_RESULT test_tokenchecker_4()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -258,7 +260,7 @@ LOCAL TEST_RESULT test_tokenchecker_4()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -273,38 +275,38 @@ LOCAL TEST_RESULT test_tokenchecker_4()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 4) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_5()
+LOCAL UNITTEST_RESULT test_tokenchecker_5()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -323,7 +325,7 @@ LOCAL TEST_RESULT test_tokenchecker_5()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -338,38 +340,38 @@ LOCAL TEST_RESULT test_tokenchecker_5()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 5) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_6()
+LOCAL UNITTEST_RESULT test_tokenchecker_6()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -388,7 +390,7 @@ LOCAL TEST_RESULT test_tokenchecker_6()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -403,38 +405,38 @@ LOCAL TEST_RESULT test_tokenchecker_6()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 6) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_7()
+LOCAL UNITTEST_RESULT test_tokenchecker_7()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -453,7 +455,7 @@ LOCAL TEST_RESULT test_tokenchecker_7()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -468,38 +470,38 @@ LOCAL TEST_RESULT test_tokenchecker_7()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_inputchar fail: end character\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 7) {
                printf("tokenchecker_inputchar fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_nomatch_getlastmatchedstring_sequence(tokenchecker_t *checker, W num, UB *teststr, W teststr_len)
+LOCAL UNITTEST_RESULT test_tokenchecker_nomatch_getlastmatchedstring_sequence(tokenchecker_t *checker, W num, UB *teststr, W teststr_len)
 {
        W i, j, len2, ret, val;
        UB *str2;
@@ -508,18 +510,18 @@ LOCAL TEST_RESULT test_tokenchecker_nomatch_getlastmatchedstring_sequence(tokenc
                ret = tokenchecker_inputchar(checker, teststr[i], &val);
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_inputchar(checker, 'z', &val);
        if (ret != TOKENCHECKER_CONTINUE_NOMATCH) {
                printf("tokenchecker_inputchar fail: nomatch char\n");
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(checker, &str2, &len2);
        if (len2 != num) {
                printf("tokenchecker_getlastmatchedstring fail: length\n");
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (strncmp(teststr, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: nomatch string\n");
@@ -532,18 +534,18 @@ LOCAL TEST_RESULT test_tokenchecker_nomatch_getlastmatchedstring_sequence(tokenc
                        printf("%c", str2[j]);
                }
                printf("\n");
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_8()
+LOCAL UNITTEST_RESULT test_tokenchecker_8()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[0].name);
        len = strlen(str);
@@ -555,7 +557,7 @@ LOCAL TEST_RESULT test_tokenchecker_8()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -563,15 +565,15 @@ LOCAL TEST_RESULT test_tokenchecker_8()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_9()
+LOCAL UNITTEST_RESULT test_tokenchecker_9()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[1].name);
        len = strlen(str);
@@ -583,7 +585,7 @@ LOCAL TEST_RESULT test_tokenchecker_9()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -591,15 +593,15 @@ LOCAL TEST_RESULT test_tokenchecker_9()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_10()
+LOCAL UNITTEST_RESULT test_tokenchecker_10()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[2].name);
        len = strlen(str);
@@ -611,7 +613,7 @@ LOCAL TEST_RESULT test_tokenchecker_10()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -619,15 +621,15 @@ LOCAL TEST_RESULT test_tokenchecker_10()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_11()
+LOCAL UNITTEST_RESULT test_tokenchecker_11()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[3].name);
        len = strlen(str);
@@ -639,7 +641,7 @@ LOCAL TEST_RESULT test_tokenchecker_11()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -647,15 +649,15 @@ LOCAL TEST_RESULT test_tokenchecker_11()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_12()
+LOCAL UNITTEST_RESULT test_tokenchecker_12()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[4].name);
        len = strlen(str);
@@ -667,7 +669,7 @@ LOCAL TEST_RESULT test_tokenchecker_12()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -675,15 +677,15 @@ LOCAL TEST_RESULT test_tokenchecker_12()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_13()
+LOCAL UNITTEST_RESULT test_tokenchecker_13()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[5].name);
        len = strlen(str);
@@ -695,7 +697,7 @@ LOCAL TEST_RESULT test_tokenchecker_13()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -703,15 +705,15 @@ LOCAL TEST_RESULT test_tokenchecker_13()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_14()
+LOCAL UNITTEST_RESULT test_tokenchecker_14()
 {
        tokenchecker_t checker;
        W i,len;
        UB *str;
-       TEST_RESULT result;
+       UNITTEST_RESULT result;
 
        str = strdup(test_tokenchecker_testdata_tuple_0001[6].name);
        len = strlen(str);
@@ -723,7 +725,7 @@ LOCAL TEST_RESULT test_tokenchecker_14()
 
        for (i = 1; i < len; i++) {
                result = test_tokenchecker_nomatch_getlastmatchedstring_sequence(&checker, i, str, len);
-               if (result != TEST_RESULT_PASS) {
+               if (result != UNITTEST_RESULT_PASS) {
                        return result;
                }
                tokenchecker_clear(&checker);
@@ -731,12 +733,12 @@ LOCAL TEST_RESULT test_tokenchecker_14()
 
        free(str);
 
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
 /* testing endinput */
 
-LOCAL TEST_RESULT test_tokenchecker_15()
+LOCAL UNITTEST_RESULT test_tokenchecker_15()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -755,7 +757,7 @@ LOCAL TEST_RESULT test_tokenchecker_15()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -770,38 +772,38 @@ LOCAL TEST_RESULT test_tokenchecker_15()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 1) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_16()
+LOCAL UNITTEST_RESULT test_tokenchecker_16()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -820,7 +822,7 @@ LOCAL TEST_RESULT test_tokenchecker_16()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -835,38 +837,38 @@ LOCAL TEST_RESULT test_tokenchecker_16()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 2) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_17()
+LOCAL UNITTEST_RESULT test_tokenchecker_17()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -885,7 +887,7 @@ LOCAL TEST_RESULT test_tokenchecker_17()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -900,38 +902,38 @@ LOCAL TEST_RESULT test_tokenchecker_17()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 3) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_18()
+LOCAL UNITTEST_RESULT test_tokenchecker_18()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -950,7 +952,7 @@ LOCAL TEST_RESULT test_tokenchecker_18()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -965,38 +967,38 @@ LOCAL TEST_RESULT test_tokenchecker_18()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 4) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_19()
+LOCAL UNITTEST_RESULT test_tokenchecker_19()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -1015,7 +1017,7 @@ LOCAL TEST_RESULT test_tokenchecker_19()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -1030,38 +1032,38 @@ LOCAL TEST_RESULT test_tokenchecker_19()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 5) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_20()
+LOCAL UNITTEST_RESULT test_tokenchecker_20()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -1080,7 +1082,7 @@ LOCAL TEST_RESULT test_tokenchecker_20()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -1095,38 +1097,38 @@ LOCAL TEST_RESULT test_tokenchecker_20()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 6) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
+       return UNITTEST_RESULT_PASS;
 }
 
-LOCAL TEST_RESULT test_tokenchecker_21()
+LOCAL UNITTEST_RESULT test_tokenchecker_21()
 {
        tokenchecker_t checker;
        W i, j, len, len2, val, ret;
@@ -1145,7 +1147,7 @@ LOCAL TEST_RESULT test_tokenchecker_21()
                if (ret != TOKENCHECKER_CONTINUE) {
                        printf("tokenchecker_inputchar fail: right string\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
                tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
                if (strncmp(str, str2, len2) != 0) {
@@ -1160,73 +1162,58 @@ LOCAL TEST_RESULT test_tokenchecker_21()
                        }
                        printf("\n");
                        free(str);
-                       return TEST_RESULT_FAIL;
+                       return UNITTEST_RESULT_FAIL;
                }
        }
        ret = tokenchecker_endinput(&checker, &val);
        if (ret != TOKENCHECKER_DETERMINE) {
                printf("tokenchecker_endinput fail\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        if (val != 7) {
                printf("tokenchecker_endinput fail: select value\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        tokenchecker_getlastmatchedstring(&checker, &str2, &len2);
        if (strncmp(str, str2, len2) != 0) {
                printf("tokenchecker_getlastmatchedstring fail: end token\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
        ret = tokenchecker_inputchar(&checker, ':', &val);
        if (ret != TOKENCHECKER_AFTER_END) {
                printf("tokenchecker_inputchar fail: after end\n");
                free(str);
-               return TEST_RESULT_FAIL;
+               return UNITTEST_RESULT_FAIL;
        }
 
        free(str);
-       return TEST_RESULT_PASS;
-}
-
-LOCAL VOID test_parselib_printresult(TEST_RESULT (*proc)(), B *test_name)
-{
-       TEST_RESULT result;
-
-       printf("test_parselib: %s\n", test_name);
-       printf("---------------------------------------------\n");
-       result = proc();
-       if (result == TEST_RESULT_PASS) {
-               printf("--pass---------------------------------------\n");
-       } else {
-               printf("--fail---------------------------------------\n");
-       }
-       printf("---------------------------------------------\n");
+       return UNITTEST_RESULT_PASS;
 }
 
-EXPORT VOID test_parselib_main()
+EXPORT VOID test_tokenchecker_main(unittest_driver_t *driver)
 {
-       test_parselib_printresult(test_tokenchecker_1, "test_tokenchecker_1");
-       test_parselib_printresult(test_tokenchecker_2, "test_tokenchecker_2");
-       test_parselib_printresult(test_tokenchecker_3, "test_tokenchecker_3");
-       test_parselib_printresult(test_tokenchecker_4, "test_tokenchecker_4");
-       test_parselib_printresult(test_tokenchecker_5, "test_tokenchecker_5");
-       test_parselib_printresult(test_tokenchecker_6, "test_tokenchecker_6");
-       test_parselib_printresult(test_tokenchecker_7, "test_tokenchecker_7");
-       test_parselib_printresult(test_tokenchecker_8, "test_tokenchecker_8");
-       test_parselib_printresult(test_tokenchecker_9, "test_tokenchecker_9");
-       test_parselib_printresult(test_tokenchecker_10, "test_tokenchecker_10");
-       test_parselib_printresult(test_tokenchecker_11, "test_tokenchecker_11");
-       test_parselib_printresult(test_tokenchecker_12, "test_tokenchecker_12");
-       test_parselib_printresult(test_tokenchecker_13, "test_tokenchecker_13");
-       test_parselib_printresult(test_tokenchecker_14, "test_tokenchecker_14");
-       test_parselib_printresult(test_tokenchecker_15, "test_tokenchecker_15");
-       test_parselib_printresult(test_tokenchecker_16, "test_tokenchecker_16");
-       test_parselib_printresult(test_tokenchecker_17, "test_tokenchecker_17");
-       test_parselib_printresult(test_tokenchecker_18, "test_tokenchecker_18");
-       test_parselib_printresult(test_tokenchecker_19, "test_tokenchecker_19");
-       test_parselib_printresult(test_tokenchecker_20, "test_tokenchecker_20");
-       test_parselib_printresult(test_tokenchecker_21, "test_tokenchecker_21");
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_1);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_2);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_3);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_4);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_5);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_6);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_7);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_8);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_9);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_10);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_11);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_12);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_13);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_14);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_15);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_16);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_17);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_18);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_19);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_20);
+       UNITTEST_DRIVER_REGIST(driver, test_tokenchecker_21);
 }