Exchanged all Bit[] by BitVector, tests work

[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 d7c715d..d821752 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -2,31 +2,36 @@ package era.mi.logic.tests;
 \r
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;\r
 \r
-import java.util.Arrays;\r
 import java.util.function.LongConsumer;\r
 \r
-import era.mi.logic.Bit;\r
 import era.mi.logic.Simulation;\r
 import era.mi.logic.components.BitDisplay;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.types.Bit;\r
+import era.mi.logic.wires.Wire.WireEnd;\r
 \r
-public final class TestBitDisplay extends BitDisplay {\r
+public final class TestBitDisplay extends BitDisplay\r
+{\r
 \r
-       public TestBitDisplay(WireArray in) {\r
+       public TestBitDisplay(WireEnd in)\r
+       {\r
                super(in);\r
        }\r
 \r
-       public void assertDisplays(Bit... expected) {\r
-               assertArrayEquals(expected, getDisplayedValue());\r
+       public void assertDisplays(Bit... expected)\r
+       {\r
+               assertArrayEquals(expected, getDisplayedValue().getBits());\r
        }\r
 \r
-       public void assertAfterSimulationIs(Bit... expected) {\r
+       public void assertAfterSimulationIs(Bit... expected)\r
+       {\r
                Simulation.TIMELINE.executeAll();\r
                assertDisplays(expected);\r
        }\r
 \r
-       public void assertAfterSimulationIs(LongConsumer r, Bit... expected) {\r
-               while (Simulation.TIMELINE.hasNext()) {\r
+       public void assertAfterSimulationIs(LongConsumer r, Bit... expected)\r
+       {\r
+               while (Simulation.TIMELINE.hasNext())\r
+               {\r
                        Simulation.TIMELINE.executeNext();\r
                        r.accept(Simulation.TIMELINE.getSimulationTime());\r
                }\r
@@ -34,8 +39,9 @@ public final class TestBitDisplay extends BitDisplay {
        }\r
 \r
        @Override\r
-       protected void compute() {\r
+       protected void compute()\r
+       {\r
                super.compute();\r
-               System.out.println("update: value is " + Arrays.toString(getDisplayedValue()));\r
+               System.out.println("update: value is " + getDisplayedValue());\r
        }\r
 }\r