diff --git a/src/test/java/de/neemann/digital/hdl/verilog2/VerilogSimulatorTest.java b/src/test/java/de/neemann/digital/hdl/verilog2/VerilogSimulatorTest.java index 85d77554a..682b43c3a 100644 --- a/src/test/java/de/neemann/digital/hdl/verilog2/VerilogSimulatorTest.java +++ b/src/test/java/de/neemann/digital/hdl/verilog2/VerilogSimulatorTest.java @@ -51,8 +51,8 @@ public class VerilogSimulatorTest extends TestCase { File examples = new File(Resources.getRoot(), "/dig/test/vhdl"); try { int tested = new FileScanner(this::checkVerilogExport).noOutput().scan(examples); - assertEquals(60, tested); - assertEquals(53, testBenches); + assertEquals(61, tested); + assertEquals(54, testBenches); } catch (FileScanner.SkipAllException e) { // if iverilog is not installed its also ok } diff --git a/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLSimulatorTest.java b/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLSimulatorTest.java index 91a9573b4..5f879bced 100644 --- a/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLSimulatorTest.java +++ b/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLSimulatorTest.java @@ -43,8 +43,8 @@ public class VHDLSimulatorTest extends TestCase { File examples = new File(Resources.getRoot(), "/dig/test/vhdl"); try { int tested = new FileScanner(this::checkVHDLExport).noOutput().scan(examples); - assertEquals(60, tested); - assertEquals(53, testBenches); + assertEquals(61, tested); + assertEquals(54, testBenches); } catch (FileScanner.SkipAllException e) { // if ghdl is not installed its also ok } diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 46b2455f4..050ed6be3 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -50,8 +50,8 @@ public class TestExamples extends TestCase { */ public void testTestExamples() throws Exception { File examples = new File(Resources.getRoot(), "/dig/test"); - assertEquals(199, new FileScanner(this::check).scan(examples)); - assertEquals(188, testCasesInFiles); + assertEquals(200, new FileScanner(this::check).scan(examples)); + assertEquals(189, testCasesInFiles); } /** diff --git a/src/test/resources/dig/test/vhdl/not.dig b/src/test/resources/dig/test/vhdl/not.dig new file mode 100644 index 000000000..0ba70dff1 --- /dev/null +++ b/src/test/resources/dig/test/vhdl/not.dig @@ -0,0 +1,281 @@ + + + 1 + + + + In + + + Label + A + + + + + + Not + + + + + In + + + Label + B + + + + + + Not + + + + + Not + + + + + In + + + Label + C + + + + + + Not + + + + + Not + + + + + Not + + + + + In + + + Label + D + + + + + + Not + + + + + Not + + + + + Not + + + + + Not + + + + + In + + + Label + E + + + + + + Not + + + + + Not + + + + + Not + + + + + Not + + + + + Not + + + + + Out + + + Label + Y + + + + + + Out + + + Label + X + + + + + + Out + + + Label + Z + + + + + + Out + + + Label + U + + + + + + Out + + + Label + V + + + + + + Testcase + + + Testdata + + A B C D E Y X Z U V + + 0 0 0 0 0 1 0 1 0 1 + 1 1 1 1 1 0 1 0 1 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file