Rev 11631: Add two more tdr tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11631
revision-id: jelmer at samba.org-20070302134225-iu9mwzaaoa6w6v7u
parent: svn-v2:21650 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Fri 2007-03-02 14:42:25 +0100
message:
  Add two more tdr tests.
modified:
  source/librpc/tools/ndrdump.c  svn-v2:21564 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2ftools%2fndrdump.c
  source/torture/local/tdr.c     svn-v2:20962 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2flocal%2ftdr.c
=== modified file 'source/librpc/tools/ndrdump.c'
--- a/source/librpc/tools/ndrdump.c	2007-03-02 12:47:51 +0000
+++ b/source/librpc/tools/ndrdump.c	2007-03-02 13:42:25 +0000
@@ -166,6 +166,15 @@
 
 #if (_SAMBA_BUILD_ >= 4)
 	dcerpc_table_init();
+#else
+	/* Initialise samba stuff */
+	load_case_tables();
+
+	setlinebuf(stdout);
+
+	dbf = x_stderr;
+
+	setup_logging(argv[0],True);
 #endif
 
 	pc = poptGetContext("ndrdump", argc, argv, long_options, 0);

=== modified file 'source/torture/local/tdr.c'
--- a/source/torture/local/tdr.c	2007-01-23 00:39:12 +0000
+++ b/source/torture/local/tdr.c	2007-03-02 13:42:25 +0000
@@ -50,12 +50,44 @@
 	return true;
 }
 
+static bool test_push_uint16(struct torture_context *tctx)
+{
+	uint16_t v = 0xF32;
+	struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+	torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
+	torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect");
+	torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect");
+	torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect");
+	return true;
+}
+
+static bool test_pull_uint16(struct torture_context *tctx)
+{
+	uint16_t d = 782;
+	uint16_t l;
+	struct tdr_pull tdr;
+	tdr.data.data = (uint8_t *)&d;
+	tdr.data.length = 2;
+	tdr.offset = 0;
+	tdr.flags = 0;
+	torture_assert_ntstatus_ok(tctx, tdr_pull_uint16(&tdr, tctx, &l), 
+							   "pull failed");
+	torture_assert_int_equal(tctx, 2, tdr.offset, 
+							 "offset invalid");
+	torture_assert_int_equal(tctx, 782, l, "right int read");
+	return true;
+}
+
 struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
 
 	torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);
 	torture_suite_add_simple_test(suite, "push_uint8", test_push_uint8);
+	
+	torture_suite_add_simple_test(suite, "pull_uint16", test_pull_uint16);
+	torture_suite_add_simple_test(suite, "push_uint16", test_push_uint16);
 
 	return suite;
 }