X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2Fcheck_text-utils.c;h=d3b116011f2fec22e3ab6a7810c9fc86091b1290;hp=76013b6ca070ae1e84ddd4f899304816686d6db9;hb=c48ace10ca6cf4b9d4d1cae8d0b9a66b07b9f8c5;hpb=ea021abcd97d636fac9ff6769afad9e66e4edfad diff --git a/tests/check_text-utils.c b/tests/check_text-utils.c index 76013b6..d3b1160 100644 --- a/tests/check_text-utils.c +++ b/tests/check_text-utils.c @@ -30,6 +30,7 @@ #include #include #include +#include #include typedef struct { @@ -47,7 +48,7 @@ typedef struct { * - Test 4: Check issues in tests 1, 2 and 3 together * - Test 5: Check with an empty address */ -START_TEST (test_display_address_regular) +START_TEST (test_get_display_address_regular) { gint i; const StringPair tests[] = { @@ -61,7 +62,7 @@ START_TEST (test_display_address_regular) /* Tests 1, 2, 3, 4 */ for (i = 0; i != sizeof(tests)/sizeof(StringPair); ++i) { gchar *str = g_strdup (tests[i].original); - str = modest_text_utils_get_display_address (str); + modest_text_utils_get_display_address (str); fail_unless (str && strcmp(str, tests[i].expected) == 0, "modest_text_utils_get_display_address failed for '%s': " "expected '%s' but got '%s'", @@ -76,11 +77,10 @@ END_TEST * Test invalid usage of modest_text_utils_get_display_address * - Test 1: Check with NULL address (should return NULL) */ -START_TEST (test_display_address_invalid) +START_TEST (test_get_display_address_invalid) { /* Test 1 */ - fail_unless (modest_text_utils_get_display_address (NULL) == NULL, - "modest_text_utils_get_display_address(NULL) should be NULL"); + modest_text_utils_get_display_address (NULL); } END_TEST @@ -163,8 +163,9 @@ START_TEST (test_quote_regular) for (i = 0; i != sizeof(tests)/sizeof(StringPair); ++i) { text = g_strdup (tests[i].original); expected_quoted_text = g_strdup (tests[i].expected); - quoted_text = modest_text_utils_quote (text, "text/plain", "foo@bar", 0, 15); - fail_unless (quoted_text && !strcmp (expected_quoted_text, quoted_text), + quoted_text = modest_text_utils_quote (text, "text/plain", NULL /*signature*/, + "foo@bar", 0 /* date */, NULL /*attachments*/, 15 /*limit*/); + fail_unless (quoted_text && strcmp(expected_quoted_text, quoted_text)==0, "modest_text_utils_quote failed:\nOriginal text:\n\"%s\"\n" \ "Expected quotation:\n\"%s\"\nQuoted text:\n\"%s\"", text, expected_quoted_text, quoted_text); @@ -177,7 +178,8 @@ START_TEST (test_quote_regular) text = g_strdup ("Quotation test example"); expected_quoted_text = g_strdup ("On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> Quotation\n> test\n> example\n> \n"); - quoted_text = modest_text_utils_quote (text, "text/plain", "foo@bar", 0, 1); + quoted_text = modest_text_utils_quote (text, "text/plain", NULL /*signature */, + "foo@bar", 0 /*date*/, NULL /*attachments*/, 1 /*limit*/); fail_unless (quoted_text && !strcmp (expected_quoted_text, quoted_text), "modest_text_utils_quote failed:\nOriginal text:\n\"%s\"\n" \ "Expected quotation:\n\"%s\"\nQuoted text:\n\"%s\"", @@ -204,7 +206,7 @@ START_TEST (test_quote_invalid) /* Test 1 (Fault) */ text = NULL; - quoted_text = modest_text_utils_quote (NULL, "text/plain", "foo@bar", 0, 15); + quoted_text = modest_text_utils_quote (NULL, "text/plain", NULL, "foo@bar", 0, NULL, 15); fail_unless (quoted_text == NULL, "modest_text_utils_quote failed:\nOriginal text: NULL\n" \ "Expected quotation: NULL\nQuoted text: \"%s\"", @@ -215,7 +217,7 @@ START_TEST (test_quote_invalid) /* Test 2 (Fault) */ text = g_strdup ("Text"); expected_quoted_text = g_strdup ("On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> Text\n"); - quoted_text = modest_text_utils_quote (text, NULL, "foo@bar", 0, 15); + quoted_text = modest_text_utils_quote (text, NULL, NULL, "foo@bar", 0, NULL, 15); fail_unless (quoted_text == NULL, "modest_text_utils_quote failed:\nOriginal text: NULL\n" \ "Expected quotation: NULL\nQuoted text: \"%s\"", @@ -227,7 +229,7 @@ START_TEST (test_quote_invalid) /* Test 3 */ text = g_strdup ("Text"); expected_quoted_text = g_strdup ("On Thu Jan 1 01:00:00 1970, (null) wrote:\n> Text\n"); - quoted_text = modest_text_utils_quote (text, "text/plain", NULL, 0, 15); + quoted_text = modest_text_utils_quote (text, "text/plain", NULL, NULL, 0, NULL, 15); fail_unless (quoted_text == NULL, "modest_text_utils_quote failed:\nOriginal text: NULL\n" \ "Expected quotation: NULL\nQuoted text: \"%s\"", @@ -239,7 +241,7 @@ START_TEST (test_quote_invalid) /* Test 4 */ text = g_strdup ("This is a text"); expected_quoted_text = g_strdup ("On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> This\n> is\n> a\n> text\n> \n"); - quoted_text = modest_text_utils_quote (text, "text/plain", "foo@bar", 0, 0); + quoted_text = modest_text_utils_quote (text, "text/plain", NULL, "foo@bar", 0, NULL, 0); fail_unless (quoted_text && !strcmp (expected_quoted_text, quoted_text), "modest_text_utils_quote failed:\nOriginal text:\n\"%s\"\n" \ "Expected quotation:\n\"%s\"\nQuoted text:\n\"%s\"", @@ -276,7 +278,7 @@ START_TEST (test_cite_regular) /* Tests 1, 2, 3, 4 */ for (i = 0; i != sizeof(tests)/sizeof(StringPair); ++i) { - cited_text = modest_text_utils_cite (tests[i].original, "text/plain", "foo@bar", 0); + cited_text = modest_text_utils_cite (tests[i].original, "text/plain", NULL, "foo@bar", 0); fail_unless (cited_text && !strcmp (tests[i].expected, cited_text), "modest_text_utils_cite failed:\nOriginal text:\n\"%s\"\n" \ "Expected cite:\n\"%s\"\nCite obtained:\n\"%s\"", @@ -301,7 +303,7 @@ START_TEST (test_cite_invalid) /* Test 1 */ text = NULL; expected_cite = g_strdup ("On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n(null)\n"); - cited_text = modest_text_utils_cite (text, "text/plain", "foo@bar", 0); + cited_text = modest_text_utils_cite (text, "text/plain", NULL, "foo@bar", 0); fail_unless (cited_text && !strcmp (expected_cite, cited_text), "modest_text_utils_cite failed:\nOriginal text:\nNULL\n" \ "Expected cite:\n\"%s\"\nCite obtained:\n\"%s\"", @@ -312,7 +314,7 @@ START_TEST (test_cite_invalid) /* Test 2 */ text = g_strdup ("This is some text"); expected_cite = g_strdup ("On Thu Jan 1 01:00:00 1970, (null) wrote:\nThis is some text\n"); - cited_text = modest_text_utils_cite (text, "text/plain", NULL, 0); + cited_text = modest_text_utils_cite (text, "text/plain", NULL, NULL, 0); fail_unless (cited_text && !strcmp (expected_cite, cited_text), "modest_text_utils_cite failed:\nOriginal text:\n\"%s\"\n" \ "Expected cite:\n\"%s\"\nCite obtained:\n\"%s\"", @@ -363,6 +365,7 @@ START_TEST (test_inline_regular) for (i = 0; i != sizeof(tests)/sizeof(StringPair); ++i) { inlined_text = modest_text_utils_inline (tests[i].original, "text/plain", + NULL, "foo@bar", 0, "bar@foo", @@ -400,6 +403,7 @@ START_TEST (test_inline_invalid) "(null)"); inlined_text = modest_text_utils_inline (NULL, "text/plain", + NULL, "foo@bar", 0, "bar@foo", @@ -418,6 +422,7 @@ START_TEST (test_inline_invalid) "Some text"); inlined_text = modest_text_utils_inline (text, NULL, + NULL, "foo@bar", 0, "bar@foo", @@ -437,6 +442,7 @@ START_TEST (test_inline_invalid) inlined_text = modest_text_utils_inline (text, "text/plain", NULL, + NULL, 0, "bar@foo", "Any subject"); @@ -455,6 +461,7 @@ START_TEST (test_inline_invalid) "Some text"); inlined_text = modest_text_utils_inline (text, "text/plain", + NULL, "foo@bar", 0, NULL, @@ -473,6 +480,7 @@ START_TEST (test_inline_invalid) "Some text"); inlined_text = modest_text_utils_inline (text, "text/plain", + NULL, "foo@bar", 0, "bar@foo", @@ -636,7 +644,7 @@ START_TEST (test_remove_address_limits) gchar *list = NULL; gchar *new_list = NULL; gchar *expected_list = NULL; - gchar *address = NULL; + //gchar *address = NULL; gint i; const StringPair tests[] = { @@ -706,6 +714,8 @@ START_TEST (test_convert_to_html_regular) gchar *html_end = NULL; gchar *html = NULL; gint bytes; + int i; + const StringPair tests[] = { { "This is some text.", "This is some text." }, @@ -765,8 +775,8 @@ text_utils_suite (void) /* Tests case for "display adress" */ tc = tcase_create ("display_adress"); - tcase_add_test (tc, test_display_address_regular); - tcase_add_test (tc, test_display_address_invalid); + tcase_add_test (tc, test_get_display_address_regular); + tcase_add_test (tc, test_get_display_address_invalid); suite_add_tcase (suite, tc); /* Test case for "derived subject" */ @@ -822,7 +832,7 @@ main () suite = text_utils_suite (); srunner = srunner_create (suite); - + srunner_run_all (srunner, CK_ENV); failures = srunner_ntests_failed (srunner); srunner_free (srunner);