GNOME.org
 

[evolution-data-server] Get Camel tests building again.

commit 2f15137de63a2c088218ebd9c86049581c824cfb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Apr 19 14:24:11 2010 -0400

    Get Camel tests building again.

 camel/tests/folder/test10.c           |    1 +
 camel/tests/lib/messages.c            |   58 ++++++++++++++++++---------------
 camel/tests/mime-filter/test-tohtml.c |   33 +++++++++++--------
 camel/tests/mime-filter/test1.c       |   12 ++++---
 camel/tests/smime/pgp.c               |    4 +-
 camel/tests/stream/test1.c            |    6 ++--
 6 files changed, 64 insertions(+), 50 deletions(-)
---
diff --git a/camel/tests/folder/test10.c b/camel/tests/folder/test10.c
index ad41cad..44a405f 100644
--- a/camel/tests/folder/test10.c
+++ b/camel/tests/folder/test10.c
@@ -91,6 +91,7 @@ gint main(gint argc, gchar **argv)
 			for (i = 0; i < MAX_THREADS; i++) {
 				if (threads[i])
 					g_thread_join (threads[i]);
+			}
 
 			test_free(path);
 
diff --git a/camel/tests/lib/messages.c b/camel/tests/lib/messages.c
index 2523f9a..fa79f51 100644
--- a/camel/tests/lib/messages.c
+++ b/camel/tests/lib/messages.c
@@ -151,26 +151,28 @@ hexdump (const guchar *in, gint inlen)
 gint
 test_message_compare_content(CamelDataWrapper *dw, const gchar *text, gint len)
 {
-	CamelStreamMem *content;
+	GByteArray *byte_array;
+	CamelStream *content;
 
 	/* sigh, ok, so i len == 0, dw will probably be 0 too
 	   camel_mime_part_set_content is weird like that */
 	if (dw == 0 && len == 0)
 		return 0;
 
-	content = (CamelStreamMem *)camel_stream_mem_new();
-	camel_data_wrapper_decode_to_stream(dw, (CamelStream *)content);
+	byte_array = g_byte_array_new ();
+	content = camel_stream_mem_new_with_byte_array (byte_array);
+	camel_data_wrapper_decode_to_stream (dw, content);
 
-	if (content->buffer->len != len) {
+	if (byte_array->len != len) {
 		printf ("original text:\n");
 		hexdump (text, len);
 
 		printf ("new text:\n");
-		hexdump (content->buffer->data, content->buffer->len);
+		hexdump (byte_array->data, byte_array->len);
 	}
 
-	check_msg(content->buffer->len == len, "buffer->len = %d, len = %d", content->buffer->len, len);
-	check_msg(memcmp(content->buffer->data, text, content->buffer->len) == 0, "len = %d", len);
+	check_msg(byte_array->len == len, "buffer->len = %d, len = %d", byte_array->len, len);
+	check_msg(memcmp(byte_array->data, text, byte_array->len) == 0, "len = %d", len);
 
 	check_unref(content, 1);
 
@@ -181,25 +183,29 @@ gint
 test_message_compare (CamelMimeMessage *msg)
 {
 	CamelMimeMessage *msg2;
-	CamelStreamMem *mem1, *mem2;
+	CamelStream *stream1, *stream2;
+	GByteArray *byte_array1;
+	GByteArray *byte_array2;
 
-	mem1 = (CamelStreamMem *) camel_stream_mem_new ();
-	check_msg(camel_data_wrapper_write_to_stream ((CamelDataWrapper *) msg, (CamelStream *) mem1) != -1, "write_to_stream 1 failed");
-	camel_stream_reset ((CamelStream *) mem1);
+	byte_array1 = g_byte_array_new ();
+	stream1 = camel_stream_mem_new_with_byte_array (byte_array1);
+	check_msg(camel_data_wrapper_write_to_stream ((CamelDataWrapper *) msg, stream1) != -1, "write_to_stream 1 failed");
+	camel_stream_reset (stream1);
 
 	msg2 = camel_mime_message_new ();
-	check_msg(camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) msg2, (CamelStream *) mem1) != -1, "construct_from_stream 1 failed");
-	camel_stream_reset ((CamelStream *) mem1);
+	check_msg(camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) msg2, (CamelStream *) stream1) != -1, "construct_from_stream 1 failed");
+	camel_stream_reset ((CamelStream *) stream1);
 
-	mem2 = (CamelStreamMem *) camel_stream_mem_new ();
-	check_msg(camel_data_wrapper_write_to_stream ((CamelDataWrapper *) msg2, (CamelStream *) mem2) != -1, "write_to_stream 2 failed");
-	camel_stream_reset ((CamelStream *) mem2);
+	byte_array2 = g_byte_array_new ();
+	stream2 = camel_stream_mem_new_with_byte_array (byte_array2);
+	check_msg(camel_data_wrapper_write_to_stream ((CamelDataWrapper *) msg2, stream2) != -1, "write_to_stream 2 failed");
+	camel_stream_reset (stream2);
 
-	if (mem1->buffer->len != mem2->buffer->len) {
+	if (byte_array1->len != byte_array2->len) {
 		CamelDataWrapper *content;
 
-		printf ("mem1 stream:\n%.*s\n", mem1->buffer->len, mem1->buffer->data);
-		printf ("mem2 stream:\n%.*s\n\n", mem2->buffer->len, mem2->buffer->data);
+		printf ("stream1 stream:\n%.*s\n", byte_array1->len, byte_array1->data);
+		printf ("stream2 stream:\n%.*s\n\n", byte_array2->len, byte_array2->data);
 
 		printf("msg1:\n");
 		test_message_dump_structure(msg);
@@ -211,14 +217,14 @@ test_message_compare (CamelMimeMessage *msg)
 
 	check_unref(msg2, 1);
 
-	check_msg (mem1->buffer->len == mem2->buffer->len,
-		   "mem1->buffer->len = %d, mem2->buffer->len = %d",
-		   mem1->buffer->len, mem2->buffer->len);
+	check_msg (byte_array1->len == byte_array2->len,
+		   "byte_array1->len = %d, byte_array2->len = %d",
+		   byte_array1->len, byte_array2->len);
 
-	check_msg (memcmp (mem1->buffer->data, mem2->buffer->data, mem1->buffer->len) == 0, "msg/stream compare");
+	check_msg (memcmp (byte_array1->data, byte_array2->data, byte_array1->len) == 0, "msg/stream compare");
 
-	camel_object_unref (mem1);
-	camel_object_unref (mem2);
+	camel_object_unref (stream1);
+	camel_object_unref (stream2);
 
 	return 0;
 }
@@ -252,7 +258,7 @@ message_dump_rec(CamelMimeMessage *msg, CamelMimePart *part, gint depth)
 	printf("%sContent-Type: %s\n", s, mime_type);
 	g_free(mime_type);
 	printf("%s encoding: %s\n", s, camel_transfer_encoding_to_string(((CamelDataWrapper *)part)->encoding));
-	printf("%s part encoding: %s\n", s, camel_transfer_encoding_to_string(part->encoding));
+	printf("%s part encoding: %s\n", s, camel_transfer_encoding_to_string(camel_mime_part_get_encoding(part)));
 
 	containee = camel_medium_get_content (CAMEL_MEDIUM (part));
 
diff --git a/camel/tests/mime-filter/test-tohtml.c b/camel/tests/mime-filter/test-tohtml.c
index 7327605..70ce4da 100644
--- a/camel/tests/mime-filter/test-tohtml.c
+++ b/camel/tests/mime-filter/test-tohtml.c
@@ -21,8 +21,10 @@
 static void
 test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 {
-	CamelStreamMem *in, *out;
+	CamelStream *in, *out;
 	CamelStream *indisk, *outdisk, *filter;
+	GByteArray *byte_array_in;
+	GByteArray *byte_array_out;
 	gint id;
 
 	camel_test_push("Data file '%s'", inname);
@@ -34,14 +36,16 @@ test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 	outdisk = camel_stream_fs_new_with_name(outname, O_RDONLY, 0);
 	check(outdisk);
 
-	out = (CamelStreamMem *)camel_stream_mem_new();
-	check(camel_stream_write_to_stream(outdisk, (CamelStream *)out) > 0);
+	byte_array_out = g_byte_array_new ();
+	out = camel_stream_mem_new_with_byte_array (byte_array_out);
+	check(camel_stream_write_to_stream(outdisk, out) > 0);
 
 	camel_test_pull();
 
 	camel_test_push("reading through filter stream");
 
-	in = (CamelStreamMem *)camel_stream_mem_new();
+	byte_array_in = g_byte_array_new ();
+	in = camel_stream_mem_new_with_byte_array (byte_array_in);
 
 	filter = (CamelStream *)camel_stream_filter_new (indisk);
 	check_count(indisk, 2);
@@ -49,10 +53,10 @@ test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 	check_count(f, 2);
 
 	check(camel_stream_write_to_stream(filter, (CamelStream *)in) > 0);
-	check_msg(in->buffer->len == out->buffer->len
-		  && memcmp(in->buffer->data, out->buffer->data, in->buffer->len) == 0,
-		  "Buffer content mismatch, %d != %d, in = '%.*s' != out = '%.*s'", in->buffer->len, out->buffer->len,
-		  in->buffer->len, in->buffer->data, out->buffer->len, out->buffer->data);
+	check_msg(byte_array_in->len == byte_array_out->len
+		  && memcmp(byte_array_in->data, byte_array_out->data, byte_array_in->len) == 0,
+		  "Buffer content mismatch, %d != %d, in = '%.*s' != out = '%.*s'", byte_array_in->len, byte_array_out->len,
+		  byte_array_in->len, byte_array_in->data, byte_array_out->len, byte_array_out->data);
 
 	camel_test_pull();
 
@@ -69,18 +73,19 @@ test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 
 	camel_test_push("writing through filter stream");
 
-	in = (CamelStreamMem *)camel_stream_mem_new();
-	filter = (CamelStream *)camel_stream_filter_new ((CamelStream *)in);
+	byte_array_in = g_byte_array_new ();
+	in = camel_stream_mem_new_with_byte_array (byte_array_in);
+	filter = (CamelStream *)camel_stream_filter_new (in);
 	check_count(in, 2);
 	id = camel_stream_filter_add((CamelStreamFilter *)filter, f);
 	check_count(f, 2);
 
 	check(camel_stream_write_to_stream(indisk, filter) > 0);
 	check(camel_stream_flush(filter) == 0);
-	check_msg(in->buffer->len == out->buffer->len
-		  && memcmp(in->buffer->data, out->buffer->data, in->buffer->len) == 0,
-		  "Buffer content mismatch, %d != %d, in = '%.*s' != out = '%.*s'", in->buffer->len, out->buffer->len,
-		  in->buffer->len, in->buffer->data, out->buffer->len, out->buffer->data);
+	check_msg(byte_array_in->len == byte_array_out->len
+		  && memcmp(byte_array_in->data, byte_array_out->data, byte_array_in->len) == 0,
+		  "Buffer content mismatch, %d != %d, in = '%.*s' != out = '%.*s'", byte_array_in->len, byte_array_out->len,
+		  byte_array_in->len, byte_array_in->data, byte_array_out->len, byte_array_out->data);
 
 	camel_stream_filter_remove((CamelStreamFilter *)filter, id);
 	check_unref(filter, 1);
diff --git a/camel/tests/mime-filter/test1.c b/camel/tests/mime-filter/test1.c
index aa0f219..f7fed37 100644
--- a/camel/tests/mime-filter/test1.c
+++ b/camel/tests/mime-filter/test1.c
@@ -66,13 +66,15 @@ main (gint argc, gchar **argv)
 
 		/* try all write sizes */
 		for (step=1;step<20;step++) {
-			CamelStreamMem *out;
+			GByteArray *byte_array;
+			CamelStream *out;
 			gchar *p;
 
 			camel_test_push("Chunk size %d\n", step);
 
-			out = (CamelStreamMem *)camel_stream_mem_new();
-			filter = camel_stream_filter_new ((CamelStream *)out);
+			byte_array = g_byte_array_new ();
+			out = camel_stream_mem_new_with_byte_array (byte_array);
+			filter = camel_stream_filter_new (out);
 			sh = camel_mime_filter_canon_new(tests[i].flags);
 			check(camel_stream_filter_add(filter, sh) != -1);
 			check_unref(sh, 2);
@@ -86,8 +88,8 @@ main (gint argc, gchar **argv)
 			}
 			camel_stream_flush((CamelStream *)filter);
 
-			check_msg(out->buffer->len == strlen(tests[i].out), "Buffer length mismatch: expected %d got %d\n or '%s' got '%.*s'", strlen(tests[i].out), out->buffer->len, tests[i].out, out->buffer->len, out->buffer->data);
-			check_msg(0 == memcmp(out->buffer->data, tests[i].out, out->buffer->len), "Buffer mismatch: expected '%s' got '%.*s'", tests[i].out, out->buffer->len, out->buffer->data);
+			check_msg(byte_array->len == strlen(tests[i].out), "Buffer length mismatch: expected %d got %d\n or '%s' got '%.*s'", strlen(tests[i].out), byte_array->len, tests[i].out, byte_array->len, byte_array->data);
+			check_msg(0 == memcmp(byte_array->data, tests[i].out, byte_array->len), "Buffer mismatch: expected '%s' got '%.*s'", tests[i].out, byte_array->len, byte_array->data);
 			check_unref(filter, 1);
 			check_unref(out, 1);
 
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index 23de0d9..f5f7972 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -223,9 +223,9 @@ gint main (gint argc, gchar **argv)
 	camel_data_wrapper_write_to_stream((CamelDataWrapper *)conpart, stream1);
 	camel_data_wrapper_write_to_stream((CamelDataWrapper *)outpart, stream2);
 
-	buf = CAMEL_STREAM_MEM (stream1)->buffer;
+	buf = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (stream1));
 	before = g_strndup (buf->data, buf->len);
-	buf = CAMEL_STREAM_MEM (stream2)->buffer;
+	buf = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (stream2));
 	after = g_strndup (buf->data, buf->len);
 	check_msg (string_equal (before, after), "before = '%s', after = '%s'", before, after);
 	g_free (before);
diff --git a/camel/tests/stream/test1.c b/camel/tests/stream/test1.c
index 39068b7..c45cfea 100644
--- a/camel/tests/stream/test1.c
+++ b/camel/tests/stream/test1.c
@@ -42,7 +42,7 @@ gint main(gint argc, gchar **argv)
 		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);
-			fd = ((CamelStreamFs *)ss)->fd;
+			fd = camel_stream_fs_get_fd ((CamelStreamFs *)ss);
 			break;
 		case 1:
 			fd = open("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);
@@ -70,7 +70,7 @@ gint main(gint argc, gchar **argv)
 		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);
-			fd = ((CamelStreamFs *)ss)->fd;
+			fd = camel_stream_fs_get_fd ((CamelStreamFs *)ss);
 			break;
 		case 1:
 			fd = open("stream.txt", O_RDWR, 0);
@@ -90,7 +90,7 @@ gint main(gint argc, gchar **argv)
 		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_TRUNC, 0);
-			fd = ((CamelStreamFs *)ss)->fd;
+			fd = camel_stream_fs_get_fd ((CamelStreamFs *)ss);
 			break;
 		case 1:
 			fd = open("stream.txt", O_RDWR|O_TRUNC, 0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]