X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstcharmap.c;h=968123d988996dd906acf49ef6291c4f47d3be7a;hp=201a9000160892e862821b2f759d60f3f5c03ae5;hb=00d6544408e2de88277e091fb7f8f4dfe3949558;hpb=c401b3a1421e31b3d6b77bc7bac6ffb934207df1

diff --git a/util/tstcharmap.c b/util/tstcharmap.c
index 201a900..968123d 100644
--- a/util/tstcharmap.c
+++ b/util/tstcharmap.c
@@ -1,8 +1,5 @@
-/* $Id: tstcharmap.c,v 1.6 2006-10-29 17:20:02 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 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
@@ -20,11 +17,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <charmap.h>
-#include <yaz/log.h>
+#include <yaz/test.h>
+#include <stdlib.h>
 
 /* use env srcdir as base directory - or current directory if unset */
 const char *get_srcdir(void)
@@ -42,9 +40,7 @@ void tst1(void)
     chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "tstcharmap.chr" /* file */,
 				     0 /* tabroot */ );
-    if (!tab)
-	exit(1);
-    
+    YAZ_CHECK(tab);
     chrmaptab_destroy(tab);
 }
 
@@ -54,26 +50,36 @@ void tst2(void)
     chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "nonexist.chr" /* file */,
 				     0 /* tabroot */ );
-    
-    if (tab)
-	exit(0);
+    YAZ_CHECK(!tab);
+    chrmaptab_destroy(tab);
+}
+
+void tst3(void)
+{
+    /* open empty emptycharmap.chrr */
+    chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
+				     "emptycharmap.chr" /* file */,
+				     0 /* tabroot */ );
+    YAZ_CHECK(!tab);
+    chrmaptab_destroy(tab);
 }
 
 int main(int argc, char **argv)
 {
-    char logname[2048];
-    sprintf(logname, "%s.log", argv[0]);
-    yaz_log_init_file(logname);
+    YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
 
     tst1();
     tst2();
+    tst3();
 
-    exit(0);
+    YAZ_CHECK_TERM;
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab