ユニットテストの修正

[YACASL2.git] / test / unit / opdtok / opdtok.c

diff --git a/test/unit/opdtok/opdtok.c b/test/unit/opdtok/opdtok.c
index dc5021e..bad4603 100644 (file)
--- a/test/unit/opdtok/opdtok.c
+++ b/test/unit/opdtok/opdtok.c
@@ -7,23 +7,27 @@ int main(){
     char *str[] = {
         "", "GR0,GR1", "GR0,A", "GR1,12", "GR0,0,GR1",
         "\'aaa\',0", "\'aaa\',\'bbb\'", "\'aaa\'\',\'\'bbb\'", "\'aaa,bbb\'",
-        "0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9",
-        "0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0",
-        "\'01234567890123456789012345678901234567\'",
-        "\'012345678901234567890123456789012345678\'"
+        "1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0",
+        "1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1",
+        "\'1234567890123456789012345678901234567890\'",
+        "\'12345678901234567890123456789012345678901\'",
     };
-    for(i = 0; i < sizeof str / sizeof str[0]; i++) {
+
+    cerr = malloc_chk(sizeof(CERR), "cerr");    /* エラーの初期化 */
+    addcerrlist_assemble();
+    for(i = 0; i < ARRAYSIZE(str); i++) {
+        cerr->num = 0;
         printf("%s\n", str[i]);
         opd = opdtok(str[i]);
         printf("OPDC:%d\n", opd->opdc);
         for(j = 0; j < opd->opdc; j++) {
             printf("OPDC[%d]:%s\n", j, opd->opdv[j]);
         }
-        if(cerrno > 0){
-            printf("Error - %d: %s\n", cerrno, cerrmsg);
-            freecerr();
+        if(cerr->num > 0){
+            printf("Error - %d: %s\n", cerr->num, cerr->msg);
         }
-        printf("\n");        
+        printf("\n");
     }
+    freecerr();
     return 0;
 }