diff options
Diffstat (limited to 'camel/tests')
-rw-r--r-- | camel/tests/folder/Makefile.am | 10 | ||||
-rw-r--r-- | camel/tests/folder/test1.c | 6 | ||||
-rw-r--r-- | camel/tests/folder/test10.c | 3 | ||||
-rw-r--r-- | camel/tests/folder/test2.c | 4 | ||||
-rw-r--r-- | camel/tests/folder/test3.c | 6 | ||||
-rw-r--r-- | camel/tests/folder/test4.c | 4 | ||||
-rw-r--r-- | camel/tests/folder/test5.c | 4 | ||||
-rw-r--r-- | camel/tests/folder/test6.c | 3 | ||||
-rw-r--r-- | camel/tests/folder/test7.c | 3 | ||||
-rw-r--r-- | camel/tests/folder/test8.c | 4 | ||||
-rw-r--r-- | camel/tests/folder/test9.c | 6 | ||||
-rw-r--r-- | camel/tests/lib/Makefile.am | 14 | ||||
-rw-r--r-- | camel/tests/lib/folders.c | 18 | ||||
-rw-r--r-- | camel/tests/lib/messages.h | 3 | ||||
-rw-r--r-- | camel/tests/lib/streams.c | 2 | ||||
-rw-r--r-- | camel/tests/message/Makefile.am | 6 | ||||
-rw-r--r-- | camel/tests/mime-filter/Makefile.am | 6 | ||||
-rw-r--r-- | camel/tests/misc/Makefile.am | 7 | ||||
-rw-r--r-- | camel/tests/misc/split.c | 2 | ||||
-rw-r--r-- | camel/tests/smime/Makefile.am | 9 | ||||
-rw-r--r-- | camel/tests/smime/pgp.c | 6 | ||||
-rw-r--r-- | camel/tests/stream/Makefile.am | 6 |
22 files changed, 87 insertions, 45 deletions
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am index e49fd92a87..92089a798d 100644 --- a/camel/tests/folder/Makefile.am +++ b/camel/tests/folder/Makefile.am @@ -3,18 +3,18 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(top_builddir)/camel/tests/lib/libcameltest-provider.a \ + $(top_builddir)/camel/libcamel.la \ + $(top_builddir)/camel/libcamel-provider.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(INTLLIBS) check_PROGRAMS = \ test1 test2 test3 \ diff --git a/camel/tests/folder/test1.c b/camel/tests/folder/test1.c index c1d3809852..1f2d33b4c4 100644 --- a/camel/tests/folder/test1.c +++ b/camel/tests/folder/test1.c @@ -1,6 +1,7 @@ /* store testing */ #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "session.h" @@ -10,6 +11,10 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *local_drivers[] = { + "local" +}; + static char *local_providers[] = { "mbox", "mh", @@ -24,6 +29,7 @@ int main(int argc, char **argv) char *path; camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test10.c b/camel/tests/folder/test10.c index f96c885ef0..09454a95cc 100644 --- a/camel/tests/folder/test10.c +++ b/camel/tests/folder/test10.c @@ -4,6 +4,7 @@ #include <pthread.h> #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "messages.h" #include "session.h" @@ -19,6 +20,7 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *local_drivers[] = { "local" }; static char *local_providers[] = { "mbox", "mh", @@ -63,6 +65,7 @@ int main(int argc, char **argv) pthread_t threads[MAX_THREADS]; camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c index 57a449ff59..78b755f85d 100644 --- a/camel/tests/folder/test2.c +++ b/camel/tests/folder/test2.c @@ -5,6 +5,7 @@ #include <fcntl.h> #include "camel-test.h" +#include "camel-test-provider.h" #include "messages.h" #include "folders.h" #include "session.h" @@ -19,6 +20,8 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *local_drivers[] = { "local" }; + static char *stores[] = { "mbox:///tmp/camel-test/mbox", "mh:///tmp/camel-test/mh", @@ -32,6 +35,7 @@ int main(int argc, char **argv) int i; camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); /* clear out any camel-test data */ system("/bin/rm -rf /tmp/camel-test"); diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c index 1449821d91..f7894824d7 100644 --- a/camel/tests/folder/test3.c +++ b/camel/tests/folder/test3.c @@ -1,10 +1,9 @@ /* folder/index testing */ -#include <gtk/gtk.h> - #include <string.h> #include "camel-test.h" +#include "camel-test-provider.h" #include "messages.h" #include "folders.h" #include "session.h" @@ -139,6 +138,7 @@ run_search(CamelFolder *folder, int m) pull(); } +static const char *local_drivers[] = { "local" }; static char *stores[] = { "mbox:///tmp/camel-test/mbox", @@ -157,8 +157,8 @@ int main(int argc, char **argv) int indexed; GPtrArray *uids; - gtk_init(&argc, &argv); camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c index e6c58e023d..fa7955f4e4 100644 --- a/camel/tests/folder/test4.c +++ b/camel/tests/folder/test4.c @@ -1,6 +1,7 @@ /* store testing, for remote folders */ #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "session.h" @@ -10,6 +11,8 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *imap_drivers[] = { "imap" }; + static char *remote_providers[] = { "IMAP_TEST_URL", }; @@ -22,6 +25,7 @@ int main(int argc, char **argv) char *path; camel_test_init(argc, argv); + camel_test_provider_init(1, imap_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test5.c b/camel/tests/folder/test5.c index ccdfb23b23..da09947130 100644 --- a/camel/tests/folder/test5.c +++ b/camel/tests/folder/test5.c @@ -1,6 +1,7 @@ /* store testing, for remote folders */ #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "session.h" @@ -10,6 +11,8 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *nntp_drivers[] = { "nntp" }; + static char *remote_providers[] = { "NNTP_TEST_URL", }; @@ -22,6 +25,7 @@ int main(int argc, char **argv) char *path; camel_test_init(argc, argv); + camel_test_provider_init(1, nntp_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c index f0fd8a25ee..2674c282db 100644 --- a/camel/tests/folder/test6.c +++ b/camel/tests/folder/test6.c @@ -1,6 +1,7 @@ /* folder testing */ #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "session.h" @@ -14,6 +15,7 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *imap_drivers[] = { "imap" }; static char *remote_providers[] = { "IMAP_TEST_URL", }; @@ -26,6 +28,7 @@ int main(int argc, char **argv) char *path; camel_test_init(argc, argv); + camel_test_provider_init(1, imap_drivers); /* clear out any camel-test data */ system("/bin/rm -rf /tmp/camel-test"); diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c index 3dee12916d..a10771595c 100644 --- a/camel/tests/folder/test7.c +++ b/camel/tests/folder/test7.c @@ -1,6 +1,7 @@ /* folder testing */ #include "camel-test.h" +#include "camel-test-provider.h" #include "messages.h" #include "session.h" @@ -14,6 +15,7 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *nntp_drivers[] = { "nntp" }; static char *remote_providers[] = { "NNTP_TEST_URL", }; @@ -26,6 +28,7 @@ int main(int argc, char **argv) char *path; camel_test_init(argc, argv); + camel_test_provider_init(1, nntp_drivers); /* clear out any camel-test data */ system("/bin/rm -rf /tmp/camel-test"); diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c index c035f6227c..eb7f5a61a5 100644 --- a/camel/tests/folder/test8.c +++ b/camel/tests/folder/test8.c @@ -4,6 +4,7 @@ #include <pthread.h> #include "camel-test.h" +#include "camel-test-provider.h" #include "folders.h" #include "messages.h" #include "session.h" @@ -19,6 +20,8 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *local_drivers[] = { "local" }; + static char *local_providers[] = { "mbox", "mh", @@ -135,6 +138,7 @@ int main(int argc, char **argv) GPtrArray *uids; camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); ex = camel_exception_new(); diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c index 79d34c76a5..4e4f41730c 100644 --- a/camel/tests/folder/test9.c +++ b/camel/tests/folder/test9.c @@ -3,6 +3,7 @@ #include <string.h> #include "camel-test.h" +#include "camel-test-provider.h" #include "messages.h" #include "folders.h" #include "session.h" @@ -19,6 +20,8 @@ #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +static const char *local_drivers[] = { "local" }; + struct { char *name; CamelFolder *folder; @@ -97,9 +100,8 @@ int main(int argc, char **argv) CamelStream *mbox; CamelFilterDriver *driver; - /*gtk_init(&argc, &argv);*/ - camel_test_init(argc, argv); + camel_test_provider_init(1, local_drivers); ex = camel_exception_new(); diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am index 93ec07abd5..4b9613e66d 100644 --- a/camel/tests/lib/Makefile.am +++ b/camel/tests/lib/Makefile.am @@ -5,9 +5,10 @@ INCLUDES = \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ + -DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\" \ $(CAMEL_CFLAGS) -check_LIBRARIES = libcameltest.a +check_LIBRARIES = libcameltest.a libcameltest-provider.a libcameltest_a_SOURCES = \ camel-test.c camel-test.h \ @@ -18,5 +19,14 @@ libcameltest_a_SOURCES = \ streams.c streams.h \ address-data.h +libcameltest_provider_a_SOURCES = \ + camel-test-provider.c camel-test-provider.h + libcameltest_a_LIBADD = \ - $(top_builddir)/e-util/libeutil.la + $(top_builddir)/camel/libcamel.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + +libcameltest_provider_a_LIBADD = \ + $(top_builddir)/camel/libcamel-provider.la \ + $(top_builddir)/camel/libcamel.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c index e93d8caf2e..5104da6c12 100644 --- a/camel/tests/lib/folders.c +++ b/camel/tests/lib/folders.c @@ -12,13 +12,15 @@ test_folder_counts(CamelFolder *folder, int total, int unread) { GPtrArray *s; int i, myunread; + int gettotal, getunread; CamelMessageInfo *info; push("test folder counts %d total %d unread", total, unread); /* first, use the standard functions */ - check(camel_folder_get_message_count(folder) == total); - check(camel_folder_get_unread_message_count(folder) == total); + camel_object_get(folder, NULL, CAMEL_FOLDER_TOTAL, &gettotal, CAMEL_FOLDER_UNREAD, &getunread, 0); + check(gettotal == total); + check(getunread == unread); /* next, use the summary */ s = camel_folder_get_summary(folder); @@ -27,7 +29,7 @@ test_folder_counts(CamelFolder *folder, int total, int unread) myunread = s->len; for (i=0;i<s->len;i++) { info = s->pdata[i]; - if (info->flags & CAMEL_MESSAGE_SEEN) + if (camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) myunread--; } check(unread == myunread); @@ -40,7 +42,7 @@ test_folder_counts(CamelFolder *folder, int total, int unread) myunread = s->len; for (i=0;i<s->len;i++) { info = camel_folder_get_message_info(folder, s->pdata[i]); - if (info->flags & CAMEL_MESSAGE_SEEN) + if (camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) myunread--; camel_folder_free_message_info(folder, info); } @@ -70,7 +72,7 @@ test_message_info(CamelMimeMessage *msg, const CamelMessageInfo *info) /* FIXME: testing from/cc/to, etc is more tricky */ - check(info->date_sent == camel_mime_message_get_date(msg, NULL)); + check(camel_message_info_date_sent(info) == camel_mime_message_get_date(msg, NULL)); /* date received isn't set for messages that haven't been sent anywhere ... */ /*check(info->date_received == camel_mime_message_get_date_received(msg, NULL));*/ @@ -469,7 +471,7 @@ test_folder_message_ops(CamelSession *session, const char *name, int local, cons push("deleting first message & expunging"); camel_folder_delete_message(folder, uids->pdata[0]); - test_folder_counts(folder, 10, 10); + test_folder_counts(folder, 10, 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[0]); @@ -498,7 +500,7 @@ test_folder_message_ops(CamelSession *session, const char *name, int local, cons push("deleting last message & expunging"); camel_folder_delete_message(folder, uids->pdata[8]); /* sync? */ - test_folder_counts(folder, 9, 9); + test_folder_counts(folder, 9, 8); 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]); @@ -529,7 +531,7 @@ test_folder_message_ops(CamelSession *session, const char *name, int local, cons camel_folder_delete_message(folder, uids->pdata[j]); } /* sync? */ - test_folder_counts(folder, 8, 8); + test_folder_counts(folder, 8, 0); camel_folder_expunge(folder, ex); check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex)); for (j=0;j<8;j++) { diff --git a/camel/tests/lib/messages.h b/camel/tests/lib/messages.h index 1f892c3cc8..24e0407af0 100644 --- a/camel/tests/lib/messages.h +++ b/camel/tests/lib/messages.h @@ -13,3 +13,6 @@ int test_message_compare_content(CamelDataWrapper *dw, const char *text, int len int test_message_compare (CamelMimeMessage *msg); void test_message_dump_structure(CamelMimeMessage *m); + +int test_message_compare_header(CamelMimeMessage *m1, CamelMimeMessage *m2); +int test_message_compare_messages(CamelMimeMessage *m1, CamelMimeMessage *m2); diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c index e4dc006363..d62db50938 100644 --- a/camel/tests/lib/streams.c +++ b/camel/tests/lib/streams.c @@ -126,7 +126,6 @@ test_seekable_substream_writepart(CamelStream *s, int type) CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s; CamelSeekableStream *sp = sus->parent_stream; int i, len; - off_t end; push("writing substream, type %d", type); @@ -177,7 +176,6 @@ test_seekable_substream_readpart(CamelStream *s) CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s; CamelSeekableStream *sp = sus->parent_stream; int i, len; - off_t end; push("reading substream"); diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am index 32b4294aa2..010fdc3270 100644 --- a/camel/tests/message/Makefile.am +++ b/camel/tests/message/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ @@ -11,10 +10,9 @@ INCLUDES = \ LDADD = \ $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(INTLLIBS) check_PROGRAMS = \ test1 \ diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am index 21635f839f..9d5d882891 100644 --- a/camel/tests/mime-filter/Makefile.am +++ b/camel/tests/mime-filter/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ @@ -12,10 +11,9 @@ INCLUDES = \ LDADD = \ $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(INTLLIBS) EXTRA_DIST = \ crlf-1.in \ diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am index 4cf6500c06..1be915e3f0 100644 --- a/camel/tests/misc/Makefile.am +++ b/camel/tests/misc/Makefile.am @@ -3,18 +3,17 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ $(CAMEL_CFLAGS) LDADD = \ + $(top_builddir)/camel/libcamel-provider.la \ $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(INTLLIBS) check_PROGRAMS = \ url \ diff --git a/camel/tests/misc/split.c b/camel/tests/misc/split.c index 254b91974f..4fa8d18ea9 100644 --- a/camel/tests/misc/split.c +++ b/camel/tests/misc/split.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> #include <glib.h> -#include <e-util/e-sexp.h> +#include <libedataserver/e-sexp.h> #include <camel/camel-exception.h> #include <camel/camel-search-private.h> diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am index b14d804dc3..edd4314500 100644 --- a/camel/tests/smime/Makefile.am +++ b/camel/tests/smime/Makefile.am @@ -3,18 +3,17 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(top_builddir)/camel/libcamel-provider.la \ + $(top_builddir)/camel/libcamel.la \ + $(INTLLIBS) check_PROGRAMS = \ pgp diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c index 098e3de7eb..851a9dcca4 100644 --- a/camel/tests/smime/pgp.c +++ b/camel/tests/smime/pgp.c @@ -168,7 +168,11 @@ int main (int argc, char **argv) camel_test_push ("PGP signing"); camel_cipher_sign (ctx, "no.user@no.domain", CAMEL_CIPHER_HASH_SHA1, conpart, sigpart, ex); - check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex)); + if (camel_exception_is_set(ex)) { + printf("PGP signing failed assuming non-functional environment\n%s", camel_exception_get_description (ex)); + camel_test_pull(); + return 77; + } camel_test_pull (); camel_exception_clear (ex); diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am index 25bd84eafd..114e02e0a0 100644 --- a/camel/tests/stream/Makefile.am +++ b/camel/tests/stream/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/camel/tests/lib \ -DG_LOG_DOMAIN=\"evolution-tests\" \ @@ -11,10 +10,9 @@ INCLUDES = \ LDADD = \ $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(INTLLIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(INTLLIBS) check_PROGRAMS = \ test1 test2 test3 |