diff --git a/lib/pengine/tests/rules/pe_cron_range_satisfied.c b/lib/pengine/tests/rules/pe_cron_range_satisfied.c index 85dfcd930a..b69e0f9e2f 100644 --- a/lib/pengine/tests/rules/pe_cron_range_satisfied.c +++ b/lib/pengine/tests/rules/pe_cron_range_satisfied.c @@ -1,123 +1,124 @@ #include #include #include static void -run_one_test(const char *t, const char *x, gboolean expected) { +run_one_test(const char *t, const char *x, pe_eval_date_result_t expected) { crm_time_t *tm = crm_time_new(t); xmlNodePtr xml = string2xml(x); - g_assert(pe_cron_range_satisfied(tm, xml) == expected); + g_assert_cmpint(pe_cron_range_satisfied(tm, xml), ==, expected); crm_time_free(tm); xmlFreeNode(xml); } static void no_time_given(void) { - g_assert(pe_cron_range_satisfied(NULL, NULL) == FALSE); + g_assert_cmpint(pe_cron_range_satisfied(NULL, NULL), ==, pe_date_op_unsatisfied); } static void any_time_satisfies_empty_spec(void) { crm_time_t *tm = crm_time_new(NULL); - g_assert(pe_cron_range_satisfied(tm, NULL) == TRUE); + g_assert_cmpint(pe_cron_range_satisfied(tm, NULL), ==, pe_date_op_satisfied); crm_time_free(tm); } static void time_satisfies_year_spec(void) { - run_one_test("2020-01-01", "", TRUE); + run_one_test("2020-01-01", "", pe_date_op_satisfied); } static void -time_doesnt_satisfy_year_spec(void) { - run_one_test("2020-01-01", "", FALSE); +time_after_year_spec(void) { + run_one_test("2020-01-01", "", pe_date_after_range); } static void time_satisfies_year_range(void) { - run_one_test("2020-01-01", "", TRUE); + run_one_test("2020-01-01", "", pe_date_op_satisfied); } static void time_before_year_range(void) { - run_one_test("2000-01-01", "", FALSE); + run_one_test("2000-01-01", "", pe_date_before_range); } static void time_after_year_range(void) { - run_one_test("2020-01-01", "", FALSE); + run_one_test("2020-01-01", "", pe_date_after_range); } static void range_without_start_year_passes(void) { - run_one_test("2010-01-01", "", TRUE); + run_one_test("2010-01-01", "", pe_date_op_satisfied); } static void range_without_end_year_passes(void) { - run_one_test("2010-01-01", "", TRUE); - run_one_test("2000-10-01", "", TRUE); + run_one_test("2010-01-01", "", pe_date_op_satisfied); + run_one_test("2000-10-01", "", pe_date_op_satisfied); } static void yeardays_satisfies(void) { - run_one_test("2020-01-30", "", TRUE); + run_one_test("2020-01-30", "", pe_date_op_satisfied); } static void -yeardays_doesnt_satisfy(void) { - run_one_test("2020-02-15", "", FALSE); +time_after_yeardays_spec(void) { + run_one_test("2020-02-15", "", pe_date_after_range); } static void yeardays_feb_29_satisfies(void) { - run_one_test("2016-02-29", "", TRUE); + run_one_test("2016-02-29", "", pe_date_op_satisfied); } static void exact_ymd_satisfies(void) { - run_one_test("2001-12-31", "", TRUE); + run_one_test("2001-12-31", "", pe_date_op_satisfied); } static void range_in_month_satisfies(void) { - run_one_test("2001-06-10", "", TRUE); + run_one_test("2001-06-10", "", pe_date_op_satisfied); } static void -exact_ymd_doesnt_satisfy(void) { - run_one_test("2001-12-31", "", FALSE); +exact_ymd_after_range(void) { + run_one_test("2001-12-31", "", pe_date_after_range); } static void -range_in_month_doesnt_satisfy(void) { - run_one_test("2001-06-10", "", FALSE); +time_after_monthdays_range(void) { + run_one_test("2001-06-10", "", pe_date_before_range); } int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); + g_test_add_func("/pengine/rules/cron_range/no_time_given", no_time_given); g_test_add_func("/pengine/rules/cron_range/empty_spec", any_time_satisfies_empty_spec); g_test_add_func("/pengine/rules/cron_range/year/time_satisfies", time_satisfies_year_spec); - g_test_add_func("/pengine/rules/cron_range/year/time_doesnt_satisfy", time_doesnt_satisfy_year_spec); + g_test_add_func("/pengine/rules/cron_range/year/time_after", time_after_year_spec); g_test_add_func("/pengine/rules/cron_range/range/time_satisfies_year", time_satisfies_year_range); g_test_add_func("/pengine/rules/cron_range/range/time_before_year", time_before_year_range); g_test_add_func("/pengine/rules/cron_range/range/time_after_year", time_after_year_range); g_test_add_func("/pengine/rules/cron_range/range/no_start_year_passes", range_without_start_year_passes); g_test_add_func("/pengine/rules/cron_range/range/no_end_year_passes", range_without_end_year_passes); g_test_add_func("/pengine/rules/cron_range/yeardays/satisfies", yeardays_satisfies); - g_test_add_func("/pengine/rules/cron_range/yeardays/doesnt_satisfy", yeardays_doesnt_satisfy); + g_test_add_func("/pengine/rules/cron_range/yeardays/time_after", time_after_yeardays_spec); g_test_add_func("/pengine/rules/cron_range/yeardays/feb_29_sasitfies", yeardays_feb_29_satisfies); g_test_add_func("/pengine/rules/cron_range/exact/ymd_satisfies", exact_ymd_satisfies); g_test_add_func("/pengine/rules/cron_range/range/in_month_satisfies", range_in_month_satisfies); - g_test_add_func("/pengine/rules/cron_range/exact/ymd_doesnt_satisfy", exact_ymd_doesnt_satisfy); - g_test_add_func("/pengine/rules/cron_range/range/in_month_doesnt_satisfy", range_in_month_doesnt_satisfy); + g_test_add_func("/pengine/rules/cron_range/exact/ymd_after_range", exact_ymd_after_range); + g_test_add_func("/pengine/rules/cron_range/range/in_month_after", time_after_monthdays_range); return g_test_run(); }