Mainloop: Be benevolent when file_del() is called on a closed fd

[libucw.git] / ucw / xtypes-test.c

diff --git a/ucw/xtypes-test.c b/ucw/xtypes-test.c
index 9ed3461182017dfcc58a1e4b400832bb3677bc7b..a43e0fb1e28588f70df7bb604733c6a6d0fc4152 100644 (file)
--- a/ucw/xtypes-test.c
+++ b/ucw/xtypes-test.c
@@ -1,5 +1,5 @@
 /*
- *     UCW Library -- Test of Tableprinter Types
+ *     UCW Library -- Test of Extended Types
  *
  *     (c) 2014 Robert Kessl <robert.kessl@economia.cz>
  *
@@ -10,7 +10,7 @@
 #include <ucw/lib.h>
 #include <ucw/mempool.h>
 #include <ucw/xtypes.h>
-#include <ucw/table-types.h>
+#include <ucw/xtypes-extra.h>
 
 #include <errno.h>
 #include <stdlib.h>
@@ -42,10 +42,14 @@ static void test_size_parse_correct(struct fastbuf *out)
     u64 result;
     const char *parse_err = xt_size.parse(size_strs[i], &result, pool);
 
-    ASSERT_MSG(parse_err == NULL, "Unexpected error in xt_size.parse");
-    ASSERT_MSG(size_parsed[i] == result, "xt_size.parse parsed an incorrect value.");
+    if(parse_err != NULL) {
+      die("Unexpected error in xt_size.parse");
+    }
+    if(size_parsed[i] != result) {
+      die("xt_size.parse parsed an incorrect value.");
+    }
 
-    const char *result_str = xt_size.format(&result, i | SIZE_UNITS_FIXED, pool);
+    const char *result_str = xt_size.format(&result, XT_SIZE_FMT_UNIT(i), pool);
     bprintf(out, "%s %s\n", size_strs[i], result_str);
 
     i++;
@@ -59,6 +63,9 @@ static void test_size_parse_errors(struct fastbuf *out)
   static const char *size_strs[] = {
     "1X",
     "KB",
+    "X1KB",
+    "1XKB",
+    "1KBX",
     "\0",
     NULL
   };
@@ -104,8 +111,12 @@ static void test_bool_parse_correct(struct fastbuf *out)
   while(bool_strs[i] != NULL) {
     bool result;
     const char *err_str = xt_bool.parse(bool_strs[i], &result, pool);
-    ASSERT_MSG(err_str == NULL, "Unexpected error in xt_bool.parse %s", err_str);
-    ASSERT_MSG(bool_parsed[i] == result, "xt_bool.parse parsed an incorrect value.");
+    if(err_str != NULL) {
+      die("Unexpected error in xt_bool.parse %s", err_str);
+    }
+    if(bool_parsed[i] != result) {
+      die("xt_bool.parse parsed an incorrect value.");
+    }
     bprintf(out, "%s %s\n", bool_strs[i], result ? "true" : "false");
     i++;
   }
@@ -132,8 +143,13 @@ static void test_timestamp_parse_correct(struct fastbuf *out)
   while(timestamp_strs[i]) {
     u64 result;
     const char *err_str = xt_timestamp.parse(timestamp_strs[i], &result, pool);
-    ASSERT_MSG(err_str == NULL, "Unexpected error in xt_size.parse: %s", err_str);
-    ASSERT_MSG(timestamp_parsed[i] == result, "Expected: %" PRIu64 " but got %" PRIu64, timestamp_parsed[i], result);
+    if(err_str != NULL) {
+      die("Unexpected error in xt_timestamp.parse: %s", err_str);
+    }
+    if(timestamp_parsed[i] != result) {
+      die("Expected: %" PRIu64 " but got %" PRIu64, timestamp_parsed[i], result);
+    }
+
     bprintf(out, "%" PRIu64 " %" PRIu64 "\n", timestamp_parsed[i], result);
 
     i++;
@@ -148,7 +164,11 @@ static void test_timestamp_parse_errors(struct fastbuf *out)
     "1403685533X",
     "2014X-06-25 08:38:53",
     "2X014-06-25 08:38:53",
+    "2014-06-25 08:38:53X",
+    "X2014-06-25 08:38:53",
     "X1403685533",
+    "14X03685533",
+    "1403685533X",
     NULL
   };
 
@@ -165,10 +185,6 @@ static void test_timestamp_parse_errors(struct fastbuf *out)
       bprintf(out, "xt_timestamp.parse error: '%s'.\n", err_str);
     }
 
-    // ASSERT_MSG(err_str != NULL,
-    //bprintf(out, "%" PRIu64 " %" PRIu64 "\n", timestamp_parsed[i], result);
-    //ASSERT_MSG(timestamp_parsed[i] == result, "Expected: %" PRIu64 " but got %" PRIu64, timestamp_parsed[i], result);
-
     i++;
   }