X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2910%2FAm2910Test.java;h=0e38b78904c9343c0caf66ccab7af89b63f61672;hb=b5d55c59d7069171bd928e4a945d9185ee4bc2b0;hp=18b2578d6c9c13f174f013aaa7f61dd8ba2fd977;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java index 18b2578d..0e38b789 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/Am2910Test.java @@ -1,15 +1,15 @@ package net.mograsim.logic.model.am2900.am2910; -import static net.mograsim.logic.model.am2900.am2910.TestableAm2910.Am2910_Inst.*; -import static net.mograsim.logic.core.types.Bit.*; +import static net.mograsim.logic.core.types.Bit.U; +import static net.mograsim.logic.model.am2900.am2910.TestableAm2910.Am2910_Inst.JZ; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -57,8 +57,8 @@ public class Am2910Test @EnumSource(Register.class) void testDirectAccess(Register r) { - String us = U.toVector(r.size()).toString(); - String three = BitVector.from(3, r.size()).toString(); + String us = U.toVector(r.size()).toBitstring(); + String three = BitVector.from(3, r.size()).toBitstring(); assertEquals(us, am2910.getDirectly(r));