X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FBasicSupportTest.java;h=dba0ef027f8be86e593019f5cacaccb13eeba511;hp=d8565cba85e33c31cf3709e05d1c124af4293621;hb=2a25f7814eec9854022f1c9dee188bfbdb955591;hpb=2284842831ea46e89b97dd22b6e294caad361f30 diff --git a/src/be/nikiroo/fanfix/test/BasicSupportTest.java b/src/be/nikiroo/fanfix/test/BasicSupportTest.java index d8565cb..dba0ef0 100644 --- a/src/be/nikiroo/fanfix/test/BasicSupportTest.java +++ b/src/be/nikiroo/fanfix/test/BasicSupportTest.java @@ -17,18 +17,19 @@ import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.supported.BasicSupport; import be.nikiroo.fanfix.supported.BasicSupport.SupportType; import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.Progress; import be.nikiroo.utils.test.TestCase; import be.nikiroo.utils.test.TestLauncher; -public class BasicSupportTest extends TestLauncher { +class BasicSupportTest extends TestLauncher { // quote chars - private char openQuote = Instance.getTrans().getChar( + private char openQuote = Instance.getTrans().getCharacter( StringId.OPEN_SINGLE_QUOTE); - private char closeQuote = Instance.getTrans().getChar( + private char closeQuote = Instance.getTrans().getCharacter( StringId.CLOSE_SINGLE_QUOTE); - private char openDoubleQuote = Instance.getTrans().getChar( + private char openDoubleQuote = Instance.getTrans().getCharacter( StringId.OPEN_DOUBLE_QUOTE); - private char closeDoubleQuote = Instance.getTrans().getChar( + private char closeDoubleQuote = Instance.getTrans().getCharacter( StringId.CLOSE_DOUBLE_QUOTE); public BasicSupportTest(String[] args) { @@ -50,7 +51,7 @@ public class BasicSupportTest extends TestLauncher { } @Override - protected List requotify(Paragraph para) { + public List requotify(Paragraph para) { List paras = new ArrayList( 1); paras.add(para); @@ -60,13 +61,13 @@ public class BasicSupportTest extends TestLauncher { List paras = null; - paras = support.makeParagraphs(null, ""); + paras = support.makeParagraphs(null, "", null); assertEquals( "An empty content should not generate paragraphs", 0, paras.size()); paras = support.makeParagraphs(null, - "Line 1

Line 2

Line 3

"); + "Line 1

Line 2

Line 3

", null); assertEquals(5, paras.size()); assertEquals("Line 1", paras.get(0).getContent()); assertEquals(ParagraphType.BLANK, paras.get(1) @@ -77,7 +78,7 @@ public class BasicSupportTest extends TestLauncher { assertEquals("Line 3", paras.get(4).getContent()); paras = support.makeParagraphs(null, - "

Line1

Line2

Line3

"); + "

Line1

Line2

Line3

", null); assertEquals(6, paras.size()); } }); @@ -95,34 +96,39 @@ public class BasicSupportTest extends TestLauncher { List paras = null; paras = support - .makeParagraphs(null, - "

Line1

Line2

Line3

"); + .makeParagraphs( + null, + "

Line1

Line2

Line3

", + null); assertEquals(5, paras.size()); paras = support - .makeParagraphs(null, - "

Line1

Line2

Line3

* * *"); + .makeParagraphs( + null, + "

Line1

Line2

Line3

* * *", + null); assertEquals(5, paras.size()); - paras = support.makeParagraphs(null, "1

* * *

2"); + paras = support.makeParagraphs(null, "1

* * *

2", + null); assertEquals(3, paras.size()); assertEquals(ParagraphType.BREAK, paras.get(1) .getType()); paras = support.makeParagraphs(null, - "1


* * *

2"); + "1


* * *

2", null); assertEquals(3, paras.size()); assertEquals(ParagraphType.BREAK, paras.get(1) .getType()); paras = support.makeParagraphs(null, - "1

* * *


2"); + "1

* * *


2", null); assertEquals(3, paras.size()); assertEquals(ParagraphType.BREAK, paras.get(1) .getType()); paras = support.makeParagraphs(null, - "1



* * *


2"); + "1



* * *


2", null); assertEquals(3, paras.size()); assertEquals(ParagraphType.BREAK, paras.get(1) .getType()); @@ -174,7 +180,7 @@ public class BasicSupportTest extends TestLauncher { public void setUp() throws Exception { super.setUp(); - }; + } @Override public void tearDown() throws Exception { @@ -223,6 +229,79 @@ public class BasicSupportTest extends TestLauncher { assertEquals(text, para.getContent()); } }); + + addTest(new TestCase("BasicSupport.processPara() words count") { + @Override + public void test() throws Exception { + BasicSupportEmpty support = new BasicSupportEmpty() { + @Override + protected boolean isHtml() { + return true; + } + }; + + Paragraph para; + + para = support.processPara("«Yes, my Lord!»"); + assertEquals(3, para.getWords()); + + para = support.processPara("One, twee, trois."); + assertEquals(3, para.getWords()); + } + }); + + addTest(new TestCase("BasicSupport.requotify() words count") { + @Override + public void test() throws Exception { + BasicSupportEmpty support = new BasicSupportEmpty(); + + char openDoubleQuote = Instance.getTrans() + .getCharacter(StringId.OPEN_DOUBLE_QUOTE); + char closeDoubleQuote = Instance.getTrans() + .getCharacter(StringId.CLOSE_DOUBLE_QUOTE); + + String content = null; + Paragraph para = null; + List paras = null; + long words = 0; + + content = "One, twee, trois."; + para = new Paragraph(ParagraphType.NORMAL, content, + content.split(" ").length); + paras = support.requotify(para); + words = 0; + for (Paragraph p : paras) { + words += p.getWords(); + } + assertEquals("Bad words count in a single paragraph", + para.getWords(), words); + + content = "Such WoW! So Web2.0! With Colours!"; + para = new Paragraph(ParagraphType.NORMAL, content, + content.split(" ").length); + paras = support.requotify(para); + words = 0; + for (Paragraph p : paras) { + words += p.getWords(); + } + assertEquals("Bad words count in a single paragraph", + para.getWords(), words); + + content = openDoubleQuote + "Such a good idea!" + + closeDoubleQuote + + ", she said. This ought to be a new para."; + para = new Paragraph(ParagraphType.QUOTE, content, + content.split(" ").length); + paras = support.requotify(para); + words = 0; + for (Paragraph p : paras) { + words += p.getWords(); + } + assertEquals( + "Bad words count in a requotified paragraph", + para.getWords(), words); + } + }); } }); @@ -246,12 +325,12 @@ public class BasicSupportTest extends TestLauncher { + "Fanfan." + "\n" + "\n" + "Chapter 2: Chap2" + "\n" + "\n" // + "Tulipe." + "\n"); - }; + } @Override public void tearDown() throws Exception { tmp.delete(); - }; + } @Override public void test() throws Exception { @@ -289,12 +368,12 @@ public class BasicSupportTest extends TestLauncher { + "Fanfan." + "\n" + "\n" + "Chapter 2: Chap2" + "\n" + "\n" // + "Tulipe." + "\n"); - }; + } @Override public void tearDown() throws Exception { tmp.delete(); - }; + } @Override public void test() throws Exception { @@ -344,21 +423,21 @@ public class BasicSupportTest extends TestLauncher { @Override protected List> getChapters(URL source, - InputStream in) throws IOException { + InputStream in, Progress pg) throws IOException { return null; } @Override protected String getChapterContent(URL source, InputStream in, - int number) throws IOException { + int number, Progress pg) throws IOException { return null; } @Override // and make it public! - public List makeParagraphs(URL source, String content) - throws IOException { - return super.makeParagraphs(source, content); + public List makeParagraphs(URL source, String content, + Progress pg) throws IOException { + return super.makeParagraphs(source, content, pg); } @Override @@ -372,5 +451,11 @@ public class BasicSupportTest extends TestLauncher { public Paragraph processPara(String line) { return super.processPara(line); } + + @Override + // and make it public! + public List requotify(Paragraph para) { + return super.requotify(para); + } } }