X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstcharmap.c;h=65a4fb5b1ce05afcce1693f577a92c0302243bc8;hp=5f92923d83a17e6292200801b33d541c2477761a;hb=99842ec71f065fd6886daa355923b01d9ce71d26;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197

diff --git a/util/tstcharmap.c b/util/tstcharmap.c
index 5f92923..65a4fb5 100644
--- a/util/tstcharmap.c
+++ b/util/tstcharmap.c
@@ -1,8 +1,5 @@
-/* $Id: tstcharmap.c,v 1.7 2007-01-15 15:10:26 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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