From e76b8a07002dc3d01d5f4624c8cae25e75020099 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Mon, 1 Mar 2010 12:53:11 +0100 Subject: [PATCH] s4-smbtorture: test at least three different regtypes in test_SetPrinterDataEx. Guenther --- source4/torture/rpc/spoolss.c | 47 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index b76ae6f3eda..f652b5b6fe7 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -3248,25 +3248,46 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx, "torture\\data,ex" #endif }; - int i; - DATA_BLOB blob = data_blob_string_const("catfoobar"); + enum winreg_Type types[] = { + REG_SZ, + REG_DWORD, + REG_BINARY + }; + int i, t; for (i=0; i < ARRAY_SIZE(keys); i++) { + for (t=0; t < ARRAY_SIZE(types); t++) { char *c; const char *key; enum winreg_Type type; + const char *string = "I have no idea"; + DATA_BLOB blob = data_blob_string_const("catfoobar"); + uint32_t value = 12345678; const char **subkeys; union spoolss_PrinterData data; r.in.handle = handle; r.in.key_name = keys[i]; r.in.value_name = value_name; - r.in.type = REG_BINARY; - r.in.data.binary = blob; + r.in.type = types[t]; + + switch (types[t]) { + case REG_BINARY: + r.in.data.binary = blob; + break; + case REG_DWORD: + r.in.data.value = value; + break; + case REG_SZ: + r.in.data.string = string; + break; + default: + torture_fail(tctx, talloc_asprintf(tctx, "type %d untested\n", types[t])); + } - torture_comment(tctx, "Testing SetPrinterDataEx(%s - %s)\n", r.in.key_name, value_name); + torture_comment(tctx, "Testing SetPrinterDataEx(%s - %s) type %d\n", r.in.key_name, value_name, types[t]); status = dcerpc_spoolss_SetPrinterDataEx(p, tctx, &r); @@ -3280,7 +3301,20 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx, } torture_assert_int_equal(tctx, r.in.type, type, "type mismatch"); - torture_assert_data_blob_equal(tctx, blob, data.binary, "data mismatch"); + + switch (type) { + case REG_BINARY: + torture_assert_data_blob_equal(tctx, blob, data.binary, "data mismatch"); + break; + case REG_DWORD: + torture_assert_int_equal(tctx, value, data.value, "data mismatch"); + break; + case REG_SZ: + torture_assert_str_equal(tctx, string, data.string, "data mismatch"); + break; + default: + torture_fail(tctx, talloc_asprintf(tctx, "type %d untested\n", type)); + } if (!test_EnumPrinterDataEx(tctx, p, handle, r.in.key_name)) { return false; @@ -3321,6 +3355,7 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx, } } } + } return true; } -- 2.11.4.GIT