wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set text direction to auto and improve HtmlConverter testing

Browse source
This commit is contained in:
Philip Whitehouse 2018-01-11 00:57:23 +00:00
parent e4467ef959
commit 5cbd0be736
2 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java
View file

@ -1249,7 +1249,7 @@ public class HtmlConverter {
public static String wrapMessageContent(CharSequence messageContent) {
// Include a meta tag so the WebView will not use a fixed viewport width of 980 px
return "<html><head><meta name=\"viewport\" content=\"width=device-width\"/>" +
return "<html dir=\"auto\"><head><meta name=\"viewport\" content=\"width=device-width\"/>" +
HtmlConverter.cssStyleTheme() +
HtmlConverter.cssStylePre() +
"</head><body>" +

65
k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java
View file

@ -6,8 +6,16 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import com.fsck.k9.K9;
import com.fsck.k9.K9.Theme;
import com.fsck.k9.K9RobolectricTestRunner;
import com.fsck.k9.mail.internet.Viewable.Html;
import org.apache.commons.io.IOUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
@ -21,6 +29,17 @@ public class HtmlConverterTest {
// Useful if you want to write stuff to a file for debugging in a browser.
private static final boolean WRITE_TO_FILE = Boolean.parseBoolean(System.getProperty("k9.htmlConverterTest.writeToFile", "false"));
private static final String OUTPUT_FILE = "C:/temp/parse.html";
private K9.Theme priorMessageViewTheme;
@Before
public void before() {
priorMessageViewTheme = K9.getK9MessageViewTheme();
}
@After
public void after() {
K9.setK9MessageViewThemeSetting(priorMessageViewTheme);
}
@Test
public void testTextQuoteToHtmlBlockquote() {
@ -293,4 +312,50 @@ public class HtmlConverterTest {
String result = HtmlConverter.textToHtml(text);
assertEquals("<pre class=\"k9mail\">hello<hr>world<br /></pre>", result);
}
@Test
public void wrapMessageContent_addsViewportMetaElement() {
Document document = Jsoup.parse(HtmlConverter.wrapMessageContent("Some text"));
Elements metaElements = document.head().getElementsByTag("meta");
assertEquals(1, metaElements.size());
assertEquals("viewport", metaElements.get(0).attributes().get("name"));
}
@Test
public void wrapMessageContent_setsDirToAuto() {
Document document = Jsoup.parse(HtmlConverter.wrapMessageContent("Some text"));
String direction = document.getElementsByTag("html").get(0).attributes().get("dir");
assertEquals("auto", direction);
}
@Test
public void wrapMessageContent_addsPreCSS() {
K9.setK9MessageViewThemeSetting(Theme.LIGHT);
Document document = Jsoup.parse(HtmlConverter.wrapMessageContent("Some text"));
Elements styleElements = document.head().getElementsByTag("style");
assertEquals(1, styleElements.size());
}
@Test
public void wrapMessageContent_whenDarkMessageViewTheme_addsDarkThemeCSS() {
K9.setK9MessageViewThemeSetting(Theme.DARK);
Document document = Jsoup.parse(HtmlConverter.wrapMessageContent("Some text"));
Elements styleElements = document.head().getElementsByTag("style");
assertEquals(2, styleElements.size());
}
@Test
public void wrapMessageContent_putsMessageContentInBody() {
String content = "Some text";
Document document = Jsoup.parse(HtmlConverter.wrapMessageContent(content));
String actualContent = document.getElementsByTag("body").text();
assertEquals(content, actualContent);
}
}