[evolution] Update some of the editor unit tests to not fail
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update some of the editor unit tests to not fail
- Date: Fri, 20 Jul 2018 09:57:37 +0000 (UTC)
commit 63f8b48273d6deb8ada516bbd5fff2a6d6949b55
Author: Milan Crha <mcrha redhat com>
Date: Fri Jul 20 10:12:48 2018 +0200
Update some of the editor unit tests to not fail
src/e-util/test-html-editor-units-bugs.c | 77 ++++++++++++++++---------------
src/e-util/test-html-editor-units-utils.c | 16 ++++++-
src/e-util/test-html-editor-units.c | 6 +--
3 files changed, 58 insertions(+), 41 deletions(-)
---
diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
index e5f16be538..ea3bf6f987 100644
--- a/src/e-util/test-html-editor-units-bugs.c
+++ b/src/e-util/test-html-editor-units-bugs.c
@@ -799,9 +799,9 @@ test_bug_775042 (TestFixture *fixture)
"mode:plain\n",
HTML_PREFIX "<div style=\"width: 71ch;\">On Fri, 2016-11-25 at 08:18 +0000, user wrote:</div>"
"<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
- "<pre>> a<br>"
- "> b<br>"
- "> c</pre>"
+ "<pre>> a</pre>"
+ "<pre>> b</pre>"
+ "<pre>> c</pre>"
"</blockquote>"
HTML_SUFFIX,
"On Fri, 2016-11-25 at 08:18 +0000, user wrote:\n"
@@ -1088,32 +1088,35 @@ test_bug_788829 (TestFixture *fixture)
HTML_PREFIX "<div style=\"width: 71ch;\">On Today, User wrote:</div><blockquote type=\"cite\"
" BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> Xxxxx xx xxxxxxxxx xx xxxxxxx xx xxxxx xxxx "
"xxxx xx xxx xxx xxxx xxx<br>> xxxçx xôxé \"xxxxx xxxx xxxxxxx xxx\" xx xxxx "
- "xxxxé xxx xxx xxxéx xxx<br>> x'x xéxxxxé x'xxxxxxxxx xx xxx \"Xxxx XXX Xxxxxx "
- "Xxx\". Xx xxxx<br>> xxxxxxxx xxx xxxxxxxxxxxxxxxx.xx (xxxxxxx xxxxxxxxxx xx .xx"
- "x). Xxxx<br>> êxxx xxx xxxxxxxxxxx xxxéxxxxxxxx, xxxx xxxxx xx XXX xx xéxxx à "
- "xx<br>> xxx \"xxx xxxxxx xxxx xx xxxxxxx\" xx xxxx xx xxxxx xxxxxxxx xxxxxxxx"
- "<br>> xx $ xx xxxx x'xxxxxx.</div><div style=\"width: 71ch;\">> <br></div>"
- "<div style=\"width: 71ch;\">> Xxxx xx xéxxxxxxx, xxxxxxxx xxxxxxx (!), "
- "xxxxxxx à xxx, xxxx ooo$ XXX<br>> xxxxé: https://xxxxxxxxxxxxxxxx.xx/xxx";
- "xxxx/xxxxx-xxxx-xxxxxxxx-xxxxx-<br>> xxxx-xxx-xxxxxxxx-xxx/ xx xx xxxx "
- "xéxéxxxxxxx x'xxxxxx xxxx xx xxxxxx<br>> xx xxxxxxxxxxxx xx xxx (xxxxx "
- "Xxxxxx) xxxx xxxx x'xxxxxxx xx xxxxxx: <br>> https://xxxxxxxxxxxxxxxx.xx";
- "x/xx-xxxxxxx/xxxxxxx/Xxxxxxxxxxxx-Xxxxx-Xx<br>> xx-XXX-Xxxxxx-Xxx.xxx</div>"
- "<div style=\"width: 71ch;\">> <br></div><div style=\"width: 71ch;\">> Xx"
- "xx xxx xxx xxxxxxx xxxxxxxéxx x'xxxêxxxx à xxxxx, xxx xx xxxxé xx<br>> oooxo"
- "oo xxxxx xxxxx xxxx... xxxx x'xxx xxxxxxxxxxxx xxxxx xxx<br>> xxxxxxxx xx \""
- "xx xxxxx xxx xxx xxxxxxx xxxxxxx xxxxxxxxxxxxxx xxxx<br>> xxxxx xxxxxx xx xx "
- "xxxx xx x'xxxxxx\". Xx xxxx-êxxx xxx xx xxxxxxxx xx<br>> xxxx \"x'xxxêxx à "
- "xxxxx xx oooxooo xxxx xxx xéxxxxxxxx, xxxx\"...</div><div style=\"width: 71ch;\">"
- "> <br></div><div style=\"width: 71ch;\">> Xxxxx xxxxxx'xx xxx x xxxx xxxxxxx "
- "xxxxx xx xxèx xxxxxxxxx<br>> <br>> xxxxxxxxxxxxxxxx à xx xxx x'xx xx xêxx "
- "(éxxxxxxxxx xxxx-xx-xxxxxxxx): <a href=\"https://xxxxxxxxxxxxxxxx.xxx/xx-xxxxxxx/";
- "xxxxxxx/Xxxxx-xxxx-xxx-xxxxxxxxxx-xxxxx.xxx\">https://xxxxxxxxxxxxxxxx.xxx/xx-xxx";
- "xxxx/xxxxxxx/Xxxxx-xxxx-xxx-<br>> xxxxxxxxxx-xxxxx.xxx</a> ; </div><div "
- "style=\"width: 71ch;\">> <br></div><div style=\"width: 71ch;\">> ...x'x "
- "xxxxx xx xxxxxx x'xxxxxx xéxxxxxxx, xx xxx xxxx xxxxxx<br>> x'xxxxxxxxxxx "
- "xxxxxx, xxxx https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxx<br>> xxx-xxxx-xxx-o/ "
- "xxxxx xxx https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxx<br>> xx-xxxx-xxx-o/ ...</div>"
HTML_SUFFIX,
+ "xxxxé xxx xxx xxxéx xxx<br>> x'x xéxxxxé x'xxxxxxxxx xx xxx \"Xxxx XXX Xxxxx"
+ "x Xxx\". Xx xxxx<br>> xxxxxxxx xxx xxxxxxxxxxxxxxxx.xx (xxxxxxx xxxxxxxxxx "
+ "xx .xxx). Xxxx<br>> êxxx xxx xxxxxxxxxxx xxxéxxxxxxxx, xxxx xxxxx xx XXX xx "
+ "xéxxx à xx<br>> xxx \"xxx xxxxxx xxxx xx xxxxxxx\" xx xxxx xx xxxxx xxxxxxxx "
+ "xxxxxxxx<br>> xx $ xx xxxx x'xxxxxx.</div><div style=\"width: 71ch;\">"
+ "> <br></div><div style=\"width: 71ch;\">> Xxxx xx xéxxxxxxx, xxxxxxxx xxxxxxx "
+ "(!), xxxxxxx à xxx, xxxx ooo$ XXX<br>> xxxxé: <br>> <a href=\"https://xxxxx";
+ "xxxxxxxxxxx.xx/xxxxxxx/xxxxx-xxxx-xxxxxxxx-xxxxx-xxxx-xxx-xxxxxxxx-xxx/\">https://";
+ "xxxxxxxxxxxxxxxx.xx/xxxxxxx/xxxxx-xxxx-xxxxxxxx-xxxxx-xxxx-xxx-xxxxxxxx-xxx/</a><br>"
+ "> xx xx xxxx xéxéxxxxxxx x'xxxxxx xxxx xx xxxxxx xx xxxxxxxxxxxx xx<br>> xxx ("
+ "xxxxx Xxxxxx) xxxx xxxx x'xxxxxxx xx xxxxxx: <br>> <a href=\"https://xxxxxxxxxxxxxx";
+ "xx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxxxxxxxxx-Xxxxx-Xxxx-XXX-Xxxxxx-Xxx.xxx\">https://xxxxxx";
+ "xxxxxxxxxx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxxxxxxxxx-Xxxxx-Xxxx-XXX-Xxxxxx-Xxx.xxx</a></div>"
+ "<div style=\"width: 71ch;\">> <br></div><div style=\"width: 71ch;\">> Xxxx xxx x"
+ "xx xxxxxxx xxxxxxxéxx x'xxxêxxxx à xxxxx, xxx xx xxxxé xx<br>> oooxooo xxxxx xxxxx "
+ "xxxx... xxxx x'xxx xxxxxxxxxxxx xxxxx xxx<br>> xxxxxxxx xx \"xx xxxxx xxx xxx xxxxx"
+ "xx xxxxxxx xxxxxxxxxxxxxx xxxx<br>> xxxxx xxxxxx xx xx xxxx xx x'xxxxxx\". Xx xxxx-"
+ "êxxx xxx xx xxxxxxxx xx<br>> xxxx \"x'xxxêxx à xxxxx xx oooxooo xxxx xxx xéxxxxxxxx, "
+ "xxxx\"...</div><div style=\"width: 71ch;\">> <br></div><div style=\"width: 71ch;\">"
+ "> Xxxxx xxxxxx'xx xxx x xxxx xxxxxxx xxxxx xx xxèx xxxxxxxxx<br>> <br>> xxxxxx"
+ "xxxxxxxxxx à xx xxx x'xx xx xêxx (éxxxxxxxxx xxxx-xx-xxxxxxxx): <a href=\"https://xxxxx";
+ "xxxxxxxxxxx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxx-xxxx-xxx-xxxxxxxxxx-xxxxx.xxx\">https://xxxxxx";
+ "xxxxxxxxxx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxx-xxxx-xxx-<br>> xxxxxxxxxx-xxxxx.xxx</a> ; "
+ "</div><div style=\"width: 71ch;\">> <br></div><div style=\"width: 71ch;\">> ...x'"
+ "x xxxxx xx xxxxxx x'xxxxxx xéxxxxxxx, xx xxx xxxx xxxxxx<br>> x'xxxxxxxxxxx xxxxxx, "
+ "xxxx <br>> <a href=\"https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/\";>"
+ "https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/</a> xxxxx xxx <br>> <a "
+ "href=\"https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/\";>https://xxxxxxxxx";
+ "xxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/</a> ...</div></blockquote>" HTML_SUFFIX,
"On Today, User wrote:\n"
"> Xxxxx xx xxxxxxxxx xx xxxxxxx xx xxxxx xxxx xxxx xx xxx xxx xxxx xxx\n"
"> xxxçx xôxé \"xxxxx xxxx xxxxxxx xxx\" xx xxxx xxxxé xxx xxx xxxéx xxx\n"
@@ -1124,11 +1127,11 @@ test_bug_788829 (TestFixture *fixture)
"> xx $ xx xxxx x'xxxxxx.\n"
"> \n"
"> Xxxx xx xéxxxxxxx, xxxxxxxx xxxxxxx (!), xxxxxxx à xxx, xxxx ooo$ XXX\n"
- "> xxxxé: https://xxxxxxxxxxxxxxxx.xx/xxxxxxx/xxxxx-xxxx-xxxxxxxx-xxxxx-\n";
- "> xxxx-xxx-xxxxxxxx-xxx/ xx xx xxxx xéxéxxxxxxx x'xxxxxx xxxx xx xxxxxx\n"
- "> xx xxxxxxxxxxxx xx xxx (xxxxx Xxxxxx) xxxx xxxx x'xxxxxxx xx xxxxxx: \n"
- "> https://xxxxxxxxxxxxxxxx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxxxxxxxxx-Xxxxx-Xx\n";
- "> xx-XXX-Xxxxxx-Xxx.xxx\n"
+ "> xxxxé: \n"
+ "> https://xxxxxxxxxxxxxxxx.xx/xxxxxxx/xxxxx-xxxx-xxxxxxxx-xxxxx-xxxx-xxx-xxxxxxxx-xxx/\n";
+ "> xx xx xxxx xéxéxxxxxxx x'xxxxxx xxxx xx xxxxxx xx xxxxxxxxxxxx xx\n"
+ "> xxx (xxxxx Xxxxxx) xxxx xxxx x'xxxxxxx xx xxxxxx: \n"
+ ">
https://xxxxxxxxxxxxxxxx.xxx/xx-xxxxxxx/xxxxxxx/Xxxxxxxxxxxx-Xxxxx-Xxxx-XXX-Xxxxxx-Xxx.xxx\n";
"> \n"
"> Xxxx xxx xxx xxxxxxx xxxxxxxéxx x'xxxêxxxx à xxxxx, xxx xx xxxxé xx\n"
"> oooxooo xxxxx xxxxx xxxx... xxxx x'xxx xxxxxxxxxxxx xxxxx xxx\n"
@@ -1142,9 +1145,9 @@ test_bug_788829 (TestFixture *fixture)
"> xxxxxxxxxx-xxxxx.xxx ; \n"
"> \n"
"> ...x'x xxxxx xx xxxxxx x'xxxxxx xéxxxxxxx, xx xxx xxxx xxxxxx\n"
- "> x'xxxxxxxxxxx xxxxxx, xxxx https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxx\n";
- "> xxx-xxxx-xxx-o/ xxxxx xxx https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxx\n";
- "> xx-xxxx-xxx-o/ ..."))
+ "> x'xxxxxxxxxxx xxxxxx, xxxx \n"
+ "> https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/ xxxxx xxx \n"
+ "> https://xxxxxxxxxxxxxxxx.xxx/xxxxxxxx-xxxxxxx-xxxx-xxx-o/ ..."))
g_test_fail ();
}
diff --git a/src/e-util/test-html-editor-units-utils.c b/src/e-util/test-html-editor-units-utils.c
index 6f9871598f..bf854a9ce3 100644
--- a/src/e-util/test-html-editor-units-utils.c
+++ b/src/e-util/test-html-editor-units-utils.c
@@ -1107,7 +1107,21 @@ test_utils_get_base64_data_for_image (const gchar *path)
gboolean success;
GError *error = NULL;
- success = g_file_get_contents (path, &image_data, &image_data_length, &error);
+ if (path && strchr (path, G_DIR_SEPARATOR)) {
+ success = g_file_get_contents (path, &image_data, &image_data_length, &error);
+ } else {
+ gchar *filename;
+
+ filename = e_icon_factory_get_icon_filename (path, GTK_ICON_SIZE_MENU);
+ if (filename) {
+ success = g_file_get_contents (filename, &image_data, &image_data_length, &error);
+ g_free (filename);
+ } else {
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Icon '%s' not found", path);
+ success = FALSE;
+ }
+ }
+
g_assert_no_error (error);
g_assert (success);
diff --git a/src/e-util/test-html-editor-units.c b/src/e-util/test-html-editor-units.c
index 20418e6dcd..63e5600d0f 100644
--- a/src/e-util/test-html-editor-units.c
+++ b/src/e-util/test-html-editor-units.c
@@ -898,7 +898,7 @@ test_link_insert_typed_append (TestFixture *fixture)
"type:www.gnome.org \n"
"seq:l\n"
"type:/about\n",
- HTML_PREFIX "<div><a href=\"http://www.gnome.org/about\";>www.gnome.org/about</a> </div>"
HTML_SUFFIX,
+ HTML_PREFIX "<div><a href=\"http://www.gnome.org/\";>www.gnome.org/about</a> </div>"
HTML_SUFFIX,
"www.gnome.org/about "))
g_test_fail ();
}
@@ -1004,7 +1004,7 @@ test_emoticon_insert_typed (TestFixture *fixture)
test_utils_fixture_change_setting_boolean (fixture, "org.gnome.evolution.mail",
"composer-magic-smileys", TRUE);
test_utils_fixture_change_setting_boolean (fixture, "org.gnome.evolution.mail",
"composer-unicode-smileys", FALSE);
- image_data_base64 = test_utils_get_base64_data_for_image
("/usr/share/icons/Adwaita/16x16/emotes/face-smile.png");
+ image_data_base64 = test_utils_get_base64_data_for_image ("face-smile");
expected_html = g_strconcat (HTML_PREFIX "<div>before <img src=\"data:image/png;base64,",
image_data_base64, "\" alt=\":-)\">after</div>" HTML_SUFFIX, NULL);
@@ -1030,7 +1030,7 @@ test_emoticon_insert_typed_dash (TestFixture *fixture)
test_utils_fixture_change_setting_boolean (fixture, "org.gnome.evolution.mail",
"composer-magic-smileys", TRUE);
test_utils_fixture_change_setting_boolean (fixture, "org.gnome.evolution.mail",
"composer-unicode-smileys", FALSE);
- image_data_base64 = test_utils_get_base64_data_for_image
("/usr/share/icons/Adwaita/16x16/emotes/face-smile.png");
+ image_data_base64 = test_utils_get_base64_data_for_image ("face-smile");
expected_html = g_strconcat (HTML_PREFIX "<div>before <img src=\"data:image/png;base64,",
image_data_base64, "\" alt=\":-)\">after</div>" HTML_SUFFIX, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
