Exchanged all Bit[] by BitVector, tests work

[Mograsim.git] / era.mi / src / era / mi / logic / tests / ComponentTest.java

diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/era/mi/logic/tests/ComponentTest.java
index d2ecdbc..d25de9e 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -1,16 +1,11 @@
 package era.mi.logic.tests;\r
 \r
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;\r
-import static org.junit.jupiter.api.Assertions.assertEquals;\r
-import static org.junit.jupiter.api.Assertions.assertTrue;\r
-import static org.junit.jupiter.api.Assertions.fail;\r
+import static org.junit.jupiter.api.Assertions.*;\r
 \r
-import java.util.Arrays;\r
 import java.util.function.LongConsumer;\r
 \r
 import org.junit.jupiter.api.Test;\r
 \r
-import era.mi.logic.Bit;\r
 import era.mi.logic.Simulation;\r
 import era.mi.logic.components.Connector;\r
 import era.mi.logic.components.Demux;\r
@@ -22,6 +17,8 @@ import era.mi.logic.components.gates.AndGate;
 import era.mi.logic.components.gates.NotGate;\r
 import era.mi.logic.components.gates.OrGate;\r
 import era.mi.logic.components.gates.XorGate;\r
+import era.mi.logic.types.Bit;\r
+import era.mi.logic.types.BitVector;\r
 import era.mi.logic.wires.Wire;\r
 import era.mi.logic.wires.Wire.WireEnd;\r
 \r
@@ -81,8 +78,7 @@ class ComponentTest
 \r
                Simulation.TIMELINE.executeAll();\r
 \r
-               assertTrue(\r
-                               Arrays.equals(out.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));\r
+               assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
        }\r
 \r
        @Test\r
@@ -381,8 +377,8 @@ class ComponentTest
                test2.assertAfterSimulationIs(Bit.ONE);\r
        }\r
 \r
-       private static void assertBitArrayEquals(Bit[] actual, Bit... expected)\r
+       private static void assertBitArrayEquals(BitVector actual, Bit... expected)\r
        {\r
-               assertArrayEquals(expected, actual);\r
+               assertArrayEquals(expected, actual.getBits());\r
        }\r
 }\r