From: Jocelyn Turcotte Date: Mon, 21 Aug 2017 18:05:00 +0000 (+0200) Subject: Fix cmocka deprecation warnings X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~701^2~141 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7280359c66460a95e946d899daa326aaaff25329;p=nextcloud-desktop.git Fix cmocka deprecation warnings Just use cmocka_run_group_tests like we already use in some of those tests. --- diff --git a/test/csync/encoding_tests/check_encoding.cpp b/test/csync/encoding_tests/check_encoding.cpp index eb761d318..443d2c625 100644 --- a/test/csync/encoding_tests/check_encoding.cpp +++ b/test/csync/encoding_tests/check_encoding.cpp @@ -27,16 +27,6 @@ #endif -static void setup(void **state) -{ - (void) state; /* unused */ -} - -static void teardown(void **state) -{ - (void) state; /* unused */ -} - static void check_iconv_to_native_normalization(void **state) { mbchar_t *out = NULL; @@ -191,15 +181,15 @@ static void check_long_win_path(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(check_long_win_path, setup, teardown), - unit_test_setup_teardown(check_to_multibyte, setup, teardown), - unit_test_setup_teardown(check_iconv_ascii, setup, teardown), - unit_test_setup_teardown(check_iconv_to_native_normalization, setup, teardown), - unit_test_setup_teardown(check_iconv_from_native_normalization, setup, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_long_win_path), + cmocka_unit_test(check_to_multibyte), + cmocka_unit_test(check_iconv_ascii), + cmocka_unit_test(check_iconv_to_native_normalization), + cmocka_unit_test(check_iconv_from_native_normalization), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_alloc.c b/test/csync/std_tests/check_std_c_alloc.c index 80a6a58da..bcdf7e1cf 100644 --- a/test/csync/std_tests/check_std_c_alloc.c +++ b/test/csync/std_tests/check_std_c_alloc.c @@ -77,13 +77,13 @@ static void check_c_strndup(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_malloc), - unit_test(check_c_malloc_zero), - unit_test(check_c_strdup), - unit_test(check_c_strndup), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_malloc), + cmocka_unit_test(check_c_malloc_zero), + cmocka_unit_test(check_c_strdup), + cmocka_unit_test(check_c_strndup), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_jhash.c b/test/csync/std_tests/check_std_c_jhash.c index 9d8384de9..29dc32207 100644 --- a/test/csync/std_tests/check_std_c_jhash.c +++ b/test/csync/std_tests/check_std_c_jhash.c @@ -278,15 +278,15 @@ static void check_c_jhash64_null_strings(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_jhash_trials), - unit_test(check_c_jhash_alignment_problems), - unit_test(check_c_jhash_null_strings), - unit_test(check_c_jhash64_trials), - unit_test(check_c_jhash64_alignment_problems), - unit_test(check_c_jhash64_null_strings), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_jhash_trials), + cmocka_unit_test(check_c_jhash_alignment_problems), + cmocka_unit_test(check_c_jhash_null_strings), + cmocka_unit_test(check_c_jhash64_trials), + cmocka_unit_test(check_c_jhash64_alignment_problems), + cmocka_unit_test(check_c_jhash64_null_strings), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_path.c b/test/csync/std_tests/check_std_c_path.c index 208a0b90a..25a250aab 100644 --- a/test/csync/std_tests/check_std_c_path.c +++ b/test/csync/std_tests/check_std_c_path.c @@ -172,14 +172,14 @@ static void check_c_parse_uri(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_basename), - unit_test(check_c_basename_uri), - unit_test(check_c_dirname), - unit_test(check_c_dirname_uri), - unit_test(check_c_parse_uri), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_basename), + cmocka_unit_test(check_c_basename_uri), + cmocka_unit_test(check_c_dirname), + cmocka_unit_test(check_c_dirname_uri), + cmocka_unit_test(check_c_parse_uri), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_rbtree.c b/test/csync/std_tests/check_std_c_rbtree.c index 735096541..a493ae3c9 100644 --- a/test/csync/std_tests/check_std_c_rbtree.c +++ b/test/csync/std_tests/check_std_c_rbtree.c @@ -82,15 +82,16 @@ static void destructor(void *data) { SAFE_FREE(freedata); } -static void setup(void **state) { +static int setup(void **state) { c_rbtree_t *tree = NULL; c_rbtree_create(&tree, key_cmp, data_cmp); *state = tree; + return 0; } -static void setup_complete_tree(void **state) { +static int setup_complete_tree(void **state) { c_rbtree_t *tree = NULL; int i = 0; int rc; @@ -110,15 +111,17 @@ static void setup_complete_tree(void **state) { } *state = tree; + return 0; } -static void teardown(void **state) { +static int teardown(void **state) { c_rbtree_t *tree = *state; c_rbtree_destroy(tree, destructor); c_rbtree_free(tree); *state = NULL; + return 0; } static void check_c_rbtree_create_free(void **state) @@ -345,19 +348,19 @@ static void check_c_rbtree_x) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_rbtree_create_free), - unit_test(check_c_rbtree_free_null), - unit_test(check_c_rbtree_insert_delete), - unit_test_setup_teardown(check_c_rbtree_insert_random, setup, teardown), - unit_test_setup_teardown(check_c_rbtree_insert_duplicate, setup, teardown), - unit_test_setup_teardown(check_c_rbtree_find, setup_complete_tree, teardown), - unit_test_setup_teardown(check_c_rbtree_delete, setup_complete_tree, teardown), - unit_test_setup_teardown(check_c_rbtree_walk, setup_complete_tree, teardown), - unit_test_setup_teardown(check_c_rbtree_walk_null, setup_complete_tree, teardown), - unit_test_setup_teardown(check_c_rbtree_dup, setup_complete_tree, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_rbtree_create_free), + cmocka_unit_test(check_c_rbtree_free_null), + cmocka_unit_test(check_c_rbtree_insert_delete), + cmocka_unit_test_setup_teardown(check_c_rbtree_insert_random, setup, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_insert_duplicate, setup, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_find, setup_complete_tree, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_delete, setup_complete_tree, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_walk, setup_complete_tree, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_walk_null, setup_complete_tree, teardown), + cmocka_unit_test_setup_teardown(check_c_rbtree_dup, setup_complete_tree, teardown), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_str.c b/test/csync/std_tests/check_std_c_str.c index 08cb1aac7..20921b100 100644 --- a/test/csync/std_tests/check_std_c_str.c +++ b/test/csync/std_tests/check_std_c_str.c @@ -117,15 +117,15 @@ static void check_c_strlist_expand(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_streq_equal), - unit_test(check_c_streq_not_equal), - unit_test(check_c_streq_null), - unit_test(check_c_strlist_new), - unit_test(check_c_strlist_add), - unit_test(check_c_strlist_expand), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_streq_equal), + cmocka_unit_test(check_c_streq_not_equal), + cmocka_unit_test(check_c_streq_null), + cmocka_unit_test(check_c_strlist_new), + cmocka_unit_test(check_c_strlist_add), + cmocka_unit_test(check_c_strlist_expand), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/std_tests/check_std_c_time.c b/test/csync/std_tests/check_std_c_time.c index df1abbe05..56fc6ad40 100644 --- a/test/csync/std_tests/check_std_c_time.c +++ b/test/csync/std_tests/check_std_c_time.c @@ -88,13 +88,13 @@ static void check_c_secdiff_three(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_c_tspecdiff), - unit_test(check_c_tspecdiff_five), - unit_test(check_c_secdiff), - unit_test(check_c_secdiff_three), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_c_tspecdiff), + cmocka_unit_test(check_c_tspecdiff_five), + cmocka_unit_test(check_c_secdiff), + cmocka_unit_test(check_c_secdiff_three), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/vio_tests/check_vio.cpp b/test/csync/vio_tests/check_vio.cpp index a57637e85..fc87485bf 100644 --- a/test/csync/vio_tests/check_vio.cpp +++ b/test/csync/vio_tests/check_vio.cpp @@ -38,7 +38,7 @@ static char wd_buffer[WD_BUFFER_SIZE]; -static void setup(void **state) +static int setup(void **state) { CSYNC *csync; int rc; @@ -53,9 +53,10 @@ static void setup(void **state) csync->replica = LOCAL_REPLICA; *state = csync; + return 0; } -static void setup_dir(void **state) { +static int setup_dir(void **state) { int rc; mbchar_t *dir = c_utf8_path_to_locale(CSYNC_TEST_DIR); @@ -69,9 +70,10 @@ static void setup_dir(void **state) { rc = chdir(CSYNC_TEST_DIR); assert_int_equal(rc, 0); + return 0; } -static void teardown(void **state) { +static int teardown(void **state) { CSYNC *csync = (CSYNC*)*state; int rc; @@ -85,6 +87,7 @@ static void teardown(void **state) { assert_int_equal(rc, 0); *state = NULL; + return 0; } @@ -155,12 +158,12 @@ static void check_csync_vio_readdir(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown), - unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown), - unit_test(check_csync_vio_closedir_null), - unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown), + cmocka_unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown), + cmocka_unit_test(check_csync_vio_closedir_null), + cmocka_unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp index efa37a5d0..fa2c771c3 100644 --- a/test/csync/vio_tests/check_vio_ext.cpp +++ b/test/csync/vio_tests/check_vio_ext.cpp @@ -74,7 +74,7 @@ static int wipe_testdir() return rc; } -static void setup_testenv(void **state) { +static int setup_testenv(void **state) { int rc; rc = wipe_testdir(); @@ -101,6 +101,7 @@ static void setup_testenv(void **state) { mystate->csync->replica = LOCAL_REPLICA; *state = mystate; + return 0; } static void output( const char *text ) @@ -115,7 +116,7 @@ static void output( const char *text ) c_free_locale_string(wtext); } -static void teardown(void **state) { +static int teardown(void **state) { statevar *sv = (statevar*) *state; CSYNC *csync = sv->csync; int rc; @@ -132,6 +133,7 @@ static void teardown(void **state) { assert_int_equal(rc, 0); *state = NULL; + return 0; } /* This function takes a relative path, prepends it with the CSYNC_TEST_DIR @@ -453,12 +455,12 @@ static void check_readdir_bigunicode(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(check_readdir_shorttree, setup_testenv, teardown), - unit_test_setup_teardown(check_readdir_with_content, setup_testenv, teardown), - unit_test_setup_teardown(check_readdir_longtree, setup_testenv, teardown), - unit_test_setup_teardown(check_readdir_bigunicode, setup_testenv, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(check_readdir_shorttree, setup_testenv, teardown), + cmocka_unit_test_setup_teardown(check_readdir_with_content, setup_testenv, teardown), + cmocka_unit_test_setup_teardown(check_readdir_longtree, setup_testenv, teardown), + cmocka_unit_test_setup_teardown(check_readdir_bigunicode, setup_testenv, teardown), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/csync/vio_tests/check_vio_file_stat.cpp b/test/csync/vio_tests/check_vio_file_stat.cpp index a67255e81..3bca997a1 100644 --- a/test/csync/vio_tests/check_vio_file_stat.cpp +++ b/test/csync/vio_tests/check_vio_file_stat.cpp @@ -36,10 +36,10 @@ static void check_csync_vio_file_stat_new(void **state) int torture_run_tests(void) { - const UnitTest tests[] = { - unit_test(check_csync_vio_file_stat_new), + const struct CMUnitTest tests[] = { + cmocka_unit_test(check_csync_vio_file_stat_new), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); }