X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FComponentTest.java;h=8a9bc5a4aef0c2a74cf3f9aa28f203827175c2b7;hb=373b945917f9d573e4b1bd0e97f98b02fb0d9c07;hp=f6d801fd9dd5cb5a300b23e0b49468943250f4c1;hpb=2ccdd5a2ed812bc4eb864ab4fbb1adb1c723a1c9;p=Mograsim.git

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