Timeline now passed via constructor

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

diff --git a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
index a448eb0..28dc1cc 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -2,40 +2,46 @@ package era.mi.logic.tests;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-import java.util.Arrays;
 import java.util.function.LongConsumer;
 
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
 import era.mi.logic.components.BitDisplay;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire.ReadEnd;
 
-public final class TestBitDisplay extends BitDisplay {
+public final class TestBitDisplay extends BitDisplay
+{
 
-       public TestBitDisplay(WireArray in) {
-               super(in);
+       public TestBitDisplay(Timeline timeline, ReadEnd in)
+       {
+               super(timeline, in);
        }
 
-       public void assertDisplays(Bit... expected) {
-               assertArrayEquals(expected, getDisplayedValue());
+       public void assertDisplays(Bit... expected)
+       {
+               assertArrayEquals(expected, getDisplayedValue().getBits());
        }
 
-       public void assertAfterSimulationIs(Bit... expected) {
-               Simulation.TIMELINE.executeAll();
+       public void assertAfterSimulationIs(Bit... expected)
+       {
+               timeline.executeAll();
                assertDisplays(expected);
        }
 
-       public void assertAfterSimulationIs(LongConsumer r, Bit... expected) {
-               while (Simulation.TIMELINE.hasNext()) {
-                       Simulation.TIMELINE.executeNext();
-                       r.accept(Simulation.TIMELINE.getSimulationTime());
+       public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
+       {
+               while (timeline.hasNext())
+               {
+                       timeline.executeNext();
+                       r.accept(timeline.getSimulationTime());
                }
                assertDisplays(expected);
        }
 
        @Override
-       protected void compute() {
+       protected void compute()
+       {
                super.compute();
-               System.out.println("update: value is " + Arrays.toString(getDisplayedValue()));
+               System.out.println("update: value is " + getDisplayedValue());
        }
 }