Rename the value string functions to be a bit mroe sensible

This commit is contained in:
Nils O. Selåsdal
2014-02-04 15:15:17 +01:00
parent eeed97e938
commit 39290eefb7
3 changed files with 24 additions and 23 deletions
+19 -19
View File
@@ -9,11 +9,11 @@ START_TEST (test_val_str_search)
UC_VS_ENTRY(0),
UC_VS_TERMINATOR
};
ck_assert_str_eq(uc_vs_search(0 , vals) , "0");
ck_assert_str_eq(uc_vs_search(1 , vals) , "1");
ck_assert_str_eq(uc_vs_search(5 , vals) , "5");
ck_assert_str_eq(uc_val_2_str(0 , vals) , "0");
ck_assert_str_eq(uc_val_2_str(1 , vals) , "1");
ck_assert_str_eq(uc_val_2_str(5 , vals) , "5");
fail_if(uc_vs_search(10, vals) != NULL);
fail_if(uc_val_2_str(10, vals) != NULL);
END_TEST
START_TEST (test_val_str_bsearch_odd)
@@ -26,15 +26,15 @@ START_TEST (test_val_str_bsearch_odd)
};
const size_t len = sizeof vals/sizeof vals[0];
ck_assert_str_eq(uc_vs_bsearch(1 , vals , len) , "1");
ck_assert_str_eq(uc_vs_bsearch(2 , vals , len) , "2");
ck_assert_str_eq(uc_vs_bsearch(10 , vals , len) , "10");
ck_assert_str_eq(uc_vs_bsearch(100 , vals , len) , "100");
ck_assert_str_eq(uc_vs_bsearch(101 , vals , len) , "101");
ck_assert_str_eq(uc_val_2_str_bs(1 , vals , len) , "1");
ck_assert_str_eq(uc_val_2_str_bs(2 , vals , len) , "2");
ck_assert_str_eq(uc_val_2_str_bs(10 , vals , len) , "10");
ck_assert_str_eq(uc_val_2_str_bs(100 , vals , len) , "100");
ck_assert_str_eq(uc_val_2_str_bs(101 , vals , len) , "101");
fail_if(uc_vs_bsearch(0 , vals , len) != NULL);
fail_if(uc_vs_bsearch(55 , vals , len) != NULL);
fail_if(uc_vs_bsearch(999 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(0 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(55 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(999 , vals , len) != NULL);
END_TEST
START_TEST (test_val_str_bsearch_even)
@@ -46,14 +46,14 @@ START_TEST (test_val_str_bsearch_even)
};
const size_t len = sizeof vals/sizeof vals[0];
ck_assert_str_eq(uc_vs_bsearch(1 , vals , len) , "1");
ck_assert_str_eq(uc_vs_bsearch(2 , vals , len) , "2");
ck_assert_str_eq(uc_vs_bsearch(10 , vals , len) , "10");
ck_assert_str_eq(uc_vs_bsearch(101 , vals , len) , "101");
ck_assert_str_eq(uc_val_2_str_bs(1 , vals , len) , "1");
ck_assert_str_eq(uc_val_2_str_bs(2 , vals , len) , "2");
ck_assert_str_eq(uc_val_2_str_bs(10 , vals , len) , "10");
ck_assert_str_eq(uc_val_2_str_bs(101 , vals , len) , "101");
fail_if(uc_vs_bsearch(0 , vals , len) != NULL);
fail_if(uc_vs_bsearch(55 , vals , len) != NULL);
fail_if(uc_vs_bsearch(999 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(0 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(55 , vals , len) != NULL);
fail_if(uc_val_2_str_bs(999 , vals , len) != NULL);
END_TEST