X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_expr_test.c;h=d11452ae72dc072e0c5fac7330fd4b29b18e4969;hp=303a921f0506ad952377ae58a7f7d13a12998d57;hb=c1907b60719f4e9a8e5b29aef5c8e25d62f4cde2;hpb=026ce2bb377f4055e3a0a1d20a2f91e5a73a49b0 diff --git a/t/unit/core/store_expr_test.c b/t/unit/core/store_expr_test.c index 303a921..d11452a 100644 --- a/t/unit/core/store_expr_test.c +++ b/t/unit/core/store_expr_test.c @@ -560,7 +560,6 @@ START_TEST(test_expr_iter) sdb_store_matcher_t *filter = NULL; int context = SDB_HOST; - bool iterable; sdb_store_expr_iter_t *iter; size_t i; @@ -587,19 +586,13 @@ START_TEST(test_expr_iter) ck_assert(filter != NULL); } - iterable = sdb_store_expr_iterable(&expr_iter_data[_i].expr, context); - fail_unless(iterable == expr_iter_data[_i].iterable, - "%s expression not iterable in %s context", - EXPR_TO_STRING(&expr_iter_data[_i].expr), - SDB_STORE_TYPE_TO_NAME(context)); - iter = sdb_store_expr_iter(&expr_iter_data[_i].expr, obj, filter); - fail_unless((iter != NULL) == iterable, + fail_unless((iter != NULL) == expr_iter_data[_i].iterable, "sdb_store_expr_iter(%s expression, %s, %s) = %s; expected: %s", EXPR_TO_STRING(&expr_iter_data[_i].expr), obj ? SDB_STORE_TYPE_TO_NAME(obj->type) : "", expr_iter_data[_i].filter, iter ? "" : "NULL", - iterable ? "" : "NULL"); + expr_iter_data[_i].iterable ? "" : "NULL"); /* the iterator will keep a reference */ sdb_object_deref(SDB_OBJ(obj)); obj = NULL;