git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from master
[nikiroo-utils.git]
/
test
/
ConversionTest.java
diff --git
a/test/ConversionTest.java
b/test/ConversionTest.java
index d730b3b5efecc85f8a1b581c0ae16dc719e66187..2b22364dca5241049420bd05bc09c740e48841c5 100644
(file)
--- a/
test/ConversionTest.java
+++ b/
test/ConversionTest.java
@@
-12,12
+12,22
@@
import java.util.Map.Entry;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Main;
import be.nikiroo.fanfix.output.BasicOutput;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Main;
import be.nikiroo.fanfix.output.BasicOutput;
+import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Progress;
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.test.TestCase;
import be.nikiroo.utils.test.TestLauncher;
class ConversionTest extends TestLauncher {
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.test.TestCase;
import be.nikiroo.utils.test.TestLauncher;
class ConversionTest extends TestLauncher {
+ private class MainWithConvert extends Main {
+ @Override
+ public int convert(String urlString, OutputType type, String target,
+ boolean infoCover, Progress pg) {
+ return super.convert(urlString, type, target, infoCover, pg);
+ }
+ }
+
private String testUri;
private String expectedDir;
private String resultDir;
private String testUri;
private String expectedDir;
private String resultDir;
@@
-161,7
+171,7
@@
class ConversionTest extends TestLauncher {
try {
File target = new File(resultDir, type.toString());
try {
File target = new File(resultDir, type.toString());
- int code =
Main.convert(testUri, type.toString()
,
+ int code =
new MainWithConvert().convert(testUri, type
,
target.getAbsolutePath(), false, null);
String error = "";
target.getAbsolutePath(), false, null);
String error = "";