Changeset 740 for vendor/current/lib/tdr/testsuite.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/tdr/testsuite.c (modified) (10 diffs)

vendor/current/lib/tdr/testsuite.c

@@ -26 +26 @@
 {
         uint8_t v = 4;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed");
@@ -38 +38 @@
         uint8_t d = 2;
         uint8_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = &d;
         tdr->data.length = 1;
@@ -53 +53 @@
 {
         uint16_t v = 0xF32;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
@@ -66 +66 @@
         uint8_t d[2] = { 782 & 0xFF, (782 & 0xFF00) / 0x100 };
         uint16_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = d;
         tdr->data.length = 2;
@@ -81 +81 @@
 {
         uint32_t v = 0x100F32;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed");
@@ -96 +96 @@
         uint8_t d[4] = { 782 & 0xFF, (782 & 0xFF00) / 0x100, 0, 0 };
         uint32_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = d;
         tdr->data.length = 4;
@@ -110 +110 @@
 static bool test_pull_charset(struct torture_context *tctx)
 {
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         const char *l = NULL;
         tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
@@ -132 +132 @@
 static bool test_pull_charset_empty(struct torture_context *tctx)
 {
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         const char *l = NULL;
         tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
@@ -151 +151 @@
 {
         const char *l = "bloe";
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
         torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, 4, 1, CH_UTF8), 
                                                            "push failed");
         torture_assert_int_equal(tctx, 4, tdr->data.length, "offset invalid");
-        torture_assert(tctx, strcmp("bloe", (const char *)tdr->data.data) == 0, "right string push");
+        torture_assert(tctx, strncmp("bloe", (const char *)tdr->data.data, 4) == 0, "right string push");
 
         torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, -1, 1, CH_UTF8), 
@@ -167 +167 @@
 struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "tdr");
 
         torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);