added demux; added getAllInputs() and getAllOutputs() for all components

[Mograsim.git] / era.mi / src / era / mi / logic / tests / ComponentTest.java

diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/era/mi/logic/tests/ComponentTest.java
index a407b8d..3ee5576 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test;
 
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
+import era.mi.logic.components.Demux;
 import era.mi.logic.components.Merger;
 import era.mi.logic.components.Mux;
 import era.mi.logic.components.Splitter;
@@ -56,9 +57,9 @@ class ComponentTest
 
        Simulation.TIMELINE.executeAll();
 
-       assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }, a.getValues());
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO }, b.getValues());
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }, c.getValues());
+       assertBitArrayEquals(a.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO);
+       assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO);
+       assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE);
     }
 
     @Test
@@ -126,19 +127,52 @@ class ComponentTest
        new Mux(1, out, select, a, b, c);
        Simulation.TIMELINE.executeAll();
 
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues());
+       assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
        selectIn.feedSignals(Bit.ZERO, Bit.ONE);
        Simulation.TIMELINE.executeAll();
 
-       assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues());
+       assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
        selectIn.feedSignals(Bit.ONE, Bit.ONE);
        Simulation.TIMELINE.executeAll();
 
-       assertArrayEquals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues());
+       assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
     }
 
+    @Test
+    void demuxTest()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
+               select = new WireArray(2, 5), in = new WireArray(4, 1);
+       WireArrayInput selectIn = select.createInput();
+
+       selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+       in.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+
+       new Demux(1, in, select, a, b, c);
+       Simulation.TIMELINE.executeAll();
+
+       assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+       Simulation.TIMELINE.executeAll();
+
+       assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+
+       selectIn.feedSignals(Bit.ONE, Bit.ONE);
+       Simulation.TIMELINE.executeAll();
+
+       assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+
+    }
+    
     @Test
     void andTest()
     {
@@ -148,7 +182,7 @@ class ComponentTest
        gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
        Simulation.TIMELINE.executeAll();
-       assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }, gate.getOut().getValues());
+       assertBitArrayEquals(gate.getOut().getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO);
     }
 
     @Test
@@ -161,7 +195,7 @@ class ComponentTest
 
        Simulation.TIMELINE.executeAll();
 
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }, gate.getOut().getValues());
+       assertBitArrayEquals(gate.getOut().getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE);
     }
 
     @Test
@@ -223,20 +257,20 @@ class ComponentTest
        wI1.feedSignals(Bit.ONE, Bit.Z);
        wI2.feedSignals(Bit.Z, Bit.X);
        Simulation.TIMELINE.executeAll();
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.X }, w.getValues());
+       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X);
 
        wI2.feedSignals(Bit.ZERO, Bit.Z);
        Simulation.TIMELINE.executeAll();
-       assertArrayEquals(new Bit[] { Bit.X, Bit.Z }, w.getValues());
+       assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z);
 
        wI2.feedSignals(Bit.Z, Bit.Z);
        Simulation.TIMELINE.executeAll();
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
+       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
 
        wI2.feedSignals(Bit.ONE, Bit.Z);
-       w.addObserver((i) -> fail("WireArray notified observer, although value did not change."));
+       w.addObserver((i, oldValues) -> fail("WireArray notified observer, although value did not change."));
        Simulation.TIMELINE.executeAll();
-       assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
+       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
     }
 
        @Test
@@ -315,6 +349,6 @@ class ComponentTest
 
     private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
     {
-       assertArrayEquals(expected, actual);
+       assertArrayEquals(expected, actual);
     }
 }