X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftest_strmap.c;h=076213b09cec8e7bb2dd2e1de75a21030920bc6d;hp=422c1a31aafe0136e865fbafe8eb6985c72dea94;hb=aeea139423b8eaf28a4de53b3d7b2ad1f22284e7;hpb=08d6561cdd2bb03f02913f25b20a428aa9aea575

diff --git a/util/test_strmap.c b/util/test_strmap.c
index 422c1a3..076213b 100644
--- a/util/test_strmap.c
+++ b/util/test_strmap.c
@@ -1,8 +1,5 @@
-/* $Id: test_strmap.c,v 1.2 2007-12-03 09:12:38 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,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <zebra_strmap.h>
 #include <yaz/test.h>
 #include <string.h>
@@ -38,10 +38,10 @@ static void test1(void)
         size_t data_len;
         zebra_strmap_t sm = zebra_strmap_create();
         YAZ_CHECK(!zebra_strmap_lookup(sm, "a", 0, 0));
-        
+
         zebra_strmap_add(sm, "a", &v, sizeof v);
         data_buf = zebra_strmap_lookup(sm, "a", 0, &data_len);
-        YAZ_CHECK(data_buf && data_len == sizeof v 
+        YAZ_CHECK(data_buf && data_len == sizeof v
                   && v == *((int*) data_buf));
 
         zebra_strmap_remove(sm, "a");
@@ -94,6 +94,7 @@ static void test2(int no_iter)
         }
     }
     {
+        int failed = 0;
         int i;
         srand(12);
         for (i = 0; i < no_iter; i++)
@@ -115,9 +116,12 @@ static void test2(int no_iter)
                     break;
                 j++;
             }
-            YAZ_CHECK(data_buf && data_len == sizeof v
-                      && v == *((int*) data_buf));
+            if (!(data_buf && data_len == sizeof v
+                  && v == *((int*) data_buf)))
+                failed++;
         }
+        if (failed)
+            YAZ_CHECK_EQ(failed, 0);
     }
     zebra_strmap_destroy(sm);
 }
@@ -133,6 +137,7 @@ int main (int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab