Author: jelmer Date: 2007-08-04 13:14:49 +0000 (Sat, 04 Aug 2007) New Revision: 24186
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24186 Log: Add some tests. Modified: branches/4.0-regwrite/ branches/4.0-regwrite/source/lib/registry/common/reg_util.c branches/4.0-regwrite/source/torture/local/registry.c Changeset: Property changes on: branches/4.0-regwrite ___________________________________________________________________ Name: bzr:revision-info - timestamp: Wed 2007-01-17 02:38:53.476000071 +0100 committer: Jelmer Vernooij <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] + timestamp: Wed 2007-01-17 03:26:06.859999895 +0100 committer: Jelmer Vernooij <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] Name: bzr:file-ids - source/rpc_server/dcesrv_mgmt.c [EMAIL PROTECTED]:branches%2FSAMBA_4_0:source%2Frpc_server%2Fdcesrv_mgmt.c + Name: bzr:revision-id:v3-trunk0 - 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] 11150 [EMAIL PROTECTED] 11151 [EMAIL PROTECTED] 11152 [EMAIL PROTECTED] 11153 [EMAIL PROTECTED] 11154 [EMAIL PROTECTED] 11155 [EMAIL PROTECTED] 11156 [EMAIL PROTECTED] 11157 [EMAIL PROTECTED] 11158 [EMAIL PROTECTED] + 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] 11150 [EMAIL PROTECTED] 11151 [EMAIL PROTECTED] 11152 [EMAIL PROTECTED] 11153 [EMAIL PROTECTED] 11154 [EMAIL PROTECTED] 11155 [EMAIL PROTECTED] 11156 [EMAIL PROTECTED] 11157 [EMAIL PROTECTED] 11158 [EMAIL PROTECTED] 11159 [EMAIL PROTECTED] Modified: branches/4.0-regwrite/source/lib/registry/common/reg_util.c =================================================================== --- branches/4.0-regwrite/source/lib/registry/common/reg_util.c 2007-08-04 13:14:39 UTC (rev 24185) +++ branches/4.0-regwrite/source/lib/registry/common/reg_util.c 2007-08-04 13:14:49 UTC (rev 24186) @@ -87,7 +87,8 @@ /** Generate a string that describes a registry value */ _PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value *val) { - return talloc_asprintf(mem_ctx, "%s = %s : %s", val->name?val->name:"<No Name>", str_regtype(val->data_type), reg_val_data_string(mem_ctx, val->data_type, &val->data)); + return talloc_asprintf(mem_ctx, "%s = %s : %s", val->name?val->name:"<No Name>", + str_regtype(val->data_type), reg_val_data_string(mem_ctx, val->data_type, &val->data)); } _PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data) Modified: branches/4.0-regwrite/source/torture/local/registry.c =================================================================== --- branches/4.0-regwrite/source/torture/local/registry.c 2007-08-04 13:14:39 UTC (rev 24185) +++ branches/4.0-regwrite/source/torture/local/registry.c 2007-08-04 13:14:49 UTC (rev 24186) @@ -24,6 +24,7 @@ #include "lib/registry/registry.h" #include "lib/cmdline/popt_common.h" #include "torture/torture.h" +#include "librpc/gen_ndr/winreg.h" const static struct test_backend_settings { const char *name; @@ -76,7 +77,74 @@ return true; } +static bool test_str_regtype(struct torture_context *ctx) +{ + torture_assert_str_equal(ctx, str_regtype(1), "REG_SZ", "REG_SZ failed"); + torture_assert_str_equal(ctx, str_regtype(4), "REG_DWORD", "REG_DWORD failed"); + return true; +} + + +static bool test_reg_val_data_string_dword(struct torture_context *ctx) +{ + uint32_t d = 0x20; + DATA_BLOB db = { (uint8_t *)&d, sizeof(d) }; + torture_assert_str_equal(ctx, "0x20", reg_val_data_string(ctx, REG_DWORD, &db), "dword failed"); + return true; +} + +static bool test_reg_val_data_string_sz(struct torture_context *ctx) +{ + DATA_BLOB db; + db.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, "bla", 3, (void **)&db.data); + torture_assert_str_equal(ctx, "bla", reg_val_data_string(ctx, REG_SZ, &db), "sz failed"); + db.length = 4; + torture_assert_str_equal(ctx, "bl", reg_val_data_string(ctx, REG_SZ, &db), "sz failed"); + return true; +} + +static bool test_reg_val_data_string_binary(struct torture_context *ctx) +{ + uint8_t x[] = { 0x1, 0x2, 0x3, 0x4 }; + DATA_BLOB db = { x, 4 }; + torture_assert_str_equal(ctx, "01020304", reg_val_data_string(ctx, REG_BINARY, &db), "binary failed"); + return true; +} + + +static bool test_reg_val_data_string_empty(struct torture_context *ctx) +{ + DATA_BLOB db = { NULL, 0 }; + torture_assert_str_equal(ctx, "", reg_val_data_string(ctx, REG_BINARY, &db), "empty failed"); + return true; +} + +static bool test_reg_val_description(struct torture_context *ctx) +{ + struct registry_value val; + val.name = "camel"; + val.data_type = REG_SZ; + val.data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, "stationary traveller", + strlen("stationary traveller"), (void **)&val.data.data); + torture_assert_str_equal(ctx, "camel = REG_SZ : stationary traveller", reg_val_description(ctx, &val), + "reg_val_description failed"); + return true; +} + + +static bool test_reg_val_description_nullname(struct torture_context *ctx) +{ + struct registry_value val; + val.name = NULL; + val.data_type = REG_SZ; + val.data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, "west berlin", + strlen("west berlin"), (void **)&val.data.data); + torture_assert_str_equal(ctx, "<No Name> = REG_SZ : west berlin", reg_val_description(ctx, &val), + "description with null name failed"); + return true; +} + struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, @@ -85,6 +153,14 @@ registry_init(); + torture_suite_add_simple_test(suite, "str_regtype", test_str_regtype); + torture_suite_add_simple_test(suite, "reg_val_data_string dword", test_reg_val_data_string_dword); + torture_suite_add_simple_test(suite, "reg_val_data_string sz", test_reg_val_data_string_sz); + torture_suite_add_simple_test(suite, "reg_val_data_string binary", test_reg_val_data_string_binary); + torture_suite_add_simple_test(suite, "reg_val_data_string empty", test_reg_val_data_string_empty); + torture_suite_add_simple_test(suite, "reg_val_description", test_reg_val_description); + torture_suite_add_simple_test(suite, "reg_val_description null", test_reg_val_description_nullname); + for (i = 0; backends[i].name; i++) { torture_suite_add_simple_tcase(suite, backends[i].name, test_hive, &backends[i]); }