CTS change for bug 7301594 Html.toHtml ... invalid html
We changed the HTML output for direction from <p dir=ltr> to <p
dir="ltr">, and the former behavior was specified in the tests. This
change updates tests to the new, more correct, syntax.
Change-Id: Ifae1b8e0c6a41df928af452de8b0cbcac579890b
diff --git a/tests/tests/text/src/android/text/cts/HtmlTest.java b/tests/tests/text/src/android/text/cts/HtmlTest.java
index eeb0fd8..74008f7 100644
--- a/tests/tests/text/src/android/text/cts/HtmlTest.java
+++ b/tests/tests/text/src/android/text/cts/HtmlTest.java
@@ -112,16 +112,18 @@
public void testParagraphs() throws Exception {
SpannableString s = new SpannableString("Hello world");
- assertEquals("<p dir=ltr>Hello world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello world\nor something");
- assertEquals("<p dir=ltr>Hello world<br>\nor something</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello world<br>\nor something</p>\n", Html.toHtml(s));
s = new SpannableString("Hello world\n\nor something");
- assertEquals("<p dir=ltr>Hello world</p>\n<p dir=ltr>or something</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello world</p>\n<p dir=\"ltr\">or something</p>\n",
+ Html.toHtml(s));
s = new SpannableString("Hello world\n\n\nor something");
- assertEquals("<p dir=ltr>Hello world<br></p>\n<p dir=ltr>or something</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello world<br></p>\n<p dir=\"ltr\">or something</p>\n",
+ Html.toHtml(s));
}
public void testBlockquote() throws Exception {
@@ -130,23 +132,24 @@
SpannableString s = new SpannableString("Hello world");
int end = s.length();
s.setSpan(new QuoteSpan(), start, end, Spannable.SPAN_PARAGRAPH);
- assertEquals("<blockquote><p dir=ltr>Hello world</p>\n</blockquote>\n", Html.toHtml(s));
+ assertEquals("<blockquote><p dir=\"ltr\">Hello world</p>\n</blockquote>\n", Html.toHtml(s));
s = new SpannableString("Hello\n\nworld");
end = 7;
s.setSpan(new QuoteSpan(), start, end, Spannable.SPAN_PARAGRAPH);
- assertEquals("<blockquote><p dir=ltr>Hello</p>\n</blockquote>\n<p dir=ltr>world</p>\n", Html.toHtml(s));
+ assertEquals("<blockquote><p dir=\"ltr\">Hello</p>\n</blockquote>\n" +
+ "<p dir=\"ltr\">world</p>\n", Html.toHtml(s));
}
public void testEntities() throws Exception {
SpannableString s = new SpannableString("Hello <&> world");
- assertEquals("<p dir=ltr>Hello <&> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <&> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello \u03D5 world");
- assertEquals("<p dir=ltr>Hello ϕ world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello ϕ world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello world");
- assertEquals("<p dir=ltr>Hello world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello world</p>\n", Html.toHtml(s));
}
public void testMarkup() throws Exception {
@@ -155,52 +158,54 @@
SpannableString s = new SpannableString("Hello bold world");
int end = s.length() - start;
s.setSpan(new StyleSpan(Typeface.BOLD), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <b>bold</b> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <b>bold</b> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello italic world");
end = s.length() - start;
s.setSpan(new StyleSpan(Typeface.ITALIC), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <i>italic</i> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <i>italic</i> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello monospace world");
end = s.length() - start;
s.setSpan(new TypefaceSpan("monospace"), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <tt>monospace</tt> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <tt>monospace</tt> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello superscript world");
end = s.length() - start;
s.setSpan(new SuperscriptSpan(), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <sup>superscript</sup> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <sup>superscript</sup> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello subscript world");
end = s.length() - start;
s.setSpan(new SubscriptSpan(), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <sub>subscript</sub> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <sub>subscript</sub> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello underline world");
end = s.length() - start;
s.setSpan(new UnderlineSpan(), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <u>underline</u> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <u>underline</u> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello struck world");
end = s.length() - start;
s.setSpan(new StrikethroughSpan(), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
- assertEquals("<p dir=ltr>Hello <strike>struck</strike> world</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Hello <strike>struck</strike> world</p>\n", Html.toHtml(s));
s = new SpannableString("Hello linky world");
end = s.length() - start;
s.setSpan(new URLSpan("http://www.google.com"), start, end, SPAN_EXCLUSIVE_INCLUSIVE);
String ret = Html.toHtml(s);
- assertEquals("<p dir=ltr>Hello <a href=\"http://www.google.com\">linky</a> world</p>\n", ret);
+ assertEquals("<p dir=\"ltr\">Hello <a href=\"http://www.google.com\">linky</a> world</p>\n",
+ ret);
}
public void testImg() throws Exception {
Spanned s = Html.fromHtml("yes<img src=\"http://example.com/foo.gif\">no");
- assertEquals("<p dir=ltr>yes<img src=\"http://example.com/foo.gif\">no</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">yes<img src=\"http://example.com/foo.gif\">no</p>\n",
+ Html.toHtml(s));
}
public void testUtf8() throws Exception {
Spanned s = Html.fromHtml("<p>\u0124\u00eb\u0142\u0142o, world!</p>");
- assertEquals("<p dir=ltr>Ĥëłło, world!</p>\n", Html.toHtml(s));
+ assertEquals("<p dir=\"ltr\">Ĥëłło, world!</p>\n", Html.toHtml(s));
}
}
