X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FTestBitDisplay.java;h=28dc1cc1bd65feea62e20b2236ca04f0adf2f1be;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=cb0494e1c8b7434017c372b44e3852df1eb38832;hpb=fb169b120e97337093a8707c62bbc4bb06098a9c;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 cb0494e1..28dc1cc1 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.WireEnd; +import era.mi.logic.wires.Wire.ReadEnd; public final class TestBitDisplay extends BitDisplay { - public TestBitDisplay(WireEnd 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); }