svn commit: samba r24333 - in branches/SAMBA_4_0: . source/lib/util/tests source/torture

[jelmer at samba.org]

Author: jelmer
Date: 2007-08-11 17:08:22 +0000 (Sat, 11 Aug 2007)
New Revision: 24333

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24333

Log:
Add convenience function for checking the contents of a file in tests.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/util/tests/file.c
   branches/SAMBA_4_0/source/torture/ui.c
   branches/SAMBA_4_0/source/torture/ui.h


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/util/tests/file.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/tests/file.c	2007-08-11 16:28:10 UTC (rev 24332)
+++ branches/SAMBA_4_0/source/lib/util/tests/file.c	2007-08-11 17:08:22 UTC (rev 24333)
@@ -39,6 +39,9 @@
 	torture_assert(tctx, file_save(TEST_FILENAME, TEST_DATA, strlen(TEST_DATA)),
 				   "saving file");
 
+	torture_assert_file_contains_text(tctx, TEST_FILENAME, TEST_DATA, 
+								      "file contents");
+
 	data = file_load(TEST_FILENAME, &len, mem_ctx);
 	torture_assert(tctx, data, "loading file");
 

Modified: branches/SAMBA_4_0/source/torture/ui.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.c	2007-08-11 16:28:10 UTC (rev 24332)
+++ branches/SAMBA_4_0/source/torture/ui.c	2007-08-11 17:08:22 UTC (rev 24333)
@@ -56,7 +56,7 @@
 }
 
 void torture_result(struct torture_context *context, 
-					enum torture_result result, const char *fmt, ...)
+		    enum torture_result result, const char *fmt, ...)
 {
 	va_list ap;
 

Modified: branches/SAMBA_4_0/source/torture/ui.h
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.h	2007-08-11 16:28:10 UTC (rev 24332)
+++ branches/SAMBA_4_0/source/torture/ui.h	2007-08-11 17:08:22 UTC (rev 24333)
@@ -235,12 +235,35 @@
 	} \
 	} while(0)
 
+#define torture_assert_file_contains_text(torture_ctx,filename,expected,cmt)\
+	do { \
+	char *__got; \
+	const char *__expected = (expected); \
+	size_t __size; \
+	__got = file_load(filename, &__size, torture_ctx); \
+	if (__got == NULL) { \
+		torture_result(torture_ctx, TORTURE_FAIL, \
+			       __location__": unable to open %s: %s\n", \
+			       filename, cmt); \
+		return false; \
+	} \
+	\
+	if (strcmp_safe(__got, __expected) != 0) { \
+		torture_result(torture_ctx, TORTURE_FAIL, \
+			__location__": %s contained:\n%sExpected: %s%s\n", \
+			filename, __got, __expected, cmt); \
+		talloc_free(__got); \
+		return false; \
+	} \
+	talloc_free(__got); \
+	} while(0)
+
 #define torture_assert_int_equal(torture_ctx,got,expected,cmt)\
 	do { int __got = (got), __expected = (expected); \
 	if (__got != __expected) { \
 		torture_result(torture_ctx, TORTURE_FAIL, \
-					 __location__": "#got" was %d, expected %d: %s", \
-					   __got, __expected, cmt); \
+			__location__": "#got" was %d, expected %d: %s", \
+			__got, __expected, cmt); \
 		return false; \
 	} \
 	} while(0)