X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftstquery.cpp;h=28acf6ab407ad476d723f5e8413707b19e651d7f;hb=811aa170af425409aef732209f3052807e8af94d;hp=966362959b803a13aac5f7b3c63270faaef72728;hpb=d53e0ff85ad63de947da013a0d25a434d12eed40;p=yazpp-moved-to-github.git

diff --git a/src/tstquery.cpp b/src/tstquery.cpp
index 9663629..28acf6a 100644
--- a/src/tstquery.cpp
+++ b/src/tstquery.cpp
@@ -1,14 +1,19 @@
 /* This file is part of the yazpp toolkit.
- * Copyright (C) 1998-2010 Index Data and Mike Taylor
+ * Copyright (C) 1998-2013 Index Data and Mike Taylor
  * See the file LICENSE for details.
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <yazpp/z-query.h>
+#include <yaz/test.h>
+#include <yaz/log.h>
 
 using namespace yazpp_1;
 
-void tst1(const char *query_str_in, const char *query_expected)
+int tst1(const char *query_str_in, const char *query_expected)
 {
     Yaz_Z_Query q;
 
@@ -23,17 +28,20 @@ void tst1(const char *query_str_in, const char *query_expected)
 
     if (strcmp(query_str_out, query_expected))
     {
-	fprintf(stderr, "tstquery: query mismatch out=%s expected=%s\n",
+	yaz_log(YLOG_LOG, "query mismatch out=%s expected=%s",
 		query_str_out, query_expected);
-	exit(1);
+        return 0;
     }
+    return 1;
 }
 
 int main(int argc, char **argv)
 {
-    tst1("", "");
-    tst1("x", "RPN @attrset Bib-1 x");
-    tst1("@and a b", "RPN @attrset Bib-1 @and a b");
+    YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK(tst1("", ""));
+    YAZ_CHECK(tst1("x", "RPN @attrset Bib-1 x"));
+    YAZ_CHECK(tst1("@and a b", "RPN @attrset Bib-1 @and a b"));
+    YAZ_CHECK_TERM;
 }
 
 /*