From 035a86218bf606dce8c7104dfb692d88ed2f5469 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 25 Mar 2018 17:11:39 +0200 Subject: [PATCH] fixed duplicate names --- .../digital/hdl/vhdl/TestInSimulator.java | 2 +- .../digital/hdl/vhdl2/VHDLGeneratorTest.java | 2 +- src/test/resources/dig/hdl/model2/naming.dig | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/neemann/digital/hdl/vhdl/TestInSimulator.java b/src/test/java/de/neemann/digital/hdl/vhdl/TestInSimulator.java index 8bb6e6c01..5e5a8d621 100644 --- a/src/test/java/de/neemann/digital/hdl/vhdl/TestInSimulator.java +++ b/src/test/java/de/neemann/digital/hdl/vhdl/TestInSimulator.java @@ -57,7 +57,7 @@ public class TestInSimulator extends TestCase { File examples = new File(Resources.getRoot(), "/dig/hdl"); try { int tested = new FileScanner(this::checkVHDLExport).noOutput().scan(examples); - assertEquals(36, tested); + assertEquals(37, tested); } catch (FileScanner.SkipAllException e) { // if ghdl is not installed its also ok } diff --git a/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLGeneratorTest.java b/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLGeneratorTest.java index 0ddd596c5..9ce911dee 100644 --- a/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLGeneratorTest.java +++ b/src/test/java/de/neemann/digital/hdl/vhdl2/VHDLGeneratorTest.java @@ -59,7 +59,7 @@ public class VHDLGeneratorTest extends TestCase { File examples = new File(Resources.getRoot(), "/dig/hdl"); try { int tested = new FileScanner(this::checkVHDLExport).noOutput().scan(examples); - assertEquals(36, tested); + assertEquals(37, tested); } catch (FileScanner.SkipAllException e) { // if ghdl is not installed its also ok } diff --git a/src/test/resources/dig/hdl/model2/naming.dig b/src/test/resources/dig/hdl/model2/naming.dig index be82807b0..5657c36f5 100644 --- a/src/test/resources/dig/hdl/model2/naming.dig +++ b/src/test/resources/dig/hdl/model2/naming.dig @@ -66,6 +66,23 @@ + + Testcase + + + Testdata + + S0 S1 S2 S3 +0 0 1 1 +0 1 0 1 +1 0 1 0 +1 1 1 1 + + + + + +