X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FComponentTest.java;h=464db587c472595ce90d2e3c107cfc5cd6917c9c;hb=4db274c53e53cda8321067eca57d524f188c2e6f;hp=29bc9717ecbe4db4e73c13750db63597d6e6a067;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;p=Mograsim.git diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java index 29bc9717..464db587 100644 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java +++ b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java @@ -4,16 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import java.util.function.LongConsumer; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import net.mograsim.logic.core.components.Connector; import net.mograsim.logic.core.components.Demux; -import net.mograsim.logic.core.components.Merger; import net.mograsim.logic.core.components.Mux; -import net.mograsim.logic.core.components.Splitter; import net.mograsim.logic.core.components.TriStateBuffer; +import net.mograsim.logic.core.components.UnidirectionalMerger; +import net.mograsim.logic.core.components.UnidirectionalSplitter; import net.mograsim.logic.core.components.gates.AndGate; import net.mograsim.logic.core.components.gates.NandGate; import net.mograsim.logic.core.components.gates.NorGate; @@ -32,6 +31,12 @@ class ComponentTest { private Timeline t = new Timeline(11); + @BeforeEach + void resetTimeline() + { + t.reset(); + } + @Test void circuitExampleTest() { @@ -40,9 +45,9 @@ class ComponentTest k = new Wire(t, 1, 1); new AndGate(t, 1, f.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); new NotGate(t, 1, f.createReadOnlyEnd(), g.createReadWriteEnd()); - new Merger(t, h.createReadWriteEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd()); + new UnidirectionalMerger(t, h.createReadWriteEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd()); new Mux(t, 1, i.createReadWriteEnd(), e.createReadOnlyEnd(), h.createReadOnlyEnd(), d.createReadOnlyEnd()); - new Splitter(t, i.createReadOnlyEnd(), k.createReadWriteEnd(), j.createReadWriteEnd()); + new UnidirectionalSplitter(t, i.createReadOnlyEnd(), k.createReadWriteEnd(), j.createReadWriteEnd()); a.createReadWriteEnd().feedSignals(Bit.ZERO); b.createReadWriteEnd().feedSignals(Bit.ONE); @@ -59,10 +64,9 @@ class ComponentTest @Test void splitterTest() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 2, 1), c = new Wire(t, 3, 1), in = new Wire(t, 8, 1); in.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - new Splitter(t, in.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), c.createReadWriteEnd()); + new UnidirectionalSplitter(t, in.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), c.createReadWriteEnd()); t.executeAll(); @@ -74,13 +78,12 @@ class ComponentTest @Test void mergerTest() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 2, 1), c = new Wire(t, 3, 1), out = new Wire(t, 8, 1); a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO); b.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO); c.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - new Merger(t, out.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); + new UnidirectionalMerger(t, out.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); t.executeAll(); @@ -90,11 +93,10 @@ class ComponentTest @Test void fusionTest1() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 2, 1), c = new Wire(t, 3, 1), out = new Wire(t, 8, 1); - Wire.fuse(a, out, 0, 0, a.length); - Wire.fuse(b, out, 0, a.length, b.length); - Wire.fuse(c, out, 0, a.length + b.length, c.length); + Wire.fuse(a, out, 0, 0, a.width); + Wire.fuse(b, out, 0, a.width, b.width); + Wire.fuse(c, out, 0, a.width + b.width, c.width); ReadWriteEnd rA = a.createReadWriteEnd(); rA.feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO); ReadWriteEnd rB = b.createReadWriteEnd(); @@ -121,7 +123,6 @@ class ComponentTest @Test void fusionTest2() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1); Wire.fuse(a, b); ReadWriteEnd rw = a.createReadWriteEnd(); @@ -136,7 +137,6 @@ class ComponentTest @Test void fusionTest3() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1); a.createReadWriteEnd().feedSignals(Bit.Z, Bit.U, Bit.X); t.executeAll(); @@ -145,6 +145,18 @@ class ComponentTest assertBitArrayEquals(b.getValues(), Bit.Z, Bit.U, Bit.X); } + @Test + void fusionTest4() + { + Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1); + a.createReadWriteEnd(); + t.executeAll(); + + Wire.fuse(a, b); + t.executeAll(); + assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U); + } + // @Test // void connectorTest() // { @@ -193,7 +205,6 @@ class ComponentTest @Test void muxTest() { - t.reset(); Wire a = new Wire(t, 4, 3), b = new Wire(t, 4, 6), c = new Wire(t, 4, 4), select = new Wire(t, 2, 5), out = new Wire(t, 4, 1); ReadWriteEnd selectIn = select.createReadWriteEnd(); @@ -221,7 +232,6 @@ class ComponentTest @Test void demuxTest() { - t.reset(); Wire a = new Wire(t, 4, 3), b = new Wire(t, 4, 6), c = new Wire(t, 4, 4), select = new Wire(t, 2, 5), in = new Wire(t, 4, 1); ReadWriteEnd selectIn = select.createReadWriteEnd(); @@ -254,7 +264,6 @@ class ComponentTest @Test void andTest() { - t.reset(); Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1); new AndGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); @@ -268,7 +277,6 @@ class ComponentTest @Test void orTest() { - t.reset(); Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1); new OrGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); @@ -282,7 +290,6 @@ class ComponentTest @Test void nandTest() { - t.reset(); Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1), d = new Wire(t, 4, 1); new NandGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); @@ -297,7 +304,6 @@ class ComponentTest @Test void norTest() { - t.reset(); Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1), d = new Wire(t, 4, 1); new NorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); @@ -312,7 +318,6 @@ class ComponentTest @Test void xorTest() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 2), c = new Wire(t, 3, 1), d = new Wire(t, 3, 1); new XorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); @@ -327,7 +332,6 @@ class ComponentTest @Test void notTest() { - t.reset(); Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 2); new NotGate(t, 1, a.createReadOnlyEnd(), b.createReadWriteEnd()); a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); @@ -340,7 +344,6 @@ class ComponentTest @Test void rsLatchCircuitTest() { - t.reset(); Wire r = new Wire(t, 1, 1), s = new Wire(t, 1, 1), t1 = new Wire(t, 1, 15), t2 = new Wire(t, 1, 1), q = new Wire(t, 1, 1), nq = new Wire(t, 1, 1); @@ -376,8 +379,6 @@ class ComponentTest @Test void numericValueTest() { - t.reset(); - Wire a = new Wire(t, 4, 1); a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE); @@ -423,10 +424,11 @@ class ComponentTest fail("Not all events were executed in order!"); } + // TODO: Adapt this test, now that update notifications are issued whenever any input to a wire changes + @Disabled("Out of date") @Test void multipleInputs() { - t.reset(); Wire w = new Wire(t, 2, 1); ReadWriteEnd wI1 = w.createReadWriteEnd(), wI2 = w.createReadWriteEnd(); wI1.feedSignals(Bit.ONE, Bit.Z); @@ -454,80 +456,6 @@ class ComponentTest assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z); } - @Test - void wireConnections() - { - // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde - - t.reset(); - - Wire a = new Wire(t, 1, 2); - Wire b = new Wire(t, 1, 2); - Wire c = new Wire(t, 1, 2); - ReadWriteEnd aI = a.createReadWriteEnd(); - ReadWriteEnd bI = b.createReadWriteEnd(); - ReadWriteEnd cI = c.createReadWriteEnd(); - - TestBitDisplay test = new TestBitDisplay(t, c.createReadOnlyEnd()); - TestBitDisplay test2 = new TestBitDisplay(t, a.createReadOnlyEnd()); - LongConsumer print = time -> System.out.format("Time %2d\n a: %s\n b: %s\n c: %s\n", time, a, b, c); - - cI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - - cI.feedSignals(Bit.X); - test.assertAfterSimulationIs(print, Bit.X); - - cI.feedSignals(Bit.X); - cI.feedSignals(Bit.Z); - test.assertAfterSimulationIs(print, Bit.Z); - - new Connector(t, b.createReadWriteEnd(), c.createReadWriteEnd()).connect(); - test.assertAfterSimulationIs(print, Bit.Z); - System.err.println("ONE"); - bI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - System.err.println("ZERO"); - bI.feedSignals(Bit.ZERO); - test.assertAfterSimulationIs(print, Bit.ZERO); - System.err.println("Z"); - bI.feedSignals(Bit.Z); - test.assertAfterSimulationIs(print, Bit.Z); - - new Connector(t, a.createReadWriteEnd(), b.createReadWriteEnd()).connect(); - System.err.println("Z 2"); - aI.feedSignals(Bit.Z); - test.assertAfterSimulationIs(print, Bit.Z); - test2.assertAfterSimulationIs(Bit.Z); - System.err.println("ONE 2"); - aI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - test2.assertAfterSimulationIs(Bit.ONE); - System.err.println("ZERO 2"); - aI.feedSignals(Bit.ZERO); - test.assertAfterSimulationIs(print, Bit.ZERO); - test2.assertAfterSimulationIs(Bit.ZERO); - System.err.println("Z 2 II"); - aI.feedSignals(Bit.Z); - test.assertAfterSimulationIs(print, Bit.Z); - test2.assertAfterSimulationIs(Bit.Z); - - System.err.println("No Conflict yet"); - bI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - test2.assertAfterSimulationIs(Bit.ONE); - aI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - test2.assertAfterSimulationIs(Bit.ONE); - System.err.println("Conflict"); - aI.feedSignals(Bit.ZERO); - test.assertAfterSimulationIs(print, Bit.X); - test2.assertAfterSimulationIs(Bit.X); - aI.feedSignals(Bit.ONE); - test.assertAfterSimulationIs(print, Bit.ONE); - test2.assertAfterSimulationIs(Bit.ONE); - } - private static void assertBitArrayEquals(BitVector actual, Bit... expected) { assertArrayEquals(expected, actual.getBits());