1 files changed, 63 insertions, 46 deletions

diff --git a/source4/lib/registry/tests/generic.c b/source4/lib/registry/tests/generic.c
index d200ba6e1b..ac4ab98fc0 100644
--- a/source4/lib/registry/tests/generic.c
+++ b/source4/lib/registry/tests/generic.c
@@ -24,70 +24,87 @@
 #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;
-	const char *location;
-} backends[] = {
-	{ "nt4", "TEST.DAT" },
-	{ "ldb", "test.ldb" },
-	{ "gconf", "." },
-	{ "dir", "." },
-	{ NULL, NULL }
-};
-
-static bool test_hive(struct torture_context *tctx,
-					  const void *test_data)
+static bool test_str_regtype(struct torture_context *ctx)
 {
-	WERROR error;
-	struct registry_key *root, *subkey;
-	uint32_t count;
-	const struct test_backend_settings *backend = test_data;
-	TALLOC_CTX *mem_ctx = tctx;
+	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");
 
-	if (!reg_has_backend(backend->name)) {
-		torture_skip(tctx, talloc_asprintf(tctx, 
-						"Backend '%s' support not compiled in", backend->name));
-	}
-
-	error = reg_open_hive(mem_ctx, backend->name, 
-						  backend->location, NULL, cmdline_credentials, &root);
-	torture_assert_werr_ok(tctx, error, "reg_open_hive()");
+	return true;
+}
 
-	/* This is a new backend. There should be no subkeys and no 
-	 * values */
-	error = reg_key_num_subkeys(root, &count);
-	torture_assert_werr_ok(tctx, error, "reg_key_num_subkeys()");
 
-	torture_assert(tctx, count != 0, "New key has non-zero subkey count");
+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;
+}
 
-	error = reg_key_num_values(root, &count);
-	torture_assert_werr_ok(tctx, error, "reg_key_num_values");
+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;
+}
 
-	torture_assert(tctx, count != 0, "New key has non-zero value count");
+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;
+}
 
-	error = reg_key_add_name(mem_ctx, root, "Nested\\Key", SEC_MASK_GENERIC, NULL, &subkey);
-	torture_assert_werr_ok(tctx, error, "reg_key_add_name");
 
-	error = reg_key_del(root, "Nested\\Key");
-	torture_assert_werr_ok(tctx, error, "reg_key_del");
+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;
+}
 
-	talloc_free(root);
+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, 
 													   "REGISTRY");
-	int i;
-
-	registry_init();
-
-	for (i = 0; backends[i].name; i++) {
-		torture_suite_add_simple_tcase(suite, backends[i].name, test_hive, &backends[i]);
-	}
+	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);
 
 	return suite;
 }