4f5effdf88
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution/camel/ChangeLog,v retrieving revision 1.684 diff -r1.684 ChangeLog 0a1,34 > 2001-01-17 Not Zed <NotZed@Ximian.com> > > * camel-folder.c (free_summary): Call > camel_folder_summary_array_free() to do the work. > (get_summary): Use camel_folder_summary_array() to get the array > atomically. These fixes allow folder/test8 to work again, and fix > a sort of race where the summary size can change while we were > making a copy of it. > > * camel-folder-summary.c (camel_folder_summary_array): Get the > summary array atomically, so it can't contain empty records. > (camel_folder_summary_array_free): And free it. > > * tests/lib/camel-test.c (die): If we are verbose & in threads, > then goto sleep so we can debug. > > * tests/folder/test8.c (worker): Add a missing pull() for > comnparing content. > > * camel-filter-search.c: Fix the symbol table, so match-all is an > immediate function, as it should be. > > * tests/folder/test9.c (main): New test, tests some filtering > things. > > * tests/message/test3.c (main): Dont use a boundary string with > spaces in it. Folding can corrupt it. Maybe the folding isn't > working entirely right, but anyway. > > * camel-session.c: Debug out the debug. > > * camel-filter-driver.c (camel_filter_driver_filter_folder): Plug > a messageinfo leak. > 1a36,94 > > * camel-filter-search.c (header_exists): Changed to support > multiple args (or'd together). > (header_contains): Cleaned up to match the search code. Why did > fejj change it? I'll never know. > (header_matches): > (header_starts_with): > (header_ends_with): Big cleanup of fejj's "i'm the cut & paste > king" code. Also properly handle or'ing of additional args to > match what the folder-search code should do. > (check_match): New function which does the annoying matching > stuff (for header matches). > (check_header): Similarly, handles or'ing of the matches together. > (header_contains): > (header_matches): > (header_starts_with): > (header_ends_with): Call check_header to do the actual work. > (header_soundex): And here too. > (match_all): Yeah like match-all isn't passed expression results, > its passed expression terms. Fix this so match-all works like it > should, by executing the contained expression. > (message_body_contains): Copied directly from > camel-folder-search.c, a more robust/faster/simpler body search > code. > (mime_part_matches): Removed entirely. > (handle_multipart): Removed entirely. > (build_match_regex): Copied from camel-folder-search. Builds a > set of simple strings into a regex pattern that matches any of > them (for faster & simpler matching). Expanded to accept regex > patterns itself, so it can merge them together. > (body_contains): Use build match/match message to match using a > built regex. > (body_regex): Likewise, this time we tell it we're building a > regex though. > (header_full_regex): Use build_match_regex to take the drudgery > out of it, and expand it to handle multiple regex's at once. > (get_full_header): slightly cleaner (well i dunno, the sprintf > stuff just got to me). > (header_regex): Cleaned up to use build_match_Regex too, and to > properly check types. > (filter_message_search): Just allocate 'fms' on the stack. > > * camel-filter-driver.c (camel_filter_driver_finalise): > (camel_filter_driver_init): > (camel_filter_driver_class_init): > (camel_filter_driver_get_type): Changed from gtk object to camel > object. > (camel_filter_driver_add_rule): New function to add a rule to be > processed in sexp form. > (camel_filter_driver_init): Init the rules list. > (camel_filter_driver_finalise): Clear the rules/rules list. > (camel_filter_driver_filter_message): Scan rules list directly > rather than creating on the fly. > > * Makefile.am (libcamelinclude_HEADERS): Added camel-filter-driver.h > (libcamel_la_SOURCES): Added camel-filter-driver.c, code taken > from filter-driver, which can drive, uh, filters based on sexp's. > (libcamelinclude_HEADERS): > (libcamel_la_SOURCES): Added camel-filter-search.[ch] svn path=/trunk/; revision=7560
200 lines
7.3 KiB
C
200 lines
7.3 KiB
C
/*
|
|
Multipart.
|
|
*/
|
|
|
|
#include "camel-test.h"
|
|
#include "messages.h"
|
|
|
|
/* for stat */
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <camel/camel-mime-message.h>
|
|
#include <camel/camel-stream-fs.h>
|
|
#include <camel/camel-stream-mem.h>
|
|
#include "camel/camel-multipart.h"
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
CamelMimeMessage *msg, *msg2, *msg3;
|
|
CamelMultipart *mp, *mp2;
|
|
CamelMimePart *part, *part2, *part3;
|
|
|
|
camel_test_init(argc, argv);
|
|
|
|
camel_test_start("multipart message");
|
|
|
|
push("building message");
|
|
msg = test_message_create_simple();
|
|
mp = camel_multipart_new();
|
|
|
|
/* Hrm, this should be able to set its own boundary, no? */
|
|
camel_multipart_set_boundary(mp, "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D");
|
|
check(strcmp(camel_multipart_get_boundary(mp), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
|
|
|
|
camel_medium_set_content_object((CamelMedium *)msg, (CamelDataWrapper *)mp);
|
|
check(camel_multipart_get_number(mp) == 0);
|
|
check(camel_multipart_get_part(mp, 0) == NULL);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
push("adding/removing parts");
|
|
part = camel_mime_part_new();
|
|
test_message_set_content_simple(part, 0, "text/plain", "content part 1", strlen("content part 1"));
|
|
camel_multipart_add_part(mp, part);
|
|
check(CAMEL_OBJECT(part)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 1);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
camel_multipart_remove_part(mp, part);
|
|
check(CAMEL_OBJECT(part)->ref_count == 1);
|
|
check(camel_multipart_get_number(mp) == 0);
|
|
check(camel_multipart_get_part(mp, 0) == NULL);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
camel_multipart_add_part_at(mp, part, 0);
|
|
check(CAMEL_OBJECT(part)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 1);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
check(camel_multipart_remove_part_at(mp, 1) == NULL);
|
|
check(CAMEL_OBJECT(part)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 1);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
check(camel_multipart_remove_part_at(mp, 0) == part);
|
|
check(CAMEL_OBJECT(part)->ref_count == 1);
|
|
check(camel_multipart_get_number(mp) == 0);
|
|
check(camel_multipart_get_part(mp, 0) == NULL);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
camel_multipart_add_part(mp, part);
|
|
check(CAMEL_OBJECT(part)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 1);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == NULL);
|
|
|
|
part2 = camel_mime_part_new();
|
|
test_message_set_content_simple(part2, 0, "text/plain", "content part 2", strlen("content part 2"));
|
|
camel_multipart_add_part(mp, part2);
|
|
check(CAMEL_OBJECT(part2)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 2);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == part2);
|
|
|
|
part3 = camel_mime_part_new();
|
|
test_message_set_content_simple(part3, 0, "text/plain", "content part 3", strlen("content part 3"));
|
|
camel_multipart_add_part_at(mp, part3, 1);
|
|
check(CAMEL_OBJECT(part3)->ref_count == 2);
|
|
check(camel_multipart_get_number(mp) == 3);
|
|
check(camel_multipart_get_part(mp, 0) == part);
|
|
check(camel_multipart_get_part(mp, 1) == part3);
|
|
check(camel_multipart_get_part(mp, 2) == part2);
|
|
pull();
|
|
|
|
push("save message to test3.msg");
|
|
unlink("test3.msg");
|
|
test_message_write_file(msg, "test3.msg");
|
|
pull();
|
|
|
|
push("read from test3.msg");
|
|
msg2 = test_message_read_file("test3.msg");
|
|
pull();
|
|
|
|
push("compre content of multipart");
|
|
mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);
|
|
check(mp2 != NULL);
|
|
check(CAMEL_IS_MULTIPART(mp2));
|
|
check(camel_multipart_get_number(mp2) == 3);
|
|
|
|
check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
|
|
check(mp2->preface == NULL || strlen(mp2->preface) == 0);
|
|
|
|
/* FIXME */
|
|
camel_test_nonfatal("postface may gain a single \\n?");
|
|
check_msg(mp2->postface == NULL || strlen(mp2->postface) == 0, "postface: '%s'", mp2->postface);
|
|
camel_test_fatal();
|
|
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
|
|
"content part 1", strlen("content part 1"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
|
|
"content part 3", strlen("content part 3"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
|
|
"content part 2", strlen("content part 2"));
|
|
pull();
|
|
|
|
push("writing again, & re-reading");
|
|
unlink("test3-2.msg");
|
|
test_message_write_file(msg2, "test3-2.msg");
|
|
msg3 = test_message_read_file("test3-2.msg");
|
|
|
|
push("comparing again");
|
|
mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg3);
|
|
check(mp2 != NULL);
|
|
check(CAMEL_IS_MULTIPART(mp2));
|
|
check(camel_multipart_get_number(mp2) == 3);
|
|
|
|
check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
|
|
check(mp2->preface == NULL || strlen(mp2->preface) == 0);
|
|
|
|
/* FIXME */
|
|
camel_test_nonfatal("postface may gain a single \\n?");
|
|
check_msg(mp2->postface == NULL || strlen(mp2->postface) == 0, "postface: '%s'", mp2->postface);
|
|
camel_test_fatal();
|
|
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
|
|
"content part 1", strlen("content part 1"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
|
|
"content part 3", strlen("content part 3"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
|
|
"content part 2", strlen("content part 2"));
|
|
pull();
|
|
pull();
|
|
|
|
check_unref(msg2, 1);
|
|
check_unref(msg3, 1);
|
|
|
|
push("testing pre/post text");
|
|
camel_multipart_set_preface(mp, "pre-text\nLines.");
|
|
camel_multipart_set_postface(mp, "post-text, no lines.\nOne line.\n");
|
|
|
|
check(strcmp(mp->preface, "pre-text\nLines.") == 0);
|
|
check(strcmp(mp->postface, "post-text, no lines.\nOne line.\n") == 0);
|
|
|
|
push("writing /re-reading");
|
|
unlink("test3-3.msg");
|
|
test_message_write_file(msg, "test3-3.msg");
|
|
msg2 = test_message_read_file("test3-3.msg");
|
|
|
|
mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);
|
|
check(mp2 != NULL);
|
|
check(CAMEL_IS_MULTIPART(mp2));
|
|
check(camel_multipart_get_number(mp2) == 3);
|
|
|
|
check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
|
|
check(strcmp(mp2->preface, "pre-text\nLines.") == 0);
|
|
check(strcmp(mp2->postface, "post-text, no lines.\nOne line.\n") == 0);
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
|
|
"content part 1", strlen("content part 1"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
|
|
"content part 3", strlen("content part 3"));
|
|
test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
|
|
"content part 2", strlen("content part 2"));
|
|
pull();
|
|
check_unref(msg2, 1);
|
|
pull();
|
|
|
|
check_unref(msg, 1);
|
|
check_unref(mp, 1);
|
|
check_unref(part, 1);
|
|
check_unref(part2, 1);
|
|
check_unref(part3, 1);
|
|
|
|
camel_test_end();
|
|
|
|
return 0;
|
|
}
|