X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fapi%2Ft2.c;h=d55a7828284729188c48a956ffa9780492fb295c;hb=1922579d92e1a9559d4c3ab4f1cf461f56c83c3b;hp=6dacdd0dd1e9d270d6f3df75169b7195d316542f;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;p=idzebra-moved-to-github.git

diff --git a/test/api/t2.c b/test/api/t2.c
index 6dacdd0..d55a782 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,8 +1,5 @@
-/* $Id: t2.c,v 1.17 2005-09-13 11:51:07 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,9 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include "testlib.h"
@@ -28,13 +25,29 @@ const char *myrec[] = {
         "</gils>\n",
         0};
 
-int main(int argc, char **argv)
+void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
+    ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs, 0);
 
-    init_data(zh, myrec);
-    do_query(__LINE__,zh, "@attr 1=4 my", 1);
+    YAZ_CHECK(tl_init_data(zh, myrec));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title nope", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 nope", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 2=103 dummy", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=103 dummy", 1));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+