tests more consistent

[protos/libecoli.git] / lib / ecoli_node_int.c

diff --git a/lib/ecoli_node_int.c b/lib/ecoli_node_int.c
index b086c56..f5245ad 100644 (file)
--- a/lib/ecoli_node_int.c
+++ b/lib/ecoli_node_int.c
@@ -70,10 +70,8 @@ static int parse_llint(struct ec_node_int_uint *node, const char *str,
        errno = 0;
        *val = strtoll(str, &endptr, node->base);
 
-       if (errno == ERANGE && (*val == LLONG_MAX || *val == LLONG_MIN))
-               return -1;
-
-       if (errno != 0 && *val == 0)
+       if ((errno == ERANGE && (*val == LLONG_MAX || *val == LLONG_MIN)) ||
+                       (errno != 0 && *val == 0))
                return -1;
 
        if (node->check_min && *val < node->min)
@@ -101,10 +99,8 @@ static int parse_ullint(struct ec_node_int_uint *node, const char *str,
        errno = 0;
        *val = strtoull(str, &endptr, node->base);
 
-       if (errno == ERANGE && *val == ULLONG_MAX)
-               return -1;
-
-       if (errno != 0 && *val == 0)
+       if ((errno == ERANGE && *val == ULLONG_MAX) ||
+                       (errno != 0 && *val == 0))
                return -1;
 
        if (node->check_min && *val < node->umin)
@@ -125,7 +121,8 @@ static int ec_node_int_uint_parse(const struct ec_node *gen_node,
 {
        struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
        const char *str;
-       int64_t val;
+       uint64_t u64;
+       int64_t i64;
 
        (void)state;
 
@@ -133,15 +130,13 @@ static int ec_node_int_uint_parse(const struct ec_node *gen_node,
                return EC_PARSED_NOMATCH;
 
        str = ec_strvec_val(strvec, 0);
-       if (parse_llint(node, str, &val) < 0)
-               return EC_PARSED_NOMATCH;
-
-       return 1;
-}
-
-static size_t ec_node_int_uint_get_max_parse_len(const struct ec_node *gen_node)
-{
-       (void)gen_node;
+       if (node->is_signed) {
+               if (parse_llint(node, str, &i64) < 0)
+                       return EC_PARSED_NOMATCH;
+       } else {
+               if (parse_ullint(node, str, &u64) < 0)
+                       return EC_PARSED_NOMATCH;
+       }
        return 1;
 }
 
@@ -159,7 +154,6 @@ static struct ec_node_type ec_node_int_type = {
        .name = "int",
        .parse = ec_node_int_uint_parse,
        .complete = ec_node_default_complete,
-       .get_max_parse_len = ec_node_int_uint_get_max_parse_len,
        .size = sizeof(struct ec_node_int_uint),
        .init_priv = ec_node_uint_init_priv,
 };
@@ -191,7 +185,6 @@ static struct ec_node_type ec_node_uint_type = {
        .name = "uint",
        .parse = ec_node_int_uint_parse,
        .complete = ec_node_default_complete,
-       .get_max_parse_len = ec_node_int_uint_get_max_parse_len,
        .size = sizeof(struct ec_node_int_uint),
 };
 
@@ -361,34 +354,42 @@ static int ec_node_int_testcase(void)
        struct ec_parsed *p;
        struct ec_node *node;
        const char *s;
-       int ret = 0;
+       int testres = 0, ret;
        uint64_t u64;
        int64_t i64;
 
-       node = ec_node_uint(EC_NO_ID, 0, 256, 0);
+       node = ec_node_uint(EC_NO_ID, 1, 256, 0);
        if (node == NULL) {
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "0");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "256", "foo");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "0x100");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, " 1");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "-1");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "0x101");
-
-       p = ec_node_parse(node, "0");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "0");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "1");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "256", "foo");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "0x100");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, " 1");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "-1");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "0x101");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "zzz");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "0x100000000000000000");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "4r");
+       ret = ec_node_uint_disable_limits(node);
+       testres |= EC_TEST_CHECK(ret == 0, "cannot disable limits");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "0");
+
+       p = ec_node_parse(node, "1");
        s = ec_strvec_val(ec_parsed_strvec(p), 0);
-       EC_TEST_ASSERT(s != NULL &&
+       testres |= EC_TEST_CHECK(s != NULL &&
                ec_node_uint_getval(node, s, &u64) == 0 &&
-               u64 == 0);
+               u64 == 1, "bad integer value");
        ec_parsed_free(p);
 
        p = ec_node_parse(node, "10");
        s = ec_strvec_val(ec_parsed_strvec(p), 0);
-       EC_TEST_ASSERT(s != NULL &&
+       testres |= EC_TEST_CHECK(s != NULL &&
                ec_node_uint_getval(node, s, &u64) == 0 &&
-               u64 == 10);
+               u64 == 10, "bad integer value");
        ec_parsed_free(p);
        ec_node_free(node);
 
@@ -397,17 +398,23 @@ static int ec_node_int_testcase(void)
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "0");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "-1");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "7fffffffffffffff");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "0x7fffffffffffffff");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "-2");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "0");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "-1");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "7fffffffffffffff");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "0x7fffffffffffffff");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "0x8000000000000000");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "-2");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "zzz");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "4r");
+       ret = ec_node_int_disable_limits(node);
+       testres |= EC_TEST_CHECK(ret == 0, "cannot disable limits");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "-2");
 
        p = ec_node_parse(node, "10");
        s = ec_strvec_val(ec_parsed_strvec(p), 0);
-       EC_TEST_ASSERT(s != NULL &&
+       testres |= EC_TEST_CHECK(s != NULL &&
                ec_node_int_getval(node, s, &i64) == 0 &&
-               i64 == 16);
+               i64 == 16, "bad integer value");
        ec_parsed_free(p);
        ec_node_free(node);
 
@@ -416,11 +423,11 @@ static int ec_node_int_testcase(void)
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "0");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "-1");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "-9223372036854775808");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "0x0");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "1");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "0");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "-1");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "-9223372036854775808");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "0x0");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "1");
        ec_node_free(node);
 
        /* test completion */
@@ -429,18 +436,18 @@ static int ec_node_int_testcase(void)
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "x", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "1", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
        ec_node_free(node);
 
-       return ret;
+       return testres;
 }
 /* LCOV_EXCL_STOP */