sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

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

Browse Source 
Also rename the corresponding wrap_ functions.
(This used to be commit e59c2eaf681f076d175b9779d1c27b5f74a57c96)
This commit is contained in:
Kai Blin 2007-12-24 13:04:56 -06:00 committed by Stefan Metzmacher
parent 95b1f554b2
commit 3c744ddd2c
12 changed files with 138 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/events/testsuite.c
View File

@ -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]);
}

9
source4/lib/messaging/tests/irpc.c
View File

@ -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;
}

40
source4/lib/registry/tests/hive.c
View File

@ -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)

73
source4/lib/registry/tests/registry.c
View File

@ -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)

5
source4/lib/util/tests/strlist.c
View File

@ -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);

6
source4/libcli/security/tests/sddl.c
View File

@ -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;

13
source4/librpc/tests/binding_string.c
View File

@ -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;
}

16
source4/param/tests/share.c
View File

@ -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)

6
source4/torture/local/dbspeed.c
View File

@ -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;
}

3
source4/torture/rpc/session_key.c
View File

@ -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 };

43
source4/torture/ui.c
View File

@ -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;

46
source4/torture/ui.h
View File

@ -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) \