X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftest.c;h=01380566034273c760aa57a80041b6005de9228f;hp=79083d153259758e79c00c2a31b0402d6d6d91ab;hb=10f391e000230e5a93c768f541a24a379809489e;hpb=886c6715463eba74b37575caa5df206ee9b970b6

diff --git a/src/test.c b/src/test.c
index 79083d1..0138056 100644
--- a/src/test.c
+++ b/src/test.c
@@ -2,20 +2,41 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: test.c,v 1.1 2006-01-27 18:58:58 adam Exp $
+ * $Id: test.c,v 1.4 2006-01-30 14:02:07 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <yaz/test.h>
 
-static FILE *test_fout;
-static int test_number = 0;
-static int test_verbose = 0;
+static FILE *test_fout = 0; /* can't use '= stdout' on some systems */
+static int test_total = 0;
+static int test_failed = 0;
+static int test_verbose = 1;
+static char *test_prog = 0;
+
+static FILE *get_file()
+{
+    if (test_fout)
+        return test_fout;
+    return stdout;
+}
+
+static char *progname(char *argv0)
+{
+    char *cp = strrchr(argv0, '/');
+    if (cp)
+        return cp+1;
+    cp = strrchr(argv0, '\\');
+    if (cp)
+        return cp+1;
+    return argv0;
+}
 
 void yaz_check_init1(int *argc_p, char ***argv_p)
 {
@@ -23,7 +44,8 @@ void yaz_check_init1(int *argc_p, char ***argv_p)
     int argc = *argc_p;
     char **argv = *argv_p;
 
-    test_fout = 0;
+    test_prog = progname(argv[0]);
+
     for (i = 1; i<argc; i++)
     {
         if (strlen(argv[i]) >= 7 && !memcmp(argv[i], "--test-", 7))
@@ -47,8 +69,13 @@ void yaz_check_init1(int *argc_p, char ***argv_p)
             {
                 fprintf(stderr, 
                         "--test-help           help\n"
-                        "--test-verbose level  verbose; 0=quiet; 1=normal; 2=more\n"
-                        "--test-file fname     output to fname\n");
+                        "--test-file fname     output to fname\n"
+                        "--test-verbose level  verbose level\n"
+                        "       0=Quiet. Only exit code tells what's wrong\n"
+                        "       1=Report+Summary only if tests fail.\n"
+                        "       2=Report failures. Print summary always\n"
+                        "       3=Report + summary always\n"
+                    );
                 exit(0);
             }
             else
@@ -67,29 +94,61 @@ void yaz_check_init1(int *argc_p, char ***argv_p)
     --i;
     *argc_p -= i;
     *argv_p += i;
-    if (!test_fout)
-        test_fout = stdout;
 }
 
-void yaz_check_print1(int type, const char *file, int line, const char *expr)
+void yaz_check_term1(void)
+{
+    /* summary */
+    if (test_failed)
+    {
+        if (test_verbose >= 1)
+            fprintf(get_file(), "%d out of %d tests failed for program %s\n",
+                    test_failed, test_total, test_prog);
+    }
+    else
+    {
+        if (test_verbose >= 2)
+            fprintf(get_file(), "%d tests passed for program %s\n",
+                    test_total, test_prog);
+    }
+    if (test_fout)
+        fclose(test_fout);
+    if (test_failed)
+        exit(1);
+    exit(0);
+}
+
+void yaz_check_eq1(int type, const char *file, int line,
+                   const char *left, const char *right, int lval, int rval)
+{
+    char formstr[2048];
+    
+    sprintf(formstr, "%.500s != %.500s\n%d != %d", left, right, lval, rval);
+    yaz_check_print1(type, file, line, formstr);
+}
+
+void yaz_check_print1(int type, const char *file, int line, 
+                      const char *expr)
 {
     const char *msg = "unknown";
 
-    test_number++;
+    test_total++;
     switch(type)
     {
     case YAZ_TEST_TYPE_FAIL:
+        test_failed++;
         msg = "failed";
         if (test_verbose < 1)
             return;
         break;
     case YAZ_TEST_TYPE_OK:
         msg = "OK";
-        if (test_verbose < 2)
+        if (test_verbose < 3)
             return;
         break;
     }
-    fprintf(test_fout, "%s:%d %s: %s\n", file, line, msg, expr);
+    fprintf(get_file(), "%s:%d %s: ", file, line, msg);
+    fprintf(get_file(), "%s\n", expr);
 }