X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FComponentTest.java;h=8a9bc5a4aef0c2a74cf3f9aa28f203827175c2b7;hb=b56437775ad8674edf9ab833627bf571fdf1bfd8;hp=cb2195edae4a438b7f1c59fcd1d9fd79bb13511a;hpb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;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 cb2195ed..8a9bc5a4 100644 --- a/era.mi/src/era/mi/logic/tests/ComponentTest.java +++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java @@ -2,7 +2,6 @@ package era.mi.logic.tests; import static org.junit.jupiter.api.Assertions.*; -import java.util.Arrays; import java.util.function.LongConsumer; import org.junit.jupiter.api.Test; @@ -19,6 +18,7 @@ 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; @@ -78,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 @@ -378,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()); } }