X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FTestBitDisplay.java;h=17a416cae9ccc239008065db829cf5abdbfbbd9e;hb=dba76a37f244d6b216c23f47bd020a87ea1ce328;hp=b9de0cc246224753fe846d5c4bdc8f77b3f5b992;hpb=055d61dd8838c5926e78c9931cd4dcf16f761941;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java index b9de0cc2..17a416ca 100644 --- 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; import java.util.function.LongConsumer; -import era.mi.logic.Simulation; import era.mi.logic.components.BitDisplay; +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 TestBitDisplay(ReadEnd in) + public TestBitDisplay(Timeline timeline, ReadEnd in) { - super(in); + super(timeline, in); } public void assertDisplays(Bit... expected) @@ -24,16 +24,16 @@ public final class TestBitDisplay extends BitDisplay public void assertAfterSimulationIs(Bit... expected) { - Simulation.TIMELINE.executeAll(); + timeline.executeAll(); assertDisplays(expected); } public void assertAfterSimulationIs(LongConsumer r, Bit... expected) { - while (Simulation.TIMELINE.hasNext()) + while (timeline.hasNext()) { - Simulation.TIMELINE.executeNext(); - r.accept(Simulation.TIMELINE.getSimulationTime()); + timeline.executeNext(); + r.accept(timeline.getSimulationTime()); } assertDisplays(expected); }