diff --git a/src/test/java/de/neemann/digital/integration/FileScanner.java b/src/test/java/de/neemann/digital/integration/FileScanner.java index 58376dfcf..1ab7bd220 100644 --- a/src/test/java/de/neemann/digital/integration/FileScanner.java +++ b/src/test/java/de/neemann/digital/integration/FileScanner.java @@ -19,11 +19,11 @@ public class FileScanner { public int scan(File path) throws Exception { errors = new ArrayList<>(); int count = scanIntern(path); - System.out.println("tested "+count+" examples"); + System.out.println("tested " + count + " examples"); if (errors.isEmpty()) return count; - System.err.println("errors:"); + System.err.println("errors: " + errors.size()); for (Error e : errors) { System.err.println("----> error in: " + e.f); e.e.printStackTrace(); diff --git a/src/test/java/de/neemann/digital/integration/Test74xx.java b/src/test/java/de/neemann/digital/integration/Test74xx.java index a36dcb74c..3c136e50d 100644 --- a/src/test/java/de/neemann/digital/integration/Test74xx.java +++ b/src/test/java/de/neemann/digital/integration/Test74xx.java @@ -30,7 +30,6 @@ public class Test74xx extends TestCase { } private void check(File dig) throws PinException, NodeException, ElementNotFoundException, IOException { - System.out.println(dig); Circuit circuit = new ToBreakRunner(dig).getCircuit(); assertTrue("is not DIL", circuit.getAttributes().get(Keys.IS_DIL)); assertTrue("is not locked", circuit.getAttributes().get(Keys.LOCKED_MODE)); diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index d67b726c9..951332855 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -50,52 +50,41 @@ public class TestExamples extends TestCase { * @param dig the model file */ private void check(File dig) throws Exception { - boolean hasTest = false; + boolean shouldFail = dig.getName().endsWith("Error.dig"); + ToBreakRunner br = null; try { - boolean shouldFail = dig.getName().endsWith("Error.dig"); - ToBreakRunner br = null; - try { - br = new ToBreakRunner(dig); - } catch (Exception e) { - if (shouldFail) { - hasTest = true; - return; - } else - throw e; - } - - try { - for (VisualElement el : br.getCircuit().getElements()) - if (el.equalsDescription(TestCaseElement.TESTCASEDESCRIPTION)) { - hasTest = true; - - String label = el.getElementAttributes().getCleanLabel(); - TestData td = el.getElementAttributes().get(TestCaseElement.TESTDATA); - - Model model = new ModelCreator(br.getCircuit(), br.getLibrary()).createModel(false); - TestResult tr = new TestResult(td).create(model); - - if (label.contains("Failing")) - assertFalse(dig.getName() + ":" + label, tr.allPassed()); - else - assertTrue(dig.getName() + ":" + label, tr.allPassed()); - - testCasesInFiles++; - } - } catch (Exception e) { - if (shouldFail) { - hasTest = true; - return; - } else - throw e; - } - - assertFalse("File should fail but doesn't!", shouldFail); - - } finally { - System.out.print("tested " + dig); - if (!hasTest) System.out.println(" -- no test cases"); - else System.out.println(); + br = new ToBreakRunner(dig); + } catch (Exception e) { + if (shouldFail) { + return; + } else + throw e; } + + try { + for (VisualElement el : br.getCircuit().getElements()) + if (el.equalsDescription(TestCaseElement.TESTCASEDESCRIPTION)) { + + String label = el.getElementAttributes().getCleanLabel(); + TestData td = el.getElementAttributes().get(TestCaseElement.TESTDATA); + + Model model = new ModelCreator(br.getCircuit(), br.getLibrary()).createModel(false); + TestResult tr = new TestResult(td).create(model); + + if (label.contains("Failing")) + assertFalse(dig.getName() + ":" + label, tr.allPassed()); + else + assertTrue(dig.getName() + ":" + label, tr.allPassed()); + + testCasesInFiles++; + } + } catch (Exception e) { + if (shouldFail) { + return; + } else + throw e; + } + + assertFalse("File should fail but doesn't!", shouldFail); } }