[evolution/gnome-3-28] Update couple HTML editor tests
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-28] Update couple HTML editor tests
- Date: Fri, 13 Jul 2018 12:15:28 +0000 (UTC)
commit b74c7a093b9344617455bed1652499285057ea61
Author: Milan Crha <mcrha redhat com>
Date: Fri Jul 13 13:45:04 2018 +0200
Update couple HTML editor tests
src/e-util/test-html-editor-units-bugs.c | 51 +++++++++----------
src/e-util/test-html-editor-units-bugs.h | 1 +
src/e-util/test-html-editor-units-utils.c | 33 ++++++++++--
src/e-util/test-html-editor-units-utils.h | 2 +
src/e-util/test-html-editor-units.c | 84 +++++++++++++++++--------------
5 files changed, 104 insertions(+), 67 deletions(-)
---
diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
index 05582914a8..3a7df6ee09 100644
--- a/src/e-util/test-html-editor-units-bugs.c
+++ b/src/e-util/test-html-editor-units-bugs.c
@@ -78,11 +78,11 @@ test_bug_750657 (TestFixture *fixture)
test_utils_insert_content (fixture,
"<html><head></head><body>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>\n"
"<div><br></div>\n"
"<div>This is the third paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>This is the first paragraph of a sub-quoted text which has some long text to test. It
has the second sentence as well.</div>\n"
"<br>\n"
"</blockquote>\n"
@@ -95,11 +95,11 @@ test_bug_750657 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:uuuSuusD\n",
HTML_PREFIX
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>\n"
"<div><br></div>\n"
"<div>This is the third paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div><br></div>\n"
"</blockquote>\n"
"<div>This is the fourth paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>\n"
@@ -125,7 +125,7 @@ test_bug_760989 (TestFixture *fixture)
test_utils_insert_content (fixture,
"<html><head></head><body>\n"
"One line before quotation<br>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>Single line quoted.</div>\n"
"</blockquote>\n"
"</body></html>",
@@ -134,7 +134,7 @@ test_bug_760989 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:ChcD\n",
HTML_PREFIX "<div>One line before quotation</div>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>Single line quoted.</div>\n"
"</blockquote>" HTML_SUFFIX,
"One line before quotation\n"
@@ -146,7 +146,7 @@ test_bug_760989 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:Cecb\n",
HTML_PREFIX "<div>One line before quotation</div>\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"<div>Single line quoted</div>\n"
"</blockquote>" HTML_SUFFIX,
"One line before quotation\n"
@@ -505,7 +505,7 @@ test_bug_770073 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:Chcddbb\n",
HTML_PREFIX "<div style=\"width: 71ch;\">On Today, User wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> the 1st line text</div>"
"<div style=\"width: 71ch;\">> the 3rd line text</div>"
"</blockquote>" HTML_SUFFIX,
@@ -533,7 +533,7 @@ test_bug_770073 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:Chcddbb\n",
HTML_PREFIX "<div>On Today, User wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div><span>the first line text</span></div>"
"<div><span>the third line text</span></div>"
"</blockquote>" HTML_SUFFIX,
@@ -566,7 +566,7 @@ test_bug_770074 (TestFixture *fixture)
"seq:n\n"
"undo:undo\n",
HTML_PREFIX "<div style=\"width: 71ch;\">On Today, User wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> the 1st line text</div>"
"<div style=\"width: 71ch;\">> the 3rd line text</div>"
"</blockquote>" HTML_SUFFIX,
@@ -601,7 +601,7 @@ test_bug_771131 (TestFixture *fixture)
test_utils_insert_content (fixture,
"<body><pre>On <date1>, <name1> wrote:\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"Hello\n"
"\n"
"Goodbye</blockquote>"
@@ -613,9 +613,9 @@ test_bug_771131 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
HTML_PREFIX "<div style=\"width: 71ch;\">On Sat, 2016-09-10 at 20:00 +0000, example example
com wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> On <date1>, <name1> wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> > Hello</div>"
"<div style=\"width: 71ch;\">> > <br></div>"
"<div style=\"width: 71ch;\">> > Goodbye</div>"
@@ -646,7 +646,7 @@ test_bug_771493 (TestFixture *fixture)
test_utils_insert_content (fixture,
"<body><pre><br>"
"----- Original Message -----\n"
- "<blockquote type=\"cite\">\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">\n"
"This week summary:"
"</blockquote>"
"</pre><span class=\"-x-evo-to-body\" data-credits=\"On Thu, 2016-09-15 at 08:08 -0400, user
wrote:\"></span>"
@@ -656,10 +656,10 @@ test_bug_771493 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
HTML_PREFIX "<div style=\"width: 71ch;\">On Thu, 2016-09-15 at 08:08 -0400, user wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> <br></div>"
"<div style=\"width: 71ch;\">> ----- Original Message -----</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> > This week summary:</div>"
"</blockquote>"
"</blockquote>"
@@ -691,7 +691,7 @@ test_bug_772171 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:ddeb",
HTML_PREFIX "<div style=\"width: 71ch;\">On Thu, 2016-09-15 at 08:08 -0400, user wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> <br></div>"
"<div style=\"width: 71ch;\">> b</div>"
"</blockquote>"
@@ -798,7 +798,7 @@ test_bug_775042 (TestFixture *fixture)
"seq:rl\n"
"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 type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> a<br>"
"> b<br>"
"> c</pre>"
@@ -854,13 +854,13 @@ test_bug_779707 (TestFixture *fixture)
"type:a very long text, which splits into multiple lines when this paragraph is not marked as
preformatted, but as normal, as it should be\n"
"",
HTML_PREFIX "<div style=\"width: 71ch;\">Credits:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> line 1</pre>"
"</blockquote>"
"<div style=\"width: 71ch;\"><br></div>"
"<div style=\"width: 71ch;\">a very long text, which splits into multiple lines when this
paragraph is not marked as preformatted, but as normal, as it should be</div>"
"<div style=\"width: 71ch;\"><br></div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> line 3</pre>"
"</blockquote>"
"<div style=\"width: 71ch;\"><br></div>"
@@ -901,7 +901,7 @@ test_bug_780275_html (TestFixture *fixture)
"undo:redo\n"
"",
HTML_PREFIX "<div>line 0</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>Xline 1</div>"
"<div>line 2</div>"
"</blockquote>"
@@ -939,7 +939,7 @@ test_bug_780275_plain (TestFixture *fixture)
"undo:test:1\n"
"undo:redo\n",
HTML_PREFIX "<div style=\"width: 71ch;\">line 0</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> Xline 1</div>"
"<div style=\"width: 71ch;\">> line 2</div>"
"</blockquote>"
@@ -971,7 +971,7 @@ test_bug_781722 (TestFixture *fixture)
"seq:dd\n"
"action:style-preformat\n",
HTML_PREFIX "<div style=\"width: 71ch;\">Credits:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> Signed-off-by: User <<a
href=\"mailto:user@no.where\";>user@no.where</a>></pre>"
"</blockquote>"
HTML_SUFFIX,
@@ -1001,7 +1001,7 @@ test_bug_781116 (TestFixture *fixture)
"seq:dd\n"
"action:wrap-lines\n",
HTML_PREFIX "<div style=\"width: 71ch;\">Credits:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> a very long text, which splits into multiple lines when this<br>"
"> paragraph is not marked as preformatted, but as normal, as it should<br>"
"> be</pre>"
@@ -1085,8 +1085,7 @@ test_bug_788829 (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<div style=\"width: 71ch;\">On Today, User wrote:</div><blockquote type=\"cite\"
"
- "style=\"margin:0 0 0 .8ex; border-left:2px #729fcf solid;padding-left:1ex\">"
+ 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 "
diff --git a/src/e-util/test-html-editor-units-bugs.h b/src/e-util/test-html-editor-units-bugs.h
index 31966198f4..c5e78fef34 100644
--- a/src/e-util/test-html-editor-units-bugs.h
+++ b/src/e-util/test-html-editor-units-bugs.h
@@ -19,6 +19,7 @@
#define HTML_PREFIX "<html><head></head><body>"
#define HTML_SUFFIX "</body></html>"
+#define BLOCKQUOTE_STYLE "style=\"margin:0 0 0 .8ex; border-left:2px #729fcf solid;padding-left:1ex\""
G_BEGIN_DECLS
diff --git a/src/e-util/test-html-editor-units-utils.c b/src/e-util/test-html-editor-units-utils.c
index df4cd6a0b5..6f9871598f 100644
--- a/src/e-util/test-html-editor-units-utils.c
+++ b/src/e-util/test-html-editor-units-utils.c
@@ -26,6 +26,7 @@
static guint event_processing_delay_ms = 25;
static gboolean in_background = FALSE;
static gboolean use_multiple_web_processes = FALSE;
+static gboolean glob_keep_going = FALSE;
static GObject *global_web_context = NULL;
void
@@ -64,6 +65,18 @@ test_utils_get_multiple_web_processes (void)
return use_multiple_web_processes;
}
+void
+test_utils_set_keep_going (gboolean keep_going)
+{
+ glob_keep_going = keep_going;
+}
+
+gboolean
+test_utils_get_keep_going (void)
+{
+ return glob_keep_going;
+}
+
void
test_utils_free_global_memory (void)
{
@@ -126,7 +139,10 @@ undo_content_test (TestFixture *fixture,
g_return_val_if_fail (text != NULL, FALSE);
if (!test_utils_html_equal (fixture, text, uc->html)) {
- g_warning ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do not match at
command %d", G_STRFUNC, text, uc->html, cmd_index);
+ if (glob_keep_going)
+ g_printerr ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do not match
at command %d\n", G_STRFUNC, text, uc->html, cmd_index);
+ else
+ g_warning ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do not match
at command %d", G_STRFUNC, text, uc->html, cmd_index);
g_free (text);
return FALSE;
}
@@ -137,7 +153,10 @@ undo_content_test (TestFixture *fixture,
g_return_val_if_fail (text != NULL, FALSE);
if (!test_utils_html_equal (fixture, text, uc->plain)) {
- g_warning ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do not match at
command %d", G_STRFUNC, text, uc->plain, cmd_index);
+ if (glob_keep_going)
+ g_printerr ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do not
match at command %d\n", G_STRFUNC, text, uc->plain, cmd_index);
+ else
+ g_warning ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do not
match at command %d", G_STRFUNC, text, uc->plain, cmd_index);
g_free (text);
return FALSE;
}
@@ -980,7 +999,10 @@ test_utils_run_simple_test (TestFixture *fixture,
g_return_val_if_fail (text != NULL, FALSE);
if (!test_utils_html_equal (fixture, text, expected_html)) {
- g_warning ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do not
match", G_STRFUNC, text, expected_html);
+ if (glob_keep_going)
+ g_printerr ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do
not match\n", G_STRFUNC, text, expected_html);
+ else
+ g_warning ("%s: returned HTML\n---%s---\n and expected HTML\n---%s---\n do
not match", G_STRFUNC, text, expected_html);
g_free (text);
return FALSE;
}
@@ -993,7 +1015,10 @@ test_utils_run_simple_test (TestFixture *fixture,
g_return_val_if_fail (text != NULL, FALSE);
if (!test_utils_html_equal (fixture, text, expected_plain)) {
- g_warning ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do not
match", G_STRFUNC, text, expected_plain);
+ if (glob_keep_going)
+ g_printerr ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do
not match\n", G_STRFUNC, text, expected_plain);
+ else
+ g_warning ("%s: returned Plain\n---%s---\n and expected Plain\n---%s---\n do
not match", G_STRFUNC, text, expected_plain);
g_free (text);
return FALSE;
}
diff --git a/src/e-util/test-html-editor-units-utils.h b/src/e-util/test-html-editor-units-utils.h
index b8c40fa1a8..ee79ac4e02 100644
--- a/src/e-util/test-html-editor-units-utils.h
+++ b/src/e-util/test-html-editor-units-utils.h
@@ -51,6 +51,8 @@ void test_utils_set_multiple_web_processes
(gboolean multiple_web_processes);
gboolean test_utils_get_multiple_web_processes
(void);
+void test_utils_set_keep_going (gboolean keep_going);
+gboolean test_utils_get_keep_going (void);
void test_utils_free_global_memory (void);
void test_utils_add_test (const gchar *name,
ETestFixtureSimpleFunc func);
diff --git a/src/e-util/test-html-editor-units.c b/src/e-util/test-html-editor-units.c
index 4a592233ab..20418e6dcd 100644
--- a/src/e-util/test-html-editor-units.c
+++ b/src/e-util/test-html-editor-units.c
@@ -252,9 +252,9 @@ test_indent_selection (TestFixture *fixture)
"</div><div><br></div>"
HTML_SUFFIX,
"level 0\n"
- " level 1\n"
- " level 2\n"
- " level 1\n"))
+ " level 1\n"
+ " level 2\n"
+ " level 1\n"))
g_test_fail ();
}
@@ -280,9 +280,9 @@ test_indent_typed (TestFixture *fixture)
"</div><div><br></div>"
HTML_SUFFIX,
"level 0\n"
- " level 1\n"
- " level 2\n"
- " level 1\n"))
+ " level 1\n"
+ " level 2\n"
+ " level 1\n"))
g_test_fail ();
}
@@ -1714,7 +1714,7 @@ test_paste_quoted_singleline_html2html (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div>text before </div>"
- "<blockquote type=\"cite\"><div>some <b>bold</b> text</div></blockquote>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>some <b>bold</b> text</div></blockquote>"
"<div>text after</div>" HTML_SUFFIX,
"text before \n"
"> some bold text\n"
@@ -1734,7 +1734,7 @@ test_paste_quoted_singleline_html2plain (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div style=\"width: 71ch;\">text before </div>"
- "<blockquote type=\"cite\"><div style=\"width: 71ch;\">> some <b>bold</b>
text</div></blockquote>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div style=\"width: 71ch;\">> some
<b>bold</b> text</div></blockquote>"
"<div style=\"width: 71ch;\">text after</div>" HTML_SUFFIX,
"text before \n"
"> some bold text\n"
@@ -1754,7 +1754,7 @@ test_paste_quoted_singleline_plain2html (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div>text before </div>"
- "<blockquote type=\"cite\"><div>some plain text</div></blockquote>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>some plain text</div></blockquote>"
"<div>text after</div>" HTML_SUFFIX,
"text before \n"
"> some plain text\n"
@@ -1774,7 +1774,7 @@ test_paste_quoted_singleline_plain2plain (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div style=\"width: 71ch;\">text before </div>"
- "<blockquote type=\"cite\"><div style=\"width: 71ch;\">> some plain
text</div></blockquote>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div style=\"width: 71ch;\">> some plain
text</div></blockquote>"
"<div style=\"width: 71ch;\">text after</div>" HTML_SUFFIX,
"text before \n"
"> some plain text\n"
@@ -1798,7 +1798,7 @@ test_paste_quoted_multiline_html2html (TestFixture *fixture)
"seq:b\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div>text before </div>"
- "<blockquote type=\"cite\">> <b>bold</b> text</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">> <b>bold</b> text</div>"
"<div>> <i>italic</i> text</div>"
"<div>> <u>underline</u> text</div></blockquote>"
"<div>text after</div>" HTML_SUFFIX,
@@ -1827,7 +1827,7 @@ test_paste_quoted_multiline_html2plain (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div style=\"width: 71ch;\">text before </div>"
- "<blockquote type=\"cite\"><div>> bold text</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>> bold text</div>"
"<div style=\"width: 71ch;\">> italic text</div>"
"<div style=\"width: 71ch;\">> underline text</div></blockquote>"
"<div style=\"width: 71ch;\">> text after</div>" HTML_SUFFIX,
@@ -1852,7 +1852,7 @@ test_paste_quoted_multiline_plain2html (TestFixture *fixture)
"seq:b\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div>text before </div>"
- "<blockquote type=\"cite\"><div>line 1</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>line 1</div>"
"<div>line 2</div>"
"<div>line 3</div></blockquote>"
"<div>text after</div>" HTML_SUFFIX,
@@ -1876,7 +1876,7 @@ test_paste_quoted_multiline_plain2plain (TestFixture *fixture)
"type:\\n\n" /* stop quotting */
"type:text after\n",
HTML_PREFIX "<div style=\"width: 71ch;\">text before </div>"
- "<blockquote type=\"cite\"><div style=\"width: 71ch;\">> line 1</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div style=\"width: 71ch;\">> line 1</div>"
"<div style=\"width: 71ch;\">> line 2</div>"
"<div style=\"width: 71ch;\">> line 3</div></blockquote>"
"<div style=\"width: 71ch;\">text after</div>" HTML_SUFFIX,
@@ -1899,11 +1899,11 @@ test_cite_html2plain (TestFixture *fixture)
test_utils_insert_content (fixture,
"<html><head></head><body>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div data-evo-paragraph=\"\">level 1</div>"
"<div data-evo-paragraph=\"\"><br></div>"
"<div data-evo-paragraph=\"\">level 1</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div data-evo-paragraph=\"\">level 2</div>"
"</blockquote>"
"<div data-evo-paragraph=\"\">back in level 1</div>"
@@ -1916,8 +1916,8 @@ test_cite_html2plain (TestFixture *fixture)
/* Just check the content was read properly */
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\"><div>level 1</div><div><br></div><div>level 1</div>"
- "<blockquote type=\"cite\"><div>level 2</div></blockquote><div>back in level
1</div></blockquote>"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>level
1</div><div><br></div><div>level 1</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div>level 2</div></blockquote><div>back in
level 1</div></blockquote>"
"<div><br></div><div>out of the citation</div>" HTML_SUFFIX,
"> level 1\n"
"> \n"
@@ -1954,14 +1954,14 @@ test_cite_shortline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>Just one short line.</div>"
"</blockquote></body></html>",
E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>Just one short line.</div>"
"</blockquote>" HTML_SUFFIX,
"> Just one short line.")) {
@@ -1978,14 +1978,14 @@ test_cite_shortline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>Just one short line.</div>"
"</blockquote></body></html>",
E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>Just one short line.</div>"
"</blockquote>" HTML_SUFFIX,
"> Just one short line.")) {
@@ -1994,7 +1994,7 @@ test_cite_shortline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>short line 1</div>"
"<div>short line 2</div>"
"<div>short line 3</div>"
@@ -2003,7 +2003,7 @@ test_cite_shortline (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>short line 1</div>"
"<div>short line 2</div>"
"<div>short line 3</div>"
@@ -2024,7 +2024,7 @@ test_cite_shortline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>short line 1</div>"
"<div>short line 2</div>"
"<div>short line 3</div>"
@@ -2033,7 +2033,7 @@ test_cite_shortline (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>short line 1</div>"
"<div>short line 2</div>"
"<div>short line 3</div>"
@@ -2056,14 +2056,14 @@ test_cite_longline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"</blockquote></body></html>",
E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"</blockquote>" HTML_SUFFIX,
"> This is the first paragraph of a quoted text which has some long text\n"
@@ -2081,14 +2081,14 @@ test_cite_longline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"</blockquote></body></html>",
E_CONTENT_EDITOR_INSERT_TEXT_HTML | E_CONTENT_EDITOR_INSERT_REPLACE_ALL);
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"</blockquote>" HTML_SUFFIX,
"> This is the first paragraph of a quoted text which has some long text\n"
@@ -2098,7 +2098,7 @@ test_cite_longline (TestFixture *fixture)
}
test_utils_insert_content (fixture,
- "<html><head></head><body><blockquote type=\"cite\">"
+ "<html><head></head><body><blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"<div>This is the second paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"<div>This is the third paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
@@ -2107,7 +2107,7 @@ test_cite_longline (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
- HTML_PREFIX "<blockquote type=\"cite\">"
+ HTML_PREFIX "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div>This is the first paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"<div>This is the second paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
"<div>This is the third paragraph of a quoted text which has some long text to test. It has
the second sentence as well.</div>"
@@ -2147,7 +2147,7 @@ test_cite_reply_html (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
HTML_PREFIX "<div>On Today, User wrote:</div>"
- "<blockquote type=\"cite\"><pre>line 1\n"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><pre>line 1\n"
"line 2\n"
"</pre></blockquote>" HTML_SUFFIX,
"On Today, User wrote:\n"
@@ -2177,7 +2177,7 @@ test_cite_reply_plain (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"",
HTML_PREFIX "<div style=\"width: 71ch;\">On Today, User wrote:</div>"
- "<blockquote type=\"cite\"><div style=\"width: 71ch;\">> line 1</div>"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE "><div style=\"width: 71ch;\">> line 1</div>"
"<div style=\"width: 71ch;\">> line 2</div>"
"<div style=\"width: 71ch;\">> <br></div></blockquote>" HTML_SUFFIX,
"On Today, User wrote:\n"
@@ -2601,7 +2601,7 @@ test_delete_quoted (TestFixture *fixture)
"undo:test\n"
"undo:redo:2",
HTML_PREFIX "<div style=\"width: 71ch;\">On Thu, 2016-09-15 at 08:08 -0400, user wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> a</div>"
"<div style=\"width: 71ch;\">> b</div>"
"</blockquote>"
@@ -2634,7 +2634,7 @@ test_delete_after_quoted (TestFixture *fixture)
if (!test_utils_run_simple_test (fixture,
"seq:ddddbb\n",
HTML_PREFIX "<div style=\"width: 71ch;\">On Thu, 2016-09-15 at 08:08 -0400, user wrote:</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<pre>> a</pre>"
"<pre>> b<br></pre>"
"</blockquote>"
@@ -2664,7 +2664,7 @@ test_delete_quoted_selection (TestFixture *fixture)
"seq:d\n"
"type:X\n",
HTML_PREFIX "<div style=\"width: 71ch;\">line 0</div>"
- "<blockquote type=\"cite\">"
+ "<blockquote type=\"cite\" " BLOCKQUOTE_STYLE ">"
"<div style=\"width: 71ch;\">> line 1</div>"
"<div style=\"width: 71ch;\">> <br></div>"
"<div style=\"width: 71ch;\">> line 2</div>"
@@ -2729,6 +2729,7 @@ main (gint argc,
gint cmd_delay = -1;
gboolean background = FALSE;
gboolean multiple_web_processes = FALSE;
+ gboolean keep_going = FALSE;
GOptionEntry entries[] = {
{ "cmd-delay", '\0', 0,
G_OPTION_ARG_INT, &cmd_delay,
@@ -2742,6 +2743,11 @@ main (gint argc,
G_OPTION_ARG_NONE, &multiple_web_processes,
"Use multiple web processes for each test being run. Default is to use single web process.",
NULL },
+ /* Cannot use --keep-going, it's taken by glib */
+ { "e-keep-going", '\0', 0,
+ G_OPTION_ARG_NONE, &keep_going,
+ "Use to not abort failed tests, but keep going through all tests.",
+ NULL },
{ NULL }
};
GOptionContext *context;
@@ -2766,6 +2772,9 @@ main (gint argc,
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=";);
+ if (keep_going)
+ g_test_set_nonfatal_assertions ();
+
gtk_init (&argc, &argv);
context = g_option_context_new (NULL);
@@ -2783,6 +2792,7 @@ main (gint argc,
test_utils_set_event_processing_delay_ms ((guint) cmd_delay);
test_utils_set_background (background);
test_utils_set_multiple_web_processes (multiple_web_processes);
+ test_utils_set_keep_going (keep_going);
e_util_init_main_thread (NULL);
e_passwords_init ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
