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 eb761d318ac7488ed6e440ebf86b58bece410cd5..443d2c625600027c5f461a41393cb18b13b58c79 100644 (file)
--- 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 80a6a58da25093e32c5aa5502a3427370a654644..bcdf7e1cfee34b0a43efe60dda3886edd07b7a5a 100644 (file)
--- 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 9d8384de912a968bc8c9c385c79fb76c24cc474a..29dc322070a8b70891ac3fa82ddb4a9007fa8929 100644 (file)
--- 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 208a0b90a96f2431942076a6f7024ba533c62da6..25a250aab556a3863bcabe5d45d162972e1360ff 100644 (file)
--- 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 735096541d71a07c0fa3969099c02ec35400b3f2..a493ae3c97833cb9f8f41ffe3b1fa857ceaa022a 100644 (file)
--- 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 08cb1aac790b4f0ce04ff56f08016a0d9f6ad448..20921b100e56da3a77eb779523578c5abeeb1d7e 100644 (file)
--- 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 df1abbe052a5b211410769317c52c1fef3f41882..56fc6ad401aad6fc5366977e80869516d288cd7d 100644 (file)
--- 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 a57637e85c2bd02e2cb5a57ab9e605825b320454..fc87485bfb24d591a6b7ea257c2ab4e6e14dd257 100644 (file)
--- 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 efa37a5d00f6cf7eee325774a30333e0247cbaa6..fa2c771c30c0122d87330ad509f2e6469124f5a9 100644 (file)
--- 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 a67255e8150eea01190833f3c1cc19e5497820d0..3bca997a189155e694f76d9288bb3a5d214bfda6 100644 (file)
--- 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);
 }