A little more flexible test unit

[yaz-moved-to-github.git] / include / yaz / test.h

diff --git a/include/yaz/test.h b/include/yaz/test.h
index 93ecb06..871e05c 100644 (file)
--- a/include/yaz/test.h
+++ b/include/yaz/test.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: test.h,v 1.1 2006-01-27 17:30:44 adam Exp $
+ * $Id: test.h,v 1.2 2006-01-27 18:58:57 adam Exp $
  */
 
 #ifndef YAZ_TEST_H
@@ -11,18 +11,26 @@
 #include <yaz/yconfig.h>
 #include <stdio.h>
 
-#define YAZ_CHECK_INIT(thename) \
-static char *yaz_unit_test_name = #thename;
-static FILE *yaz_unit_file = 0; \
-static int yaz_unit_test_number = 0; \
+#define YAZ_TEST_TYPE_OK 1
+#define YAZ_TEST_TYPE_FAIL 2
 
-#define YAZ_CHECK(as) \
-yaz_unit_test_number++; \
-if (!yaz_unit_file) yaz_unit_file = stderr; \
-if (!as) { \
-   fprintf(yaz_unit_file, "%s:%d test failed: %s\n", __FILE__, __LINE__, #as); \
+#define YAZ_CHECK(as) { \
+  if (as) { \
+    yaz_check_print1(YAZ_TEST_TYPE_OK, __FILE__, __LINE__, #as); \
+  } else { \
+    yaz_check_print1(YAZ_TEST_TYPE_FAIL, __FILE__, __LINE__, #as); \
+  } \
 }
 
+#define YAZ_CHECK_INIT(argc, argv) yaz_check_init1(&argc, &argv)
+
+YAZ_BEGIN_CDECL
+YAZ_EXPORT void yaz_check_init1(int *argc, char ***argv);
+YAZ_EXPORT void yaz_check_print1(int type, const char *file, int line,
+                                 const char *expr);
+YAZ_END_CDECL
+
+
 #endif
 /*
  * Local variables: