From 811aa170af425409aef732209f3052807e8af94d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 5 Oct 2013 16:08:43 +0200 Subject: [PATCH] tstquery using YAZ check --- src/tstquery.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/tstquery.cpp b/src/tstquery.cpp index 475ff33..28acf6a 100644 --- a/src/tstquery.cpp +++ b/src/tstquery.cpp @@ -8,10 +8,12 @@ #endif #include #include +#include +#include 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; @@ -26,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; } /* -- 1.7.10.4