X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FBasicSupportTest.java;h=af33f9d0695494bb3b954b3aa72605f2998a115a;hb=211f7ddb50f68aa8a999023ef6d63d5756bdace6;hp=f989663e24b0ae142f03448c1dc7d592b7204ba6;hpb=793f1071fae48daed3b545a03a286c85e527d244;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/test/BasicSupportTest.java b/src/be/nikiroo/fanfix/test/BasicSupportTest.java
index f989663..af33f9d 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 {
 	// 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) {
@@ -60,13 +61,13 @@ public class BasicSupportTest extends TestLauncher {
 
 						List<Paragraph> 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</p><p>Line 2</p><p>Line 3</p>");
+								"Line 1</p><p>Line 2</p><p>Line 3</p>", 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,
-								"<p>Line1</p><p>Line2</p><p>Line3</p>");
+								"<p>Line1</p><p>Line2</p><p>Line3</p>", null);
 						assertEquals(6, paras.size());
 					}
 				});
@@ -95,34 +96,39 @@ public class BasicSupportTest extends TestLauncher {
 						List<Paragraph> paras = null;
 
 						paras = support
-								.makeParagraphs(null,
-										"<p>Line1</p><p>Line2</p><p>Line3<br/><br><p></p>");
+								.makeParagraphs(
+										null,
+										"<p>Line1</p><p>Line2</p><p>Line3<br/><br><p></p>",
+										null);
 						assertEquals(5, paras.size());
 
 						paras = support
-								.makeParagraphs(null,
-										"<p>Line1</p><p>Line2</p><p>Line3<br/><br><p></p>* * *");
+								.makeParagraphs(
+										null,
+										"<p>Line1</p><p>Line2</p><p>Line3<br/><br><p></p>* * *",
+										null);
 						assertEquals(5, paras.size());
 
-						paras = support.makeParagraphs(null, "1<p>* * *<p>2");
+						paras = support.makeParagraphs(null, "1<p>* * *<p>2",
+								null);
 						assertEquals(3, paras.size());
 						assertEquals(ParagraphType.BREAK, paras.get(1)
 								.getType());
 
 						paras = support.makeParagraphs(null,
-								"1<p><br/><p>* * *<p>2");
+								"1<p><br/><p>* * *<p>2", null);
 						assertEquals(3, paras.size());
 						assertEquals(ParagraphType.BREAK, paras.get(1)
 								.getType());
 
 						paras = support.makeParagraphs(null,
-								"1<p>* * *<br/><p><br><p>2");
+								"1<p>* * *<br/><p><br><p>2", null);
 						assertEquals(3, paras.size());
 						assertEquals(ParagraphType.BREAK, paras.get(1)
 								.getType());
 
 						paras = support.makeParagraphs(null,
-								"1<p><br/><br>* * *<br/><p><br><p>2");
+								"1<p><br/><br>* * *<br/><p><br><p>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 {
@@ -249,10 +255,10 @@ public class BasicSupportTest extends TestLauncher {
 					public void test() throws Exception {
 						BasicSupportEmpty support = new BasicSupportEmpty();
 
-						char openDoubleQuote = Instance.getTrans().getChar(
-								StringId.OPEN_DOUBLE_QUOTE);
-						char closeDoubleQuote = Instance.getTrans().getChar(
-								StringId.CLOSE_DOUBLE_QUOTE);
+						char openDoubleQuote = Instance.getTrans()
+								.getCharacter(StringId.OPEN_DOUBLE_QUOTE);
+						char closeDoubleQuote = Instance.getTrans()
+								.getCharacter(StringId.CLOSE_DOUBLE_QUOTE);
 
 						String content = null;
 						Paragraph para = null;
@@ -319,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 {
@@ -362,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 {
@@ -417,21 +423,21 @@ public class BasicSupportTest extends TestLauncher {
 
 		@Override
 		protected List<Entry<String, URL>> 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<Paragraph> makeParagraphs(URL source, String content)
-				throws IOException {
-			return super.makeParagraphs(source, content);
+		public List<Paragraph> makeParagraphs(URL source, String content,
+				Progress pg) throws IOException {
+			return super.makeParagraphs(source, content, pg);
 		}
 
 		@Override