added some imap tests, tho they dont get far yet and dont

	recover automatically.

svn path=/trunk/; revision=6772

1 files changed, 3 insertions, 191 deletions

diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
index a3a8f014b8..47e0f44feb 100644
--- a/camel/tests/folder/test2.c
+++ b/camel/tests/folder/test2.c
@@ -34,14 +34,8 @@ static char *stores[] = {
 int main(int argc, char **argv)
 {
 	CamelSession *session;
-	CamelStore *store;
 	CamelException *ex;
-	CamelFolder *folder;
-	CamelMimeMessage *msg;
-	int i, j;
-	int indexed;
-	GPtrArray *uids;
-	const CamelMessageInfo *info;
+	int i;
 
 	camel_test_init(argc, argv);
 
@@ -52,193 +46,11 @@ int main(int argc, char **argv)
 
 	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
 
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: work out how to do imap/pop/nntp tests */
-
 	/* we iterate over all stores we want to test, with indexing or indexing turned on or off */
 	for (i=0;i<ARRAY_LEN(stores);i++) {
 		char *name = stores[i];
-		for (indexed = 0;indexed<2;indexed++) {
-			char *what = g_strdup_printf("folder ops: %s (%sindexed)", name, indexed?"":"non-");
-			int flags;
-
-			camel_test_start(what);
-			test_free(what);
-
-			push("getting store");
-			store = camel_session_get_store(session, stores[i], ex);
-			check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));
-			check(store != NULL);
-			pull();
-
-			push("creating %sindexed folder", indexed?"":"non-");
-			if (indexed)
-				flags = CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX;
-			else
-				flags = CAMEL_STORE_FOLDER_CREATE;
-			folder = camel_store_get_folder(store, "testbox", flags, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			check(folder != NULL);
-
-			/* verify empty/can't get nonexistant stuff */
-			test_folder_counts(folder, 0, 0);
-			test_folder_not_message(folder, "0");
-			test_folder_not_message(folder, "");
-
-			for (j=0;j<10;j++) {
-				char *content, *subject;
-
-				push("creating test message");
-				msg = test_message_create_simple();
-				content = g_strdup_printf("Test message %d contents\n\n", j);
-				test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
-								content, strlen(content));
-				test_free(content);
-				subject = g_strdup_printf("Test message %d", j);
-				camel_mime_message_set_subject(msg, subject);
-				pull();
-
-				push("appending simple message %d", j);
-				camel_folder_append_message(folder, msg, NULL, ex);
-				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-				test_folder_counts(folder, j+1, j+1);
-
-				push("checking it is in the right uid slot & exists");
-				uids = camel_folder_get_uids(folder);
-				check(uids != NULL);
-				check(uids->len == j+1);
-				test_folder_message(folder, uids->pdata[j]);
-				pull();
-
-				push("checking it is the right message (subject): %s", subject);
-				info = camel_folder_get_message_info(folder, uids->pdata[j]);
-				check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-					  "info->subject %s", camel_message_info_subject(info));
-				camel_folder_free_uids(folder, uids);
-				pull();
-
-				test_free(subject);
-
-				check_unref(msg, 1);
-				pull();
-			}
-
-			check_unref(folder, 1);
-			pull();
-
-			push("deleting test folder, with messages in it");
-			camel_store_delete_folder(store, "testbox", ex);
-			check(camel_exception_is_set(ex));
-			camel_exception_clear(ex);
-			pull();
-
-			push("re-opening folder");
-			folder = camel_store_get_folder(store, "testbox", flags, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			check(folder != NULL);
-
-			/* verify counts */
-			test_folder_counts(folder, 10, 10);
-
-			/* re-check uid's, after a reload */
-			uids = camel_folder_get_uids(folder);
-			check(uids != NULL);
-			check(uids->len == 10);
-			for (j=0;j<10;j++) {
-				char *subject = g_strdup_printf("Test message %d", j);
-
-				push("verify reload of %s", subject);
-				test_folder_message(folder, uids->pdata[j]);
-
-				info = camel_folder_get_message_info(folder, uids->pdata[j]);
-				check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-					  "info->subject %s", camel_message_info_subject(info));
-				test_free(subject);
-				pull();
-			}
-
-			push("deleting first message & expunging");
-			camel_folder_delete_message(folder, uids->pdata[0]);
-			test_folder_counts(folder, 10, 10);
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			test_folder_not_message(folder, uids->pdata[0]);
-			test_folder_counts(folder, 9, 9);
-
-			camel_folder_free_uids(folder, uids);
-
-			uids = camel_folder_get_uids(folder);
-			check(uids != NULL);
-			check(uids->len == 9);
-			for (j=0;j<9;j++) {
-				char *subject = g_strdup_printf("Test message %d", j+1);
-
-				push("verify after expunge of %s", subject);
-				test_folder_message(folder, uids->pdata[j]);
-
-				info = camel_folder_get_message_info(folder, uids->pdata[j]);
-				check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-					  "info->subject %s", camel_message_info_subject(info));
-				test_free(subject);
-				pull();
-			}
-			pull();
-
-			push("deleting last message & expunging");
-			camel_folder_delete_message(folder, uids->pdata[8]);
-			/* sync? */
-			test_folder_counts(folder, 9, 9);
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			test_folder_not_message(folder, uids->pdata[8]);
-			test_folder_counts(folder, 8, 8);
-
-			camel_folder_free_uids(folder, uids);
-
-			uids = camel_folder_get_uids(folder);
-			check(uids != NULL);
-			check(uids->len == 8);
-			for (j=0;j<8;j++) {
-				char *subject = g_strdup_printf("Test message %d", j+1);
-
-				push("verify after expunge of %s", subject);
-				test_folder_message(folder, uids->pdata[j]);
-
-				info = camel_folder_get_message_info(folder, uids->pdata[j]);
-				check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-					  "info->subject %s", camel_message_info_subject(info));
-				test_free(subject);
-				pull();
-			}
-			pull();
-
-			push("deleting all messages & expunging");
-			for (j=0;j<8;j++) {
-				camel_folder_delete_message(folder, uids->pdata[j]);
-			}
-			/* sync? */
-			test_folder_counts(folder, 8, 8);
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			for (j=0;j<8;j++) {
-				test_folder_not_message(folder, uids->pdata[j]);
-			}
-			test_folder_counts(folder, 0, 0);
-
-			camel_folder_free_uids(folder, uids);
-			pull();
-
-			check_unref(folder, 1);
-			pull(); /* re-opening folder */
-
-			push("deleting test folder, with no messages in it");
-			camel_store_delete_folder(store, "testbox", ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			pull();
-
-			check_unref(store, 1);
-			camel_test_end();
-		}
+
+		test_folder_message_ops(session, name, TRUE);
 	}
 
 	check_unref(session, 1);