X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FBasicSupportTest.java;h=b731c441860bb6b8d3baf10da8ca8fdaa783fc11;hb=75919f2da8b8cd87f5f9d237989410499f7bb98d;hp=645d042e74467a3b8a2497f9b287fd1200b39a4b;hpb=ed08c17162aa8cbdb0cbe6a6045815b987236b9f;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/test/BasicSupportTest.java b/src/be/nikiroo/fanfix/test/BasicSupportTest.java
index 645d042..b731c44 100644
--- a/src/be/nikiroo/fanfix/test/BasicSupportTest.java
+++ b/src/be/nikiroo/fanfix/test/BasicSupportTest.java
@@ -15,21 +15,22 @@ import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.fanfix.supported.BasicSupport_Deprecated;
+import be.nikiroo.fanfix.supported.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) {
@@ -180,7 +181,7 @@ public class BasicSupportTest extends TestLauncher {
 					public void setUp() throws Exception {
 						super.setUp();
 
-					};
+					}
 
 					@Override
 					public void tearDown() throws Exception {
@@ -255,10 +256,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;
@@ -325,20 +326,19 @@ 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 {
-						BasicSupport support = BasicSupport
-								.getSupport(SupportType.TEXT);
+						BasicSupport support = BasicSupport.getSupport(
+								SupportType.TEXT, tmp.toURI().toURL());
 
-						Story story = support
-								.process(tmp.toURI().toURL(), null);
+						Story story = support.process(null);
 
 						assertEquals(2, story.getChapters().size());
 						assertEquals(1, story.getChapters().get(1)
@@ -368,20 +368,19 @@ 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 {
-						BasicSupport support = BasicSupport
-								.getSupport(SupportType.TEXT);
+						BasicSupport support = BasicSupport.getSupport(
+								SupportType.TEXT, tmp.toURI().toURL());
 
-						Story story = support
-								.process(tmp.toURI().toURL(), null);
+						Story story = support.process(null);
 
 						assertEquals(2, story.getChapters().size());
 						assertEquals(1, story.getChapters().get(1)
@@ -394,12 +393,7 @@ public class BasicSupportTest extends TestLauncher {
 		});
 	}
 
-	private class BasicSupportEmpty extends BasicSupport {
-		@Override
-		protected String getSourceName() {
-			return null;
-		}
-
+	private class BasicSupportEmpty extends BasicSupport_Deprecated {
 		@Override
 		protected boolean supports(URL url) {
 			return false;