Integrated new types, tests still work, not used yet
[Mograsim.git] / era.mi / src / era / mi / logic / tests / TestBitDisplay.java
index a448eb0..a07125d 100644 (file)
@@ -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()));
        }