merge a lot of work. Rough ChangeLog will follow

svn path=/trunk/; revision=1052

3 files changed, 43 insertions, 24 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5e2fd8947c..5bfa054cbf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,10 +6,11 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/camel \
 LDADD = \
 	$(top_builddir)/camel/libcamel.la 	\
 	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS)		\
-	$(BONOBO_LIBS)				
+	$(GNOMEUI_LIBS) $(INTLLIBS)	
+#	$(BONOBO_LIBS)				
 
 noinst_PROGRAMS =  	\
 	test1		\
-	test2
+	test2		\
+	test3
 
diff --git a/tests/test1.c b/tests/test1.c
index 65d3b046c7..ecf155fcdc 100644
--- a/tests/test1.c
+++ b/tests/test1.c
@@ -1,43 +1,59 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include "camel-mime-message.h"
+#include "camel-mime-body-part.h"
+#include "camel-multipart.h"
 #include "stdio.h"
 #include "camel-stream.h"
 #include "camel-stream-fs.h"
 #include "camel-log.h"
+#include "camel.h"
 
-void
+int
 main (int argc, char**argv)
 {
 	CamelMimeMessage *message;
+	CamelMultipart *multipart;
+	CamelMimeBodyPart *body_part;
+	
 	/*  FILE *output_file; */
 	CamelStream *stream;
 
 	gtk_init (&argc, &argv);
+	camel_init ();
 	message = camel_mime_message_new_with_session( (CamelSession *)NULL);
-	camel_mime_part_set_description (CAMEL_MIME_PART (message), g_string_new ("a test"));
-	camel_mime_part_add_header (CAMEL_MIME_PART (message), g_string_new ("X-test1"), g_string_new ("the value of a test"));
-	camel_mime_part_add_header (CAMEL_MIME_PART (message), g_string_new ("X-test2"), g_string_new ("the value of another test"));
+	camel_mime_part_set_description (CAMEL_MIME_PART (message), "a test");
+	camel_mime_part_add_header (CAMEL_MIME_PART (message), "X-test1", "the value of a test");
+	camel_mime_part_add_header (CAMEL_MIME_PART (message), "X-test2", "the value of another test");
 	/*camel_mime_part_add_content_language (CAMEL_MIME_PART (message), g_string_new ("es-ca"));*/
 
-	camel_mime_message_set_received_date (message, g_string_new ("Thu, 20 May 1999, 10:39:14 +0200"));
-	camel_mime_message_set_subject (message, g_string_new ("A test message"));
-	camel_mime_message_set_reply_to (message, g_string_new ("toto@toto.com"));
-	camel_mime_message_set_from (message, g_string_new ("Bertrand.Guiheneuf@inria.fr"));
+	camel_mime_message_set_received_date (message, "Thu, 20 May 1999, 10:39:14 +0200");
+	camel_mime_message_set_subject (message, "A test message");
+	camel_mime_message_set_reply_to (message, "toto@toto.com");
+	camel_mime_message_set_from (message, "Bertrand.Guiheneuf@inria.fr");
 
-	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_TO), g_string_new ("franck.dechamps@alseve.fr"));
-	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_TO), g_string_new ("mc@alseve.fr"));
-	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_TO), g_string_new ("richard.lengagne@inria.fr"));
-	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_CC), g_string_new ("Francois.fleuret@inria.fr"));
-	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_CC), g_string_new ("maury@justmagic.com"));
- 	camel_mime_message_add_recipient (message, g_string_new (RECIPIENT_TYPE_BCC), g_string_new ("guiheneu@aful.org"));
+	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, "franck.dechamps@alseve.fr");
+	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, "mc@alseve.fr");
+	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, "richard.lengagne@inria.fr");
+	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_CC, "Francois.fleuret@inria.fr");
+	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_CC, "maury@justmagic.com");
+ 	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_BCC, "Bertrand.Guiheneuf@aful.org");
 
+	
+	multipart = camel_multipart_new ();
+	body_part = camel_mime_body_part_new ();
+	camel_mime_part_set_text (CAMEL_MIME_PART (body_part), "This is a test.\nThis is only a test.\n");
+	camel_multipart_add_part (multipart, body_part);
+	camel_mime_part_set_content_object (CAMEL_MIME_PART (message), CAMEL_DATA_WRAPPER (multipart));
 
-	stream = camel_stream_fs_new_with_name (g_string_new ("mail1.test"), CAMEL_STREAM_FS_WRITE );
+	stream = camel_stream_fs_new_with_name ("mail1.test", CAMEL_STREAM_FS_WRITE );
 	if (!stream)  {
-		CAMEL_LOG(WARNING, "could not open output file");
+		CAMEL_LOG_FULL_DEBUG ("could not open output file");
 		exit(2);
 	}
 		       
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
 	camel_stream_close (stream);
+	
+	printf ("Test1 finished\n");
 }
+ 
diff --git a/tests/test2.c b/tests/test2.c
index 03f03a105c..154a243007 100644
--- a/tests/test2.c
+++ b/tests/test2.c
@@ -7,6 +7,7 @@
 #include "camel-mime-part.h"
 #include "camel-stream.h"
 #include "camel-stream-fs.h"
+#include "camel.h"
 
 void
 main (int argc, char**argv)
@@ -16,22 +17,23 @@ main (int argc, char**argv)
 	CamelStream *input_stream, *output_stream;
 	
 	gtk_init (&argc, &argv);
-	camel_debug_level = FULL_DEBUG;
+	camel_init ();
+	camel_debug_level = CAMEL_LOG_LEVEL_FULL_DEBUG;
 	message = camel_mime_message_new_with_session( (CamelSession *)NULL);
 
 	
-	input_stream = camel_stream_fs_new_with_name (g_string_new ("mail.test"), CAMEL_STREAM_FS_READ);
+	input_stream = camel_stream_fs_new_with_name ("mail.test", CAMEL_STREAM_FS_READ);
 	if (!input_stream) {
-		perror("could not open input file");
+		perror ("could not open input file");
+		printf ("You must create the file mail.test before running this test");
 		exit(2);
 	}
 	
-
 	camel_data_wrapper_construct_from_stream ( CAMEL_DATA_WRAPPER (message), input_stream);
 					     
 	camel_stream_close (input_stream);
 
-	output_stream = camel_stream_fs_new_with_name (g_string_new ("mail2.test"), CAMEL_STREAM_FS_WRITE);
+	output_stream = camel_stream_fs_new_with_name ("mail2.test", CAMEL_STREAM_FS_WRITE);
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream);
 	camel_stream_close (output_stream);