X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FTestBitDisplay.java;h=a07125d7839a66a029589daffb55930998ca0c06;hb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;hp=a448eb072288bfa75acf8bc5b3a3ae7f3ea55525;hpb=74aebd92f41d03f4a44c9a455ef8c05465136412;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 a448eb07..a07125d7 100644 --- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java +++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java @@ -5,28 +5,34 @@ 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.types.Bit; +import era.mi.logic.wires.Wire.WireEnd; -public final class TestBitDisplay extends BitDisplay { +public final class TestBitDisplay extends BitDisplay +{ - public TestBitDisplay(WireArray in) { + public TestBitDisplay(WireEnd in) + { super(in); } - public void assertDisplays(Bit... expected) { + public void assertDisplays(Bit... expected) + { assertArrayEquals(expected, getDisplayedValue()); } - public void assertAfterSimulationIs(Bit... expected) { + public void assertAfterSimulationIs(Bit... expected) + { Simulation.TIMELINE.executeAll(); assertDisplays(expected); } - public void assertAfterSimulationIs(LongConsumer r, Bit... expected) { - while (Simulation.TIMELINE.hasNext()) { + public void assertAfterSimulationIs(LongConsumer r, Bit... expected) + { + while (Simulation.TIMELINE.hasNext()) + { Simulation.TIMELINE.executeNext(); r.accept(Simulation.TIMELINE.getSimulationTime()); } @@ -34,7 +40,8 @@ public final class TestBitDisplay extends BitDisplay { } @Override - protected void compute() { + protected void compute() + { super.compute(); System.out.println("update: value is " + Arrays.toString(getDisplayedValue())); }