projects / Mograsim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed Connector and added some useful methods to WireArray and Util
[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 a18228b..a407b8d 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -3,6 +3,7 @@ package era.mi.logic.tests;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
+import java.util.function.LongConsumer;
 
 import org.junit.jupiter.api.Test;
 
@@ -20,7 +21,7 @@ import era.mi.logic.wires.WireArray.WireArrayInput;
 
 class ComponentTest
 {
-
+    
        @Test
        void circuitExampleTest()
        {
@@ -39,10 +40,7 @@ class ComponentTest
                d.createInput().feedSignals(Bit.ONE, Bit.ONE);
                e.createInput().feedSignals(Bit.ZERO);
                
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
+               Simulation.TIMELINE.executeAll();
                
                assertEquals(Bit.ONE, j.getValue());
                assertEquals(Bit.ZERO, k.getValue());
@@ -56,14 +54,11 @@ class ComponentTest
        in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
        new Splitter(in, a, b, c);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertTrue(Arrays.equals(a.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }));
-       assertTrue(Arrays.equals(b.getValues(), new Bit[] { Bit.ONE, Bit.ZERO }));
-       assertTrue(Arrays.equals(c.getValues(), new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }));
+       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());
     }
 
     @Test
@@ -77,10 +72,7 @@ class ComponentTest
 
        new Merger(out, a, b, c);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
        assertTrue(Arrays.equals(out.getValues(),
                new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
@@ -99,19 +91,13 @@ class ComponentTest
        enI.feedSignals(Bit.ONE);
        aI.feedSignals(Bit.ONE);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
        assertEquals(Bit.ONE, b.getValue());
 
        bI.feedSignals(Bit.ZERO);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
        assertEquals(Bit.X, b.getValue());
        assertEquals(Bit.ONE, a.getValue());
@@ -119,10 +105,7 @@ class ComponentTest
        aI.clearSignals();
        enI.feedSignals(Bit.ZERO);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
        assertEquals(Bit.ZERO, a.getValue());
 
@@ -141,27 +124,18 @@ class ComponentTest
        c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
        new Mux(1, out, select, a, b, c);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertTrue(Arrays.equals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues()));
+       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues());
        selectIn.feedSignals(Bit.ZERO, Bit.ONE);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertTrue(Arrays.equals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues()));
+       assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues());
 
        selectIn.feedSignals(Bit.ONE, Bit.ONE);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertTrue(Arrays.equals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues()));
+       assertArrayEquals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues());
 
     }
 
@@ -173,11 +147,8 @@ class ComponentTest
        gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
        gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-       assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }));
+       Simulation.TIMELINE.executeAll();
+       assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }, gate.getOut().getValues());
     }
 
     @Test
@@ -188,12 +159,9 @@ class ComponentTest
        gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
        gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }));
+       assertArrayEquals(new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }, gate.getOut().getValues());
     }
 
     @Test
@@ -213,33 +181,23 @@ class ComponentTest
        sIn.feedSignals(Bit.ONE);
        rIn.feedSignals(Bit.ZERO);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertEquals(q.getValue(), Bit.ONE);
-       assertEquals(nq.getValue(), Bit.ZERO);
+       assertEquals(Bit.ONE, q.getValue());
+       assertEquals(Bit.ZERO, nq.getValue());
 
        sIn.feedSignals(Bit.ZERO);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-
-       assertEquals(q.getValue(), Bit.ONE);
-       assertEquals(nq.getValue(), Bit.ZERO);
+       Simulation.TIMELINE.executeAll();
+       assertEquals(Bit.ONE, q.getValue());
+       assertEquals(Bit.ZERO, nq.getValue());
 
        rIn.feedSignals(Bit.ONE);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertEquals(q.getValue(), Bit.ZERO);
-       assertEquals(nq.getValue(), Bit.ONE);
+       assertEquals(Bit.ZERO, q.getValue());
+       assertEquals(Bit.ONE, nq.getValue());
     }
 
     @Test
@@ -250,13 +208,10 @@ class ComponentTest
        WireArray a = new WireArray(4, 1);
        a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
 
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
+       Simulation.TIMELINE.executeAll();
 
-       assertEquals(a.getUnsignedValue(), 15);
-       assertEquals(a.getSignedValue(), -1);
+       assertEquals(15, a.getUnsignedValue());
+       assertEquals(-1, a.getSignedValue());
     }
 
     @Test
@@ -267,74 +222,96 @@ class ComponentTest
        WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();
        wI1.feedSignals(Bit.ONE, Bit.Z);
        wI2.feedSignals(Bit.Z, Bit.X);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.X }));
+       Simulation.TIMELINE.executeAll();
+       assertArrayEquals(new Bit[] { Bit.ONE, Bit.X }, w.getValues());
 
        wI2.feedSignals(Bit.ZERO, Bit.Z);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.X, Bit.Z }));
+       Simulation.TIMELINE.executeAll();
+       assertArrayEquals(new Bit[] { Bit.X, Bit.Z }, w.getValues());
 
        wI2.feedSignals(Bit.Z, Bit.Z);
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
+       Simulation.TIMELINE.executeAll();
+       assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
 
        wI2.feedSignals(Bit.ONE, Bit.Z);
        w.addObserver((i) -> fail("WireArray notified observer, although value did not change."));
-       while (Simulation.TIMELINE.hasNext())
-       {
-           Simulation.TIMELINE.executeNext();
-       }
-       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
+       Simulation.TIMELINE.executeAll();
+       assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
     }
 
-//     @Test
-//     void wireConnections()
-//     {
-//             // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
-//             
-//             Simulation.TIMELINE.reset();
-//
-//             WireArray a = new WireArray(1, 2);
-//             WireArray b = new WireArray(1, 2);
-//             WireArray c = new WireArray(1, 2);
-//             WireArrayInput aI = a.createInput();
-//             WireArrayInput bI = b.createInput();
-//             WireArrayInput cI = c.createInput();
-//
-//             TestBitDisplay test = new TestBitDisplay(c);
-//             LongConsumer print = time -> System.out.format("Time %2d\n   %s\n   %s\n   %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);
-//
-//             Connector c1 = new Connector(b, c);
-//             test.assertAfterSimulationIs(print, Bit.Z);
-//             System.out.println("ONE");
-//             bI.feedSignals(Bit.ONE);
-//             test.assertAfterSimulationIs(print, Bit.ONE);
-//             System.out.println("ZERO");
-//             bI.feedSignals(Bit.ZERO);
-//             test.assertAfterSimulationIs(print, Bit.ZERO);
-//             System.out.println("Z");
-//             bI.feedSignals(Bit.Z);
-//             test.assertAfterSimulationIs(Bit.Z);
-//     }
+       @Test
+       void wireConnections()
+       {
+               // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
+               
+               Simulation.TIMELINE.reset();
+
+               WireArray a = new WireArray(1, 2);
+               WireArray b = new WireArray(1, 2);
+               WireArray c = new WireArray(1, 2);
+               WireArrayInput aI = a.createInput();
+               WireArrayInput bI = b.createInput();
+               WireArrayInput cI = c.createInput();
+
+               TestBitDisplay test = new TestBitDisplay(c);
+               TestBitDisplay test2 = new TestBitDisplay(a);
+               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);
+
+               Connector c1 = new Connector(b, c);
+               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);
+               
+               Connector c2 = new Connector(a, b);
+               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(Bit[] actual, Bit... expected)
     {
Mirror of https://github.com/Mograsim-Team/Mograsim