diff --git a/test/test_timers.c b/test/test_timers.c index 33c0b09..b6cdf5f 100644 --- a/test/test_timers.c +++ b/test/test_timers.c @@ -62,7 +62,7 @@ START_TEST (test_timers_simple) rc = uc_timers_run(&timers); fail_if(rc != 0); fail_if(tt.cnt != 0); - fail_if(uc_timers_count(&timers) != 1); + ck_assert_int_eq(uc_timers_count(&timers), 1); //10 seconds into the future, our timer should fire t += 5; @@ -77,7 +77,7 @@ START_TEST (test_timers_simple) rc = uc_timers_run(&timers); fail_if(rc != 0); fail_if(tt.cnt != 1); - fail_if(uc_timers_count(&timers) != 0); + ck_assert_int_eq(uc_timers_count(&timers), 0); fail_if(uc_timer_running(&timer) != 0); END_TEST @@ -112,7 +112,7 @@ START_TEST (test_timers_add_from_callback) fail_if(tt.cnt != 2); fail_if(uc_timer_running(&timer) == 0); - fail_if(uc_timers_count(&timers) != 1); + ck_assert_int_eq(uc_timers_count(&timers), 1); END_TEST @@ -136,7 +136,7 @@ START_TEST (test_timers_remove_from_callback) uc_timers_add(&timers, &timer, 5, 0); uc_timers_add(&timers, &timer2, 10, 0); - fail_if(uc_timers_count(&timers) != 2); + ck_assert_int_eq(uc_timers_count(&timers), 2); rc = uc_timers_first(&timers, &tv); fail_if(rc != 0); fail_if(tv.tv_sec != TEST_TIMER_START + 5); @@ -152,7 +152,7 @@ START_TEST (test_timers_remove_from_callback) //and our timer2 should be removed, and timer has fired so it //should be removed too - fail_if(uc_timers_count(&timers) != 0); + ck_assert_int_eq(uc_timers_count(&timers), 0); fail_if(uc_timer_running(&timer) != 0); fail_if(uc_timer_running(&timer2) != 0); rc = uc_timers_first(&timers, &tv); @@ -183,14 +183,14 @@ START_TEST (test_timers_add_remove) fail_if(first.tv_sec != TEST_TIMER_START + 5); fail_if(first.tv_usec != 0); - fail_if(uc_timers_count(&timers) != sizeof timer/sizeof timer[0]); + ck_assert_int_eq(uc_timers_count(&timers), sizeof timer/sizeof timer[0]); for (i = 0; i < sizeof timer/sizeof timer[0]; i++) { uc_timers_remove(&timers, &timer[i]); } - fail_if(uc_timers_count(&timers) != 0); + ck_assert_int_eq(uc_timers_count(&timers), 0); fail_if(uc_timers_first(&timers, &first) == 0); END_TEST