Merged logicui into master

[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 9913116..cb0494e 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -2,25 +2,24 @@ package era.mi.logic.tests;
 
 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 TestBitDisplay(WireArray in)
+       public TestBitDisplay(WireEnd in)
        {
                super(in);
        }
 
        public void assertDisplays(Bit... expected)
        {
-               assertArrayEquals(expected, getDisplayedValue());
+               assertArrayEquals(expected, getDisplayedValue().getBits());
        }
 
        public void assertAfterSimulationIs(Bit... expected)
@@ -32,10 +31,10 @@ public final class TestBitDisplay extends BitDisplay
        public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
        {
                while (Simulation.TIMELINE.hasNext())
-                       {
-                               Simulation.TIMELINE.executeNext();
-                               r.accept(Simulation.TIMELINE.getSimulationTime());
-                       }
+               {
+                       Simulation.TIMELINE.executeNext();
+                       r.accept(Simulation.TIMELINE.getSimulationTime());
+               }
                assertDisplays(expected);
        }
 
@@ -43,6 +42,6 @@ public final class TestBitDisplay extends BitDisplay
        protected void compute()
        {
                super.compute();
-               System.out.println("update: value is " + Arrays.toString(getDisplayedValue()));
+               System.out.println("update: value is " + getDisplayedValue());
        }
 }