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 b9de0cc..17a416c 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -4,17 +4,17 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 \r
 import java.util.function.LongConsumer;\r
 \r
-import era.mi.logic.Simulation;\r
 import era.mi.logic.components.BitDisplay;\r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.types.Bit;\r
 import era.mi.logic.wires.Wire.ReadEnd;\r
 \r
 public final class TestBitDisplay extends BitDisplay\r
 {\r
 \r
-       public TestBitDisplay(ReadEnd in)\r
+       public TestBitDisplay(Timeline timeline, ReadEnd in)\r
        {\r
-               super(in);\r
+               super(timeline, in);\r
        }\r
 \r
        public void assertDisplays(Bit... expected)\r
@@ -24,16 +24,16 @@ public final class TestBitDisplay extends BitDisplay
 \r
        public void assertAfterSimulationIs(Bit... expected)\r
        {\r
-               Simulation.TIMELINE.executeAll();\r
+               timeline.executeAll();\r
                assertDisplays(expected);\r
        }\r
 \r
        public void assertAfterSimulationIs(LongConsumer r, Bit... expected)\r
        {\r
-               while (Simulation.TIMELINE.hasNext())\r
+               while (timeline.hasNext())\r
                {\r
-                       Simulation.TIMELINE.executeNext();\r
-                       r.accept(Simulation.TIMELINE.getSimulationTime());\r
+                       timeline.executeNext();\r
+                       r.accept(timeline.getSimulationTime());\r
                }\r
                assertDisplays(expected);\r
        }\r