r26588: Janitorial: Rename torture_*_add_*test to torture_*_add_*test_const.

Also rename the corresponding wrap_ functions.

diff --git a/source/lib/events/testsuite.c b/source/lib/events/testsuite.c
index 46acf5938e527d0bfe464c11fb8ebaebd36f27c7..7f2729ceff85f6bd06aefb45ad7ad60588a211b3 100644 (file)
--- a/source/lib/events/testsuite.c
+++ b/source/lib/events/testsuite.c
@@ -136,7 +136,7 @@ struct torture_suite *torture_local_event(TALLOC_CTX *mem_ctx)
        int i;
 
        for (i=0;list && list[i];i++) {
-               torture_suite_add_simple_tcase(suite, list[i],
+               torture_suite_add_simple_tcase_const(suite, list[i],
                                               test_event_context,
                                               (const void *)list[i]);
        }

diff --git a/source/lib/messaging/tests/irpc.c b/source/lib/messaging/tests/irpc.c
index ce3d1045e503277ac17c4621056d50101cdeb63e..a2995fc9835148c31eb2c2ae8d6ebc16d9aa76b6 100644 (file)
--- a/source/lib/messaging/tests/irpc.c
+++ b/source/lib/messaging/tests/irpc.c
@@ -260,11 +260,12 @@ struct torture_suite *torture_local_irpc(TALLOC_CTX *mem_ctx)
        tcase->setup = irpc_setup;
 
        for (i = 0; i < 5; i++) {
-               torture_tcase_add_test(tcase, "addone", test_addone, (void *)values[i]);
+               torture_tcase_add_test_const(tcase, "addone", test_addone,
+                               (void *)values[i]);
        }
-                                                  
-       torture_tcase_add_test(tcase, "echodata", test_echodata, NULL);
-       torture_tcase_add_test(tcase, "speed", test_speed, NULL);
+
+       torture_tcase_add_test_const(tcase, "echodata", test_echodata, NULL);
+       torture_tcase_add_test_const(tcase, "speed", test_speed, NULL);
 
        return suite;
 }

diff --git a/source/lib/registry/tests/hive.c b/source/lib/registry/tests/hive.c
index 43ec9e425285943825898e753f1e4d5cf4662350..dc59d0f9cafb6cd164390dc2932a676f1988ad19 100644 (file)
--- a/source/lib/registry/tests/hive.c
+++ b/source/lib/registry/tests/hive.c
@@ -264,26 +264,26 @@ static bool test_list_values(struct torture_context *tctx,
 
 static void tcase_add_tests(struct torture_tcase *tcase)
 {
-       torture_tcase_add_simple_test(tcase, "del_nonexistant_key",
-                                     test_del_nonexistant_key);
-       torture_tcase_add_simple_test(tcase, "add_subkey",
-                                     test_add_subkey);
-       torture_tcase_add_simple_test(tcase, "flush_key",
-                                     test_flush_key);
-       torture_tcase_add_simple_test(tcase, "get_info",
-                                     test_keyinfo_root);
-       torture_tcase_add_simple_test(tcase, "get_info_nums",
-                                     test_keyinfo_nums);
-       torture_tcase_add_simple_test(tcase, "set_value",
-                                     test_set_value);
-       torture_tcase_add_simple_test(tcase, "get_value",
-                                     test_get_value);
-       torture_tcase_add_simple_test(tcase, "list_values",
-                                     test_list_values);
-       torture_tcase_add_simple_test(tcase, "del_key",
-                                     test_del_key);
-       torture_tcase_add_simple_test(tcase, "del_value",
-                                     test_del_value);
+       torture_tcase_add_simple_test_const(tcase, "del_nonexistant_key",
+                                               test_del_nonexistant_key);
+       torture_tcase_add_simple_test_const(tcase, "add_subkey",
+                                               test_add_subkey);
+       torture_tcase_add_simple_test_const(tcase, "flush_key",
+                                               test_flush_key);
+       torture_tcase_add_simple_test_const(tcase, "get_info",
+                                               test_keyinfo_root);
+       torture_tcase_add_simple_test_const(tcase, "get_info_nums",
+                                               test_keyinfo_nums);
+       torture_tcase_add_simple_test_const(tcase, "set_value",
+                                               test_set_value);
+       torture_tcase_add_simple_test_const(tcase, "get_value",
+                                               test_get_value);
+       torture_tcase_add_simple_test_const(tcase, "list_values",
+                                               test_list_values);
+       torture_tcase_add_simple_test_const(tcase, "del_key",
+                                               test_del_key);
+       torture_tcase_add_simple_test_const(tcase, "del_value",
+                                               test_del_value);
 }
 
 static bool hive_setup_dir(struct torture_context *tctx, void **data)

diff --git a/source/lib/registry/tests/registry.c b/source/lib/registry/tests/registry.c
index 6c520f54edd69619b1582691bfee2988c97c9dab..789790986580d032c18f2f9ebddc2c8ff42a4135 100644 (file)
--- a/source/lib/registry/tests/registry.c
+++ b/source/lib/registry/tests/registry.c
@@ -560,42 +560,43 @@ static bool setup_local_registry(struct torture_context *tctx, void **data)
 
 static void tcase_add_tests(struct torture_tcase *tcase)
 {
-       torture_tcase_add_simple_test(tcase, "list_subkeys",
-                                     test_list_subkeys);
-       torture_tcase_add_simple_test(tcase, "get_predefined_key",
-                                     test_get_predefined);
-       torture_tcase_add_simple_test(tcase, "get_predefined_key",
-                                     test_get_predefined_unknown);
-       torture_tcase_add_simple_test(tcase, "create_key",
-                                     test_create_subkey);
-       torture_tcase_add_simple_test(tcase, "create_key",
-                                     test_create_nested_subkey);
-       torture_tcase_add_simple_test(tcase, "key_add_abs",
-                                     test_key_add_abs);
-       torture_tcase_add_simple_test(tcase, "key_add_abs_top",
-                                     test_key_add_abs_top);
-       torture_tcase_add_simple_test(tcase, "set_value",
-                                     test_set_value);
-       torture_tcase_add_simple_test(tcase, "get_value",
-                                     test_get_value);
-       torture_tcase_add_simple_test(tcase, "list_values",
-                                     test_list_values);
-       torture_tcase_add_simple_test(tcase, "del_key",
-                                     test_del_key);
-       torture_tcase_add_simple_test(tcase, "del_value",
-                                     test_del_value);
-       torture_tcase_add_simple_test(tcase, "flush_key",
-                                     test_flush_key);
-       torture_tcase_add_simple_test(tcase, "query_key",
-                                     test_query_key);
-       torture_tcase_add_simple_test(tcase, "query_key_nums",
-                                     test_query_key_nums);
-       torture_tcase_add_simple_test(tcase, "test_predef_key_by_name",
-                                     test_predef_key_by_name);
-       torture_tcase_add_simple_test(tcase, "security",
-                                     test_security);
-       torture_tcase_add_simple_test(tcase, "test_predef_key_by_name_invalid",
-                                     test_predef_key_by_name_invalid);
+       torture_tcase_add_simple_test_const(tcase, "list_subkeys",
+                                               test_list_subkeys);
+       torture_tcase_add_simple_test_const(tcase, "get_predefined_key",
+                                               test_get_predefined);
+       torture_tcase_add_simple_test_const(tcase, "get_predefined_key",
+                                               test_get_predefined_unknown);
+       torture_tcase_add_simple_test_const(tcase, "create_key",
+                                               test_create_subkey);
+       torture_tcase_add_simple_test_const(tcase, "create_key",
+                                               test_create_nested_subkey);
+       torture_tcase_add_simple_test_const(tcase, "key_add_abs",
+                                               test_key_add_abs);
+       torture_tcase_add_simple_test_const(tcase, "key_add_abs_top",
+                                               test_key_add_abs_top);
+       torture_tcase_add_simple_test_const(tcase, "set_value",
+                                               test_set_value);
+       torture_tcase_add_simple_test_const(tcase, "get_value",
+                                               test_get_value);
+       torture_tcase_add_simple_test_const(tcase, "list_values",
+                                               test_list_values);
+       torture_tcase_add_simple_test_const(tcase, "del_key",
+                                               test_del_key);
+       torture_tcase_add_simple_test_const(tcase, "del_value",
+                                               test_del_value);
+       torture_tcase_add_simple_test_const(tcase, "flush_key",
+                                               test_flush_key);
+       torture_tcase_add_simple_test_const(tcase, "query_key",
+                                               test_query_key);
+       torture_tcase_add_simple_test_const(tcase, "query_key_nums",
+                                               test_query_key_nums);
+       torture_tcase_add_simple_test_const(tcase, "test_predef_key_by_name",
+                                               test_predef_key_by_name);
+       torture_tcase_add_simple_test_const(tcase, "security",
+                                               test_security);
+       torture_tcase_add_simple_test_const(tcase,
+                       "test_predef_key_by_name_invalid",
+                       test_predef_key_by_name_invalid);
 }
 
 struct torture_suite *torture_registry_registry(TALLOC_CTX *mem_ctx)

diff --git a/source/lib/util/tests/strlist.c b/source/lib/util/tests/strlist.c
index 3ecb982e243ee0c46d369f4993e293b8af3746b7..9af26f9e71efebff9f9b3b87d8599dbe99459263 100644 (file)
--- a/source/lib/util/tests/strlist.c
+++ b/source/lib/util/tests/strlist.c
@@ -93,9 +93,8 @@ struct torture_suite *torture_local_util_strlist(TALLOC_CTX *mem_ctx)
        int i;
 
        for (i = 0; test_lists_shell_strings[i]; i++) {
-               torture_suite_add_simple_tcase(suite, 
-                                                                          "lists_shell", test_lists_shell,
-                                                                          &test_lists_shell_strings[i]);
+               torture_suite_add_simple_tcase_const(suite, "lists_shell",
+                               test_lists_shell, &test_lists_shell_strings[i]);
        }
 
        torture_suite_add_simple_test(suite, "list_copy", test_list_copy);

diff --git a/source/libcli/security/tests/sddl.c b/source/libcli/security/tests/sddl.c
index 3e6382309e2ea27e0d0fb6e32f848ea3f8f8182a..9e7705ea9233f74a56436eb27aa7416ad68c9415 100644 (file)
--- a/source/libcli/security/tests/sddl.c
+++ b/source/libcli/security/tests/sddl.c
@@ -96,9 +96,9 @@ struct torture_suite *torture_local_sddl(TALLOC_CTX *mem_ctx)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(examples); i++) {
-               torture_suite_add_simple_tcase(suite, 
-                                                               talloc_asprintf(suite, "%d", i), 
-                                                               test_sddl, examples[i]);
+               torture_suite_add_simple_tcase_const(suite,
+                               talloc_asprintf(suite, "%d", i),
+                               test_sddl, examples[i]);
        }
 
        return suite;

diff --git a/source/librpc/tests/binding_string.c b/source/librpc/tests/binding_string.c
index 362848049b08e81bfbcbc3ab7422e69b30f87620..5e6fb04515b3e9c655c2943814823f215be50ba0 100644 (file)
--- a/source/librpc/tests/binding_string.c
+++ b/source/librpc/tests/binding_string.c
@@ -154,17 +154,18 @@ static bool test_no_transport(struct torture_context *tctx)
 struct torture_suite *torture_local_binding_string(TALLOC_CTX *mem_ctx)
 {
        int i;
-       struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                                                                          "BINDING");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "BINDING");
 
        for (i = 0; i < ARRAY_SIZE(test_strings); i++) {
-               torture_suite_add_simple_tcase(suite, test_strings[i],
-                                               test_BindingString, test_strings[i]);
+               torture_suite_add_simple_tcase_const(suite, test_strings[i],
+                                               test_BindingString,
+                                               test_strings[i]);
        }
 
-       torture_suite_add_simple_test(suite, "no transport", test_no_transport);
+       torture_suite_add_simple_test(suite, "no transport",test_no_transport);
 
-       torture_suite_add_simple_test(suite, "parsing results", test_parse_check_results);
+       torture_suite_add_simple_test(suite, "parsing results",
+                       test_parse_check_results);
 
        return suite;
 }

diff --git a/source/param/tests/share.c b/source/param/tests/share.c
index 390da9dededd3fba6a425605155b1fd6401b2da5..6d03b4e0492459afb0e786cc418870979a52d0c5 100644 (file)
--- a/source/param/tests/share.c
+++ b/source/param/tests/share.c
@@ -168,12 +168,16 @@ static bool test_double_create(struct torture_context *tctx,
 
 static void tcase_add_share_tests(struct torture_tcase *tcase)
 {
-       torture_tcase_add_test(tcase, "list_empty", test_list_empty, NULL);
-       torture_tcase_add_test(tcase, "share_create", test_create, NULL);
-       torture_tcase_add_test(tcase, "share_remove", test_share_remove, NULL);
-       torture_tcase_add_test(tcase, "share_remove_invalid", test_share_remove_invalid, NULL);
-       torture_tcase_add_test(tcase, "share_create_invalid", test_create_invalid, NULL);
-       torture_tcase_add_test(tcase, "share_double_create", test_double_create, NULL);
+       torture_tcase_add_test_const(tcase, "list_empty", test_list_empty,NULL);
+       torture_tcase_add_test_const(tcase, "share_create", test_create, NULL);
+       torture_tcase_add_test_const(tcase, "share_remove", test_share_remove,
+                       NULL);
+       torture_tcase_add_test_const(tcase, "share_remove_invalid",
+                       test_share_remove_invalid, NULL);
+       torture_tcase_add_test_const(tcase, "share_create_invalid",
+                       test_create_invalid, NULL);
+       torture_tcase_add_test_const(tcase, "share_double_create",
+                       test_double_create, NULL);
 }
 
 static bool setup_ldb(struct torture_context *tctx, void **data)

diff --git a/source/torture/local/dbspeed.c b/source/torture/local/dbspeed.c
index 47af7935fb1fb31c331674ede1c11d88e6f9f6a4..34083cd204fd3039886eed17a51a41021aa1595e 100644 (file)
--- a/source/torture/local/dbspeed.c
+++ b/source/torture/local/dbspeed.c
@@ -253,7 +253,9 @@ failed:
 struct torture_suite *torture_local_dbspeed(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *s = torture_suite_create(mem_ctx, "DBSPEED");
-       torture_suite_add_simple_tcase(s, "tdb_speed", test_tdb_speed, NULL);
-       torture_suite_add_simple_tcase(s, "ldb_speed", test_ldb_speed, NULL);
+       torture_suite_add_simple_tcase_const(s, "tdb_speed", test_tdb_speed,
+                       NULL);
+       torture_suite_add_simple_tcase_const(s, "ldb_speed", test_ldb_speed,
+                       NULL);
        return s;
 }

diff --git a/source/torture/rpc/session_key.c b/source/torture/rpc/session_key.c
index 44c3ae2358eaa4392f9c38c626ea8384fd5db7d3..fcb828ddb2daa14e4c39b9eff4288bd7680c0048 100644 (file)
--- a/source/torture/rpc/session_key.c
+++ b/source/torture/rpc/session_key.c
@@ -201,7 +201,8 @@ static struct torture_tcase *add_test(struct torture_suite *suite, uint32_t bind
        name = talloc_asprintf_append_buffer(name, " lm_key:%s", lm_key?"yes":"no");
        settings->lm_key = lm_key;
 
-       return torture_suite_add_simple_tcase(suite, name, test_secrets, settings);
+       return torture_suite_add_simple_tcase_const(suite, name, test_secrets,
+                       settings);
 }
 
 static const bool bool_vals[] = { true, false };

diff --git a/source/torture/ui.c b/source/torture/ui.c
index 95d95937ed2030c55871c835c66e650fbfb7f123..ce72dd5b088d8ce0d3498f09feda5c3c914ec77a 100644 (file)
--- a/source/torture/ui.c
+++ b/source/torture/ui.c
@@ -113,11 +113,11 @@ void torture_tcase_set_fixture(struct torture_tcase *tcase,
        tcase->teardown = teardown;
 }
 
-static bool wrap_test_with_testcase(struct torture_context *torture_ctx,
+static bool wrap_test_with_testcase_const(struct torture_context *torture_ctx,
                                    struct torture_tcase *tcase,
                                    struct torture_test *test)
 {
-       bool (*fn) (struct torture_context *, 
+       bool (*fn) (struct torture_context *,
                    const void *tcase_data,
                    const void *test_data);
 
@@ -126,16 +126,17 @@ static bool wrap_test_with_testcase(struct torture_context *torture_ctx,
        return fn(torture_ctx, tcase->data, test->data);
 }
 
-struct torture_test *torture_tcase_add_test(struct torture_tcase *tcase, 
-                                           const char *name, 
-                                           bool (*run) (struct torture_context *, const void *tcase_data, const void *test_data),
-                                           const void *data)
+struct torture_test *torture_tcase_add_test_const(struct torture_tcase *tcase,
+               const char *name,
+               bool (*run) (struct torture_context *, const void *tcase_data,
+                       const void *test_data),
+               const void *data)
 {
        struct torture_test *test = talloc(tcase, struct torture_test);
 
        test->name = talloc_strdup(test, name);
        test->description = NULL;
-       test->run = wrap_test_with_testcase;
+       test->run = wrap_test_with_testcase_const;
        test->fn = run;
        test->dangerous = false;
        test->data = data;
@@ -400,9 +401,10 @@ const char *torture_setting_string(struct torture_context *test,
        return ret;
 }
 
-static bool wrap_test_with_simple_tcase(struct torture_context *torture_ctx,
-                                       struct torture_tcase *tcase,
-                                       struct torture_test *test)
+static bool wrap_test_with_simple_tcase_const (
+               struct torture_context *torture_ctx,
+               struct torture_tcase *tcase,
+               struct torture_test *test)
 {
        bool (*fn) (struct torture_context *, const void *tcase_data);
 
@@ -411,21 +413,21 @@ static bool wrap_test_with_simple_tcase(struct torture_context *torture_ctx,
        return fn(torture_ctx, test->data);
 }
 
-struct torture_tcase *torture_suite_add_simple_tcase(
+struct torture_tcase *torture_suite_add_simple_tcase_const(
                struct torture_suite *suite, const char *name,
                bool (*run) (struct torture_context *test, const void *),
                const void *data)
 {
        struct torture_tcase *tcase;
-       struct torture_test *test; 
-       
+       struct torture_test *test;
+
        tcase = torture_suite_add_tcase(suite, name);
 
        test = talloc(tcase, struct torture_test);
 
        test->name = talloc_strdup(test, name);
        test->description = NULL;
-       test->run = wrap_test_with_simple_tcase;
+       test->run = wrap_test_with_simple_tcase_const;
        test->fn = run;
        test->data = data;
        test->dangerous = false;
@@ -496,7 +498,7 @@ struct torture_suite *torture_find_suite(struct torture_suite *parent,
        return NULL;
 }
 
-static bool wrap_test_with_simple_test(struct torture_context *torture_ctx,
+static bool wrap_test_with_simple_test_const(struct torture_context *torture_ctx,
                                       struct torture_tcase *tcase,
                                       struct torture_test *test)
 {
@@ -507,18 +509,19 @@ static bool wrap_test_with_simple_test(struct torture_context *torture_ctx,
        return fn(torture_ctx, tcase->data);
 }
 
-struct torture_test *torture_tcase_add_simple_test(
+struct torture_test *torture_tcase_add_simple_test_const(
                struct torture_tcase *tcase,
                const char *name,
-               bool (*run) (struct torture_context *test, const void *tcase_data))
+               bool (*run) (struct torture_context *test,
+                       const void *tcase_data))
 {
-       struct torture_test *test; 
-       
+       struct torture_test *test;
+
        test = talloc(tcase, struct torture_test);
 
        test->name = talloc_strdup(test, name);
        test->description = NULL;
-       test->run = wrap_test_with_simple_test;
+       test->run = wrap_test_with_simple_test_const;
        test->fn = run;
        test->data = NULL;
        test->dangerous = false;

diff --git a/source/torture/ui.h b/source/torture/ui.h
index 5f0ec3dbff312d613959a9d635db584bd4de10d2..503a4f4decd6b65c73fc5de1ffd6ee4ff30a2839 100644 (file)
--- a/source/torture/ui.h
+++ b/source/torture/ui.h
@@ -140,67 +140,69 @@ struct torture_suite
 };
 
 /** Create a new torture suite */
-struct torture_suite *torture_suite_create(TALLOC_CTX *mem_ctx, 
-                                                                                  const char *name);
+struct torture_suite *torture_suite_create(TALLOC_CTX *mem_ctx,
+               const char *name);
 
 /** Change the setup and teardown functions for a testcase */
-void torture_tcase_set_fixture(struct torture_tcase *tcase, 
+void torture_tcase_set_fixture(struct torture_tcase *tcase,
                bool (*setup) (struct torture_context *, void **),
                bool (*teardown) (struct torture_context *, void *));
 
 /* Add another test to run for a particular testcase */
-struct torture_test *torture_tcase_add_test(struct torture_tcase *tcase, 
-               const char *name, 
-               bool (*run) (struct torture_context *test, const void *tcase_data,
-                                        const void *test_data),
+struct torture_test *torture_tcase_add_test_const(struct torture_tcase *tcase,
+               const char *name,
+               bool (*run) (struct torture_context *test,
+                       const void *tcase_data, const void *test_data),
                const void *test_data);
 
 /* Add a testcase to a testsuite */
-struct torture_tcase *torture_suite_add_tcase(struct torture_suite *suite, 
+struct torture_tcase *torture_suite_add_tcase(struct torture_suite *suite,
                                                         const char *name);
 
-/* Convenience wrapper that adds a testcase against only one 
+/* Convenience wrapper that adds a testcase against only one
  * test will be run */
-struct torture_tcase *torture_suite_add_simple_tcase(
-               struct torture_suite *suite, 
+struct torture_tcase *torture_suite_add_simple_tcase_const(
+               struct torture_suite *suite,
                const char *name,
-               bool (*run) (struct torture_context *test, const void *test_data),
+               bool (*run) (struct torture_context *test,
+                       const void *test_data),
                const void *data);
 
-/* Convenience function that adds a test which only 
+/* Convenience function that adds a test which only
  * gets the test case data */
-struct torture_test *torture_tcase_add_simple_test(
+struct torture_test *torture_tcase_add_simple_test_const(
                struct torture_tcase *tcase,
                const char *name,
-               bool (*run) (struct torture_context *test, const void *tcase_data));
+               bool (*run) (struct torture_context *test,
+                       const void *tcase_data));
 
-/* Convenience wrapper that adds a test that doesn't need any 
+/* Convenience wrapper that adds a test that doesn't need any
  * testcase data */
 struct torture_tcase *torture_suite_add_simple_test(
-               struct torture_suite *suite, 
+               struct torture_suite *suite,
                const char *name,
                bool (*run) (struct torture_context *test));
 
 /* Add a child testsuite to an existing testsuite */
 bool torture_suite_add_suite(struct torture_suite *suite,
-                                                        struct torture_suite *child);
+               struct torture_suite *child);
 
 /* Run the specified testsuite recursively */
-bool torture_run_suite(struct torture_context *context, 
+bool torture_run_suite(struct torture_context *context,
                                           struct torture_suite *suite);
 
 /* Run the specified testcase */
-bool torture_run_tcase(struct torture_context *context, 
+bool torture_run_tcase(struct torture_context *context,
                                           struct torture_tcase *tcase);
 
 /* Run the specified test */
-bool torture_run_test(struct torture_context *context, 
+bool torture_run_test(struct torture_context *context,
                                          struct torture_tcase *tcase,
                                          struct torture_test *test);
 
 void torture_comment(struct torture_context *test, const char *comment, ...) PRINTF_ATTRIBUTE(2,3);
 void torture_warning(struct torture_context *test, const char *comment, ...) PRINTF_ATTRIBUTE(2,3);
-void torture_result(struct torture_context *test, 
+void torture_result(struct torture_context *test,
                        enum torture_result, const char *reason, ...) PRINTF_ATTRIBUTE(3,4);
 
 #define torture_assert(torture_ctx,expr,cmt) \