TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-27 15:03:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

added tests to test if if works if nets in nested circuits are merged via a direct nested connection

Browse Source
This commit is contained in:
hneemann 2017-04-07 13:23:46 +02:00
parent f15f2bc788
commit 0e918722ff
3 changed files with 173 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/de/neemann/digital/integration/TestExamples.java
View File

@ -39,8 +39,8 @@ public class TestExamples extends TestCase {
*/
public void testTestExamples() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test");
assertEquals(49, new FileScanner(this::check).scan(examples));
assertEquals(42, testCasesInFiles);
assertEquals(51, new FileScanner(this::check).scan(examples));
assertEquals(44, testCasesInFiles);
}

100
src/test/resources/dig/test/transp/trans2.dig Normal file
View File

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<visualElements>
<visualElement>
<elementName>/home/hneemann/Dokumente/Java/digital/src/test/resources/dig/test/transp/trans.dig</elementName>
<elementAttributes/>
<pos x="460" y="240"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Y</string>
</entry>
</elementAttributes>
<pos x="640" y="260"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>A</string>
</entry>
</elementAttributes>
<pos x="420" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>B</string>
</entry>
</elementAttributes>
<pos x="420" y="280"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Testdata</string>
<testData>
<dataString>A B Y
0 0 0
0 1 1
1 0 1
1 1 0</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="460" y="340"/>
</visualElement>
<visualElement>
<elementName>XOr</elementName>
<elementAttributes/>
<pos x="560" y="240"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="520" y="240"/>
<p2 x="560" y="240"/>
</wire>
<wire>
<p1 x="420" y="240"/>
<p2 x="460" y="240"/>
</wire>
<wire>
<p1 x="520" y="260"/>
<p2 x="540" y="260"/>
</wire>
<wire>
<p1 x="620" y="260"/>
<p2 x="640" y="260"/>
</wire>
<wire>
<p1 x="440" y="260"/>
<p2 x="460" y="260"/>
</wire>
<wire>
<p1 x="540" y="280"/>
<p2 x="560" y="280"/>
</wire>
<wire>
<p1 x="420" y="280"/>
<p2 x="440" y="280"/>
</wire>
<wire>
<p1 x="440" y="260"/>
<p2 x="440" y="280"/>
</wire>
<wire>
<p1 x="540" y="260"/>
<p2 x="540" y="280"/>
</wire>
</wires>
</circuit>

71
src/test/resources/dig/test/transp/transtest2.dig Normal file
View File

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<visualElements>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Y</string>
</entry>
</elementAttributes>
<pos x="560" y="260"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>A</string>
</entry>
</elementAttributes>
<pos x="420" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>B</string>
</entry>
</elementAttributes>
<pos x="420" y="280"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Testdata</string>
<testData>
<dataString>A B Y
0 0 0
0 1 1
1 0 1
1 1 0</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="440" y="340"/>
</visualElement>
<visualElement>
<elementName>trans2.dig</elementName>
<elementAttributes/>
<pos x="460" y="240"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="420" y="240"/>
<p2 x="460" y="240"/>
</wire>
<wire>
<p1 x="520" y="260"/>
<p2 x="560" y="260"/>
</wire>
<wire>
<p1 x="420" y="280"/>
<p2 x="460" y="280"/>
</wire>
</wires>
</circuit>