summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tests/ecore/ecore_test_promise2.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/ecore/ecore_test_promise2.c b/src/tests/ecore/ecore_test_promise2.c
index c23c5d1c74..b1a78f39d6 100644
--- a/src/tests/ecore/ecore_test_promise2.c
+++ b/src/tests/ecore/ecore_test_promise2.c
@@ -99,7 +99,7 @@ _eina_test_safety_print_cb(const Eina_Log_Domain *d,
99 str = va_arg(cp_args, const char *); 99 str = va_arg(cp_args, const char *);
100 va_end(cp_args); 100 va_end(cp_args);
101 101
102 ck_assert_ptr_nonnull(ctx->func_ctx[ctx->func_ctx_idx].msg); 102 ck_assert_ptr_ne(ctx->func_ctx[ctx->func_ctx_idx].msg, NULL);
103 ck_assert_int_eq(level, ctx->level); 103 ck_assert_int_eq(level, ctx->level);
104 if (ctx->just_fmt) 104 if (ctx->just_fmt)
105 ck_assert_str_eq(fmt, ctx->func_ctx[ctx->func_ctx_idx].msg); 105 ck_assert_str_eq(fmt, ctx->func_ctx[ctx->func_ctx_idx].msg);
@@ -1122,12 +1122,12 @@ START_TEST(efl_test_promise_null)
1122 eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx); 1122 eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx);
1123 LOG_CTX_SET(ctx, "eina_promise_new", "safety check failed: scheduler == NULL"); 1123 LOG_CTX_SET(ctx, "eina_promise_new", "safety check failed: scheduler == NULL");
1124 p = eina_promise_new(NULL, _dummy_cancel, NULL); 1124 p = eina_promise_new(NULL, _dummy_cancel, NULL);
1125 ck_assert_ptr_null(p); 1125 ck_assert_ptr_eq(p, NULL);
1126 fail_unless(ctx.did); 1126 fail_unless(ctx.did);
1127 1127
1128 LOG_CTX_SET(ctx, "eina_promise_new", "safety check failed: cancel_cb == NULL"); 1128 LOG_CTX_SET(ctx, "eina_promise_new", "safety check failed: cancel_cb == NULL");
1129 p = eina_promise_new(_future_scheduler_get(), NULL, NULL); 1129 p = eina_promise_new(_future_scheduler_get(), NULL, NULL);
1130 ck_assert_ptr_null(p); 1130 ck_assert_ptr_eq(p, NULL);
1131 fail_unless(ctx.did); 1131 fail_unless(ctx.did);
1132 1132
1133 ecore_shutdown(); 1133 ecore_shutdown();
@@ -1161,7 +1161,7 @@ _future_null_cb(void *data, const Eina_Value v, const Eina_Future *dead)
1161 int err; 1161 int err;
1162 int *cb_called = data; 1162 int *cb_called = data;
1163 1163
1164 ck_assert_ptr_null(dead); 1164 ck_assert_ptr_eq(dead, NULL);
1165 VALUE_TYPE_CHECK(v, EINA_VALUE_TYPE_ERROR); 1165 VALUE_TYPE_CHECK(v, EINA_VALUE_TYPE_ERROR);
1166 fail_if(!eina_value_get(&v, &err)); 1166 fail_if(!eina_value_get(&v, &err));
1167 ck_assert_int_eq(err, EINVAL); 1167 ck_assert_int_eq(err, EINVAL);
@@ -1190,7 +1190,7 @@ static void
1190_future_easy_null_free(void *data, const Eina_Future *dead) 1190_future_easy_null_free(void *data, const Eina_Future *dead)
1191{ 1191{
1192 int *cb_called = data; 1192 int *cb_called = data;
1193 ck_assert_ptr_null(dead); 1193 ck_assert_ptr_eq(dead, NULL);
1194 (*cb_called)++; 1194 (*cb_called)++;
1195} 1195}
1196 1196
@@ -1206,7 +1206,7 @@ START_TEST(efl_test_future_null)
1206 LOG_CTX_SET(ctx, "eina_future_then_from_desc", "safety check failed: (prev) == NULL"); 1206 LOG_CTX_SET(ctx, "eina_future_then_from_desc", "safety check failed: (prev) == NULL");
1207 eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx); 1207 eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx);
1208 f = eina_future_then(NULL, _future_null_cb, &cb_called); 1208 f = eina_future_then(NULL, _future_null_cb, &cb_called);
1209 ck_assert_ptr_null(f); 1209 ck_assert_ptr_eq(f, NULL);
1210 1210
1211 ck_assert_int_eq(cb_called, 1); 1211 ck_assert_int_eq(cb_called, 1);
1212 1212
@@ -1222,7 +1222,7 @@ START_TEST(efl_test_future_null)
1222 {_future_null_cb, &cb_called}, 1222 {_future_null_cb, &cb_called},
1223 {_future_null_cb, &cb_called}, 1223 {_future_null_cb, &cb_called},
1224 {_future_null_cb, &cb_called}); 1224 {_future_null_cb, &cb_called});
1225 ck_assert_ptr_null(f); 1225 ck_assert_ptr_eq(f, NULL);
1226 ck_assert_int_eq(cb_called, 5); 1226 ck_assert_int_eq(cb_called, 5);
1227 ck_assert_int_eq(easy_cb_calls, 2); 1227 ck_assert_int_eq(easy_cb_calls, 2);
1228 1228
@@ -1233,7 +1233,7 @@ START_TEST(efl_test_future_null)
1233 _future_easy_null_err, 1233 _future_easy_null_err,
1234 _future_easy_null_free, 1234 _future_easy_null_free,
1235 NULL, &easy_cb_calls}); 1235 NULL, &easy_cb_calls});
1236 ck_assert_ptr_null(f); 1236 ck_assert_ptr_eq(f, NULL);
1237 ck_assert_int_eq(easy_cb_calls, 2); 1237 ck_assert_int_eq(easy_cb_calls, 2);
1238 ecore_shutdown(); 1238 ecore_shutdown();
1239} 1239}
@@ -1277,7 +1277,7 @@ START_TEST(efl_test_future_all_null)
1277 {"eina_promise_all_array", "safety check failed: r is false"}); 1277 {"eina_promise_all_array", "safety check failed: r is false"});
1278 //The last future is NULL, which may cause the cancel. 1278 //The last future is NULL, which may cause the cancel.
1279 f = eina_future_all_array(futures); 1279 f = eina_future_all_array(futures);
1280 ck_assert_ptr_null(f); 1280 ck_assert_ptr_eq(f, NULL);
1281 ecore_shutdown(); 1281 ecore_shutdown();
1282 ck_assert_int_eq(cb_called, len); 1282 ck_assert_int_eq(cb_called, len);
1283} 1283}
@@ -1308,7 +1308,7 @@ START_TEST(efl_test_future_race_null)
1308 {"eina_promise_race_array", "safety check failed: r is false"}); 1308 {"eina_promise_race_array", "safety check failed: r is false"});
1309 //The last future is NULL, which may cause the cancel. 1309 //The last future is NULL, which may cause the cancel.
1310 f = eina_future_race_array(futures); 1310 f = eina_future_race_array(futures);
1311 ck_assert_ptr_null(f); 1311 ck_assert_ptr_eq(f, NULL);
1312 ecore_shutdown(); 1312 ecore_shutdown();
1313 ck_assert_int_eq(cb_called, len); 1313 ck_assert_int_eq(cb_called, len);
1314} 1314}