[evolution] Update the tests expectations
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update the tests expectations
- Date: Tue, 6 Sep 2016 14:53:52 +0000 (UTC)
commit f4200a140c1cfee09029f818e08a17e36451f2ac
Author: Tomas Popela <tpopela redhat com>
Date: Tue Sep 6 16:48:54 2016 +0200
Update the tests expectations
e-util/test-html-editor-units-bugs.c | 42 +++++++++++++++------------------
e-util/test-html-editor-units.c | 2 +-
2 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/e-util/test-html-editor-units-bugs.c b/e-util/test-html-editor-units-bugs.c
index efb3739..e0deb7a 100644
--- a/e-util/test-html-editor-units-bugs.c
+++ b/e-util/test-html-editor-units-bugs.c
@@ -87,19 +87,22 @@ test_bug_750657 (TestFixture *fixture)
"<p>This is the fourth paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</p>\n"
"</blockquote>\n"
"<p><br></p>\n"
- "</body></html>\n",
+ "</body></html>",
E_CONTENT_EDITOR_INSERT_TEXT_HTML);
if (!test_utils_run_simple_test (fixture,
"seq:uuuSuusD\n",
- HTML_PREFIX "\n"
+ HTML_PREFIX
"<blockquote type=\"cite\">\n"
"<p>This is the first paragraph of a quoted text which has some long text to test. It has the
second sentence as well.</p>\n"
"<p><br></p>\n"
"<p>This is the third paragraph of a quoted text which has some long text to test. It has the
second sentence as well.</p>\n"
+ "<blockquote type=\"cite\">\n"
+ "<p><br></p>\n"
+ "</blockquote>\n"
"<p>This is the fourth paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</p>\n"
"</blockquote>\n"
- "<p><br></p>\n"
+ "<p><br></p>"
HTML_SUFFIX,
NULL)) {
g_test_fail ();
@@ -188,7 +191,7 @@ static void
test_bug_769708 (TestFixture *fixture)
{
if (!test_utils_process_commands (fixture,
- "mode:html\n")) {
+ "mode:plain\n")) {
g_test_fail ();
return;
}
@@ -196,24 +199,17 @@ test_bug_769708 (TestFixture *fixture)
test_utils_insert_content (fixture,
"<html><head><style id=\"-x-evo-quote-style\" type=\"text/css\">.-x-evo-quoted {
-webkit-user-select: none; }</style>"
"<style id=\"-x-evo-style-a\" type=\"text/css\">a { cursor: text; }</style></head>"
- "<body data-evo-plain-text=\"\" spellcheck=\"true\">"
+ "<body data-evo-draft=\"\" data-evo-plain-text=\"\" spellcheck=\"true\">"
"<p data-evo-paragraph=\"\" class=\"\" id=\"-x-evo-input-start\">aaa</p>"
"<div class=\"-x-evo-signature-wrapper\"><span class=\"-x-evo-signature\"
id=\"autogenerated\"><pre>-- <br></pre>"
"<p data-evo-paragraph=\"\" class=\"\">user <user@no.where></p>"
"</span></div></body></html>",
E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
- if (!test_utils_process_commands (fixture,
- "mode:plain\n")) {
- g_test_fail ();
- return;
- }
-
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX_PLAIN "<p style=\"width: 71ch;\">aaa</p><div><span><p style=\"width:
71ch;\">-- </p>"
- "<p style=\"width: 71ch;\"><br></p>"
- "<p style=\"width: 71ch;\">user <<a
href=\"mailto:user@no.where\";>user@no.where</a>></p>"
+ HTML_PREFIX_PLAIN "<p>aaa</p><div><span><pre>-- <br></pre>"
+ "<p>user <user@no.where></p>"
"</span></div>" HTML_SUFFIX,
"aaa\n"
"-- \n"
@@ -322,12 +318,12 @@ test_bug_769955 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"mode:plain\n"
"action:paste\n"
- "seq:nll\n"
+ "seq:ll\n"
"action:style-preformat\n",
- HTML_PREFIX_PLAIN "<p style=\"width: 71ch;\"><pre>"
+ HTML_PREFIX_PLAIN "<pre>"
"<a
href=\"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines\";>"
-
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines</a></pre></p>"
- "<p style=\"width: 71ch;\"><br></p>" HTML_SUFFIX,
+
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines</a></pre>"
+ HTML_SUFFIX,
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines";)) {
g_test_fail ();
return;
@@ -408,12 +404,12 @@ test_bug_769955 (TestFixture *fixture)
"action:style-normal\n"
"seq:Dc\n"
"seq:Sis\n"
- "seq:nll\n"
+ "seq:ll\n"
"action:style-preformat\n",
- HTML_PREFIX_PLAIN "<p style=\"width: 71ch;\"><pre>"
+ HTML_PREFIX_PLAIN "<pre>"
"<a
href=\"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines\";>"
-
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines</a></pre></p>"
- "<p style=\"width: 71ch;\"><br></p>" HTML_SUFFIX,
+
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines</a></pre>"
+ HTML_SUFFIX,
"http://www.example.com/this-is-a-very-long-link-which-should-not-be-wrapped-into-multiple-lines";)) {
g_test_fail ();
return;
@@ -535,7 +531,7 @@ test_bug_770073 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:Chcddbb\n",
HTML_PREFIX "<p>On Today, User wrote:</p>"
- "<blockquote id=\"-x-evo-main-cite\" type=\"cite\">"
+ "<blockquote type=\"cite\">"
"<p><span>the first line text</span></p>"
"<p><span>the third line text</span></p>"
"</blockquote>" HTML_SUFFIX,
diff --git a/e-util/test-html-editor-units.c b/e-util/test-html-editor-units.c
index dc155f0..940c1b8 100644
--- a/e-util/test-html-editor-units.c
+++ b/e-util/test-html-editor-units.c
@@ -2073,7 +2073,7 @@ test_cite_longline (TestFixture *fixture)
"<html><head></head><body><blockquote type=\"cite\">"
"<p>This is the first paragraph of a quoted text which has some long text to test. It has the
second sentence as well.</p>"
"</blockquote></body></html>",
- E_CONTENT_EDITOR_INSERT_TEXT_HTML);
+ E_CONTENT_EDITOR_INSERT_TEXT_HTML | E_CONTENT_EDITOR_INSERT_REPLACE_ALL);
if (!test_utils_run_simple_test (fixture,
"",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
