X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FConversionTest.java;h=92aca369d899eda7858828ce9378271478e654f5;hb=86d49dbc7c3eca665b7823b5de49bb73a31c7722;hp=07ec7478006a1ea1c4487d11c4f0e99cd01ff074;hpb=e4fa48a0b617e0a5368e8e8589909ae93c340447;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/src/be/nikiroo/fanfix/test/ConversionTest.java
index 07ec747..92aca36 100644
--- a/src/be/nikiroo/fanfix/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java
@@ -24,10 +24,19 @@ class ConversionTest extends TestLauncher {
 	private File testFile;
 	private File expectedDir;
 	private File resultDir;
+	private List<BasicOutput.OutputType> realTypes;
 
 	public ConversionTest(String[] args) {
 		super("Conversion", args);
 
+		// Special mode SYSOUT is not a file type (System.out)
+		realTypes = new ArrayList<BasicOutput.OutputType>();
+		for (BasicOutput.OutputType type : BasicOutput.OutputType.values()) {
+			if (!BasicOutput.OutputType.SYSOUT.equals(type)) {
+				realTypes.add(type);
+			}
+		}
+
 		addTest(new TestCase("Read the test file") {
 			@Override
 			public void test() throws Exception {
@@ -48,11 +57,8 @@ class ConversionTest extends TestLauncher {
 			}
 		});
 
-		for (BasicOutput.OutputType type : BasicOutput.OutputType.values()) {
-			// NOT for special mode SYSOUT
-			if (!BasicOutput.OutputType.SYSOUT.equals(type)) {
-				addTest(getTestFor(type));
-			}
+		for (BasicOutput.OutputType type : realTypes) {
+			addTest(getTestFor(type));
 		}
 	}
 
@@ -81,21 +87,17 @@ class ConversionTest extends TestLauncher {
 				// Check conversion:
 				compareFiles(this, expectedDir, resultDir, type, null);
 
-				// Cross-checks:
-
 				// LATEX not supported as input
-				if (!BasicOutput.OutputType.LATEX.equals(type)) {
-					for (BasicOutput.OutputType crossType : BasicOutput.OutputType
-							.values()) {
-						// NOT for special mode SYSOUT
-						if (!BasicOutput.OutputType.SYSOUT.equals(crossType)) {
-							File crossDir = tempFiles
-									.createTempDir("cross-result");
-							generate(this, target, crossDir, crossType);
-							compareFiles(this, crossDir, resultDir, crossType,
-									crossType);
-						}
-					}
+				if (BasicOutput.OutputType.LATEX.equals(type)) {
+					return;
+				}
+
+				// Cross-checks:
+				for (BasicOutput.OutputType crossType : realTypes) {
+					File crossDir = tempFiles.createTempDir("cross-result");
+					generate(this, target, crossDir, crossType);
+					compareFiles(this, resultDir, crossDir, crossType,
+							crossType);
 				}
 			}
 		};