diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/src/com/fsck/k9/helper/HtmlConverter.java index 61cac6912..8e2d57a13 100644 --- a/src/com/fsck/k9/helper/HtmlConverter.java +++ b/src/com/fsck/k9/helper/HtmlConverter.java @@ -190,8 +190,9 @@ public class HtmlConverter { return buff.toString(); } + private static final String HTML_BLOCKQUOTE_COLOR_TOKEN = "$$COLOR$$"; private static final String HTML_BLOCKQUOTE_START = "
"; + "style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid $$COLOR$$; padding-left: 1ex;\">"; private static final String HTML_BLOCKQUOTE_END = ""; private static final String HTML_NEWLINE = "
Panama!", result); + assertEquals("
Bob Barker <bob@aol.com> wrote:a canal
Dorothy Jo Gideon <dorothy@aol.com> espoused:A man, a plan...Too easy!
Nice job :)Guess!
Panama!", result); } @Test @@ -42,7 +44,31 @@ public class HtmlConverterTest { "> :)"; String result = HtmlConverter.textToHtml(message, false); writeToFile(result); - Assert.assertEquals("
Bob Barker <bob@aol.com> wrote:a canal
Dorothy Jo Gideon <dorothy@aol.com> espoused:A man, a plan...Too easy!
Nice job :)Guess!
*facepalm*", result); + assertEquals("
Bob Barker <bob@aol.com> wrote:A wise man once said...
LOL F1RST!!!!!
:)
*facepalm*", result); + } + + @Test + public void testQuoteDepthColor() { + assertEquals(HtmlConverter.getQuoteColor(1), HtmlConverter.QUOTE_COLOR_LEVEL_1); + assertEquals(HtmlConverter.getQuoteColor(2), HtmlConverter.QUOTE_COLOR_LEVEL_2); + assertEquals(HtmlConverter.getQuoteColor(3), HtmlConverter.QUOTE_COLOR_LEVEL_3); + assertEquals(HtmlConverter.getQuoteColor(4), HtmlConverter.QUOTE_COLOR_LEVEL_4); + assertEquals(HtmlConverter.getQuoteColor(5), HtmlConverter.QUOTE_COLOR_LEVEL_5); + + assertEquals(HtmlConverter.getQuoteColor(-1), HtmlConverter.QUOTE_COLOR_DEFAULT); + assertEquals(HtmlConverter.getQuoteColor(0), HtmlConverter.QUOTE_COLOR_DEFAULT); + assertEquals(HtmlConverter.getQuoteColor(6), HtmlConverter.QUOTE_COLOR_DEFAULT); + + String message = "zero\n" + + "> one\n" + + ">> two\n" + + ">>> three\n" + + ">>>> four\n" + + ">>>>> five\n" + + ">>>>>> six"; + String result = HtmlConverter.textToHtml(message, false); + writeToFile(result); + assertEquals("
Bob Barker <bob@aol.com> wrote:A wise man once said...
LOL F1RST!!!!!
:)
zero", result); } private void writeToFile(final String content) {onetwothreefourfivesix