ModestPresets *presets;
presets = modest_presets_new ("provider-data-test.keyfile");
- fail_unless (presets,
+ fail_unless (presets != NULL,
"modest_presets_new should return a valid ModestPresets*");
modest_presets_destroy (presets);
presets = modest_presets_new ("/foo/bar/cuux");
- fail_unless (!presets,
+ fail_unless (presets == NULL,
"modest_presets_new should return NULL when given an invalid file");
if (presets)
modest_presets_destroy (presets);
{
ModestPresets *presets;
gchar **providers;
- gchar **cursor;
int len, i;
presets = modest_presets_new ("provider-data-test.keyfile");
- fail_unless (presets,
- "modest_presets_new should return a valid ModestPresets*");
+ fail_unless (presets != NULL,
+ "modest_presets_new should return a valid ModestPresets");
/* get all providers */
- providers = modest_presets_get_providers (presets, -1, TRUE);
- len = g_strv_length(providers);
- fail_unless (presets && len == 5,
- "modest_presets_get_providers(presets, -1, TRUE) should return 5 providers "
- "but I got %d", len);
- g_strfreev (providers);
-
- /* get all non-global providers */
- providers = modest_presets_get_providers (presets, -1, FALSE);
+ providers = modest_presets_get_providers (presets, 0, TRUE);
len = g_strv_length(providers);
- for (i = 0; i != len; ++i)
- g_print ("%s\n", providers[i]);
-
+// for (i = 0; i != len; ++i)
+// g_print ("%s\n", providers[i]);
- fail_unless (presets && len == 3,
- "modest_presets_get_providers(presets, -1, FALSE) should return 3 providers "
+ fail_unless (providers && len == 5,
+ "modest_presets_get_providers(presets, 0, TRUE) should return 5 providers "
"but I got %d", len);
g_strfreev (providers);
-
+
/* get all providers in Finland */
providers = modest_presets_get_providers (presets, 244, FALSE);
len = g_strv_length(providers);
- fail_unless (presets && len == 2,
+ fail_unless (providers && len == 2,
"modest_presets_get_providers (presets,244, FALSE) should return 2 providers "
"but I got %d", len);
g_strfreev (providers);
- /* get all providers in Afghanistan + internaltion */
+ /* get all providers in Afghanistan + international */
providers = modest_presets_get_providers (presets, 412, TRUE);
len = g_strv_length(providers);
- fail_unless (presets && len == 3,
+ fail_unless (providers && len == 3,
"modest_presets_get_providers (presets, 412, TRUE) should return 3 providers "
"but I got %d", len);
g_strfreev (providers);
TCase *tc_core = tcase_create ("core");
tcase_add_test (tc_core, test_modest_presets_new);
-// tcase_add_test (tc_core, test_modest_presets_get_providers);
+ tcase_add_test (tc_core, test_modest_presets_get_providers);
suite_add_tcase (suite, tc_core);
*/
#include <check.h>
+#include <stdlib.h>
#include <string.h>
#include <modest-text-utils.h>
/* ----------------- display address tests -------------- */
/**
- * Test regular usage of modest_text_utils_display_address
+ * Test regular usage of modest_text_utils_get_display_address
* - Test 1: Check "<...>" deletion
* - Test 2: Check "(...)" deletion
* - Test 3: Check address left and right trim, also non ASCII chars
gchar *str = g_strdup (tests[i].original);
str = modest_text_utils_get_display_address (str);
fail_unless (str && strcmp(str, tests[i].expected) == 0,
- "modest_text_utils_display_address failed for '%s': "
+ "modest_text_utils_get_display_address failed for '%s': "
"expected '%s' but got '%s'",
tests[i].original, tests[i].expected, str);
g_free (str);
/**
- * Test invalid usage of modest_text_utils_display_address
+ * 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)
{
/* Test 1 */
fail_unless (modest_text_utils_get_display_address (NULL) == NULL,
- "modest_text_utils_display_address(NULL) should be NULL");
-
+ "modest_text_utils_get_display_address(NULL) should be NULL");
}
END_TEST
{ "This text should be quoted",
"On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> This text\n> should be quoted\n> \n" },
{ "These are several\nlines\nof plain text",
- "On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> These are\n> several\n> lines\n> of text\n> \n" },
+ "On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> These are\n> several lines\n> of plain text\n" },
{ "áéíÍÓÚäëïÏÖÜñÑçÇŽÊîš",
- "On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> áéíÍÓÚäëïÏÖÜñÑçÇŽÊîš" },
+ "On Thu Jan 1 01:00:00 1970, foo@bar wrote:\n> áéíÍÓÚäëïÏÖÜñÑçÇŽÊîš\n" },
};
for (i = 0; i != sizeof(tests)/sizeof(StringPair); ++i) {
quoted_text);
g_free (quoted_text);
-
+
/* 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> \n");
+ 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);
- 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\"",
- text, expected_quoted_text, quoted_text);
+ fail_unless (quoted_text == NULL,
+ "modest_text_utils_quote failed:\nOriginal text: NULL\n" \
+ "Expected quotation: NULL\nQuoted text: \"%s\"",
+ quoted_text);
g_free (text);
g_free (expected_quoted_text);
g_free (quoted_text);
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);
- 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\"",
- text, expected_quoted_text, quoted_text);
+ fail_unless (quoted_text == NULL,
+ "modest_text_utils_quote failed:\nOriginal text: NULL\n" \
+ "Expected quotation: NULL\nQuoted text: \"%s\"",
+ quoted_text);
g_free (text);
g_free (expected_quoted_text);
g_free (quoted_text);
0,
"bar@foo",
"Any subject");
- fail_unless (inlined_text && !strcmp (expected_inline, inlined_text),
- "modest_text_utils_inline failed:\nOriginal text:\nNULL\n" \
- "Expected inline:\n\"%s\"\nInline obtained:\n\"%s\"",
- expected_inline, inlined_text);
+ fail_unless (inlined_text == NULL,
+ "modest_text_utils_inline failed: it should return NULL");
g_free (inlined_text);
/* Test 2 (Fault) */
0,
"bar@foo",
"Any subject");
- fail_unless (inlined_text && !strcmp (expected_inline, inlined_text),
- "modest_text_utils_inline failed:\nOriginal text:\n\"%s\"\n" \
- "Expected inline:\n\"%s\"\nInline obtained:\n\"%s\"",
- text, expected_inline, inlined_text);
+ fail_unless (inlined_text == NULL,
+ "modest_text_utils_inline failed: it should return NULL");
g_free (inlined_text);
/* Test 3 */
0,
"bar@foo",
"Any subject");
- fail_unless (inlined_text && !strcmp (expected_inline, inlined_text),
- "modest_text_utils_inline failed:\nOriginal text:\n\"%s\"\n" \
- "Expected inline:\n\"%s\"\nInline obtained:\n\"%s\"",
- text, expected_inline, inlined_text);
+ fail_unless (inlined_text == NULL,
+ "modest_text_utils_inline failed: it should return NULL");
+
g_free (inlined_text);
/* Test 4 */
0,
NULL,
"Any subject");
- fail_unless (inlined_text && !strcmp (expected_inline, inlined_text),
- "modest_text_utils_inline failed:\nOriginal text:\n\"%s\"\n" \
- "Expected inline:\n\"%s\"\nInline obtained:\n\"%s\"",
- text, expected_inline, inlined_text);
+ fail_unless (inlined_text == NULL,
+ "modest_text_utils_inline failed: it should return NULL");
g_free (inlined_text);
/* Test 5 */
0,
"bar@foo",
NULL);
- fail_unless (inlined_text && !strcmp (expected_inline, inlined_text),
- "modest_text_utils_inline failed:\nOriginal text:\n\"%s\"\n" \
- "Expected inline:\n\"%s\"\nInline obtained:\n\"%s\"",
- text, expected_inline, inlined_text);
+ fail_unless (inlined_text == NULL,
+ "modest_text_utils_inline failed: it should return NULL");
+
g_free (inlined_text);
}
END_TEST
*/
START_TEST (test_convert_to_html_regular)
{
- gchar text_in_html[256];
+ gchar *text_in_html;
gchar *html_start = NULL;
gchar *html_end = NULL;
gchar *html = NULL;
html = modest_text_utils_convert_to_html (tests[i].original);
fail_unless (html != NULL,
"modest_text_utils_convert_to_html failed:" \
- "Original text:\n\"%s\"\nExpected html:\n\"%s\"\nObtained html:\n\NULL",
+ "Original text:\n\"%s\"\nExpected html:\n\"%s\"\nObtained html:\nNULL",
tests[i].original, tests[i].expected);
html_start = strstr (html, "<tt>");
html_end = strstr (html, "</body>");
bytes = html_end - html_start;
- memset (text_in_html, 0, 256);
- memcpy (text_in_html, html_start, bytes);
+ text_in_html = g_strndup (html_start, bytes);
+
fail_unless (strstr (html, tests[i].expected) != NULL,
"modest_text_utils_convert_to_html failed:" \
"Original text:\n\"%s\"\nExpected html:\n\"%s\"\nObtained html:\n\"%s\"",
tests[i].original, tests[i].expected, text_in_html);
- g_free (html_start);
- g_free (html_end);
- g_free (html);
+// g_free (html_start);
+// g_free (text_in_html);
+// g_free (html);
}
}
END_TEST
Suite *suite;
int failures;
+ setenv ("TZ", "Europe/Paris", 1);
+
suite = text_utils_suite ();
srunner = srunner_create (suite);