svn commit: samba r24186 - in branches/4.0-regwrite: .
source/lib/registry/common source/torture/local
jelmer at samba.org
jelmer at samba.org
Sat Aug 4 13:14:50 GMT 2007
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 <jelmer at samba.org>
properties:
branch-nick: 4.0-regwrite
rebase-of: jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d
+ timestamp: Wed 2007-01-17 03:26:06.859999895 +0100
committer: Jelmer Vernooij <jelmer at samba.org>
properties:
branch-nick: 4.0-regwrite
rebase-of: jelmer at samba.org-20070117022606-q54g08ss30u86c5c
Name: bzr:file-ids
- source/rpc_server/dcesrv_mgmt.c 20830 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:source%2Frpc_server%2Fdcesrv_mgmt.c
+
Name: bzr:revision-id:v3-trunk0
- 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
+ 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
11159 jelmer at samba.org-20070117022606-q54g08ss30u86c5c-svn3-upgrade
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]);
}
More information about the samba-cvs
mailing list