X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorTest.java;h=2b46a6c7536dc66f895c147ccd4676321b62e8a3;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=b83a5ff91222484597562b6c8a01f4bb15dddf6c;hpb=f37f1f93f2c1ceb780f1c7ecab888bcb8f4f8b89;p=Mograsim.git diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java index b83a5ff9..2b46a6c7 100644 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java +++ b/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java @@ -44,9 +44,10 @@ class BitVectorTest assertEquals(BigInteger.valueOf(0b101), BitVector.parse("101").getUnsignedValue()); assertEquals(BigInteger.valueOf(0b01010), BitVector.parse("01010").getUnsignedValue()); assertEquals(BigInteger.valueOf(0), BitVector.parse("0000").getUnsignedValue()); + assertEquals(BigInteger.valueOf(0b0000000101), BitVector.parse("0000000101").getUnsignedValue()); + assertEquals(BigInteger.valueOf(0b1010000000), BitVector.parse("1010000000").getUnsignedValue()); assertThrows(NumberFormatException.class, () -> BitVector.parse("00X1").getUnsignedValue()); - } @Test @@ -128,7 +129,7 @@ class BitVectorTest assertEquals(SINGLE_U, SINGLE_0.join(SINGLE_U)); assertEquals(SINGLE_X, SINGLE_X.join(SINGLE_Z)); - // higher width + // higher length var result = BitVector.of(U, X, ZERO, ONE, Z).join(BitVector.of(ONE, ZERO, ZERO, ONE, Z)); assertEquals(BitVector.of(U, X, ZERO, ONE, Z), result); } @@ -146,7 +147,7 @@ class BitVectorTest assertEquals(SINGLE_0, SINGLE_0.and(SINGLE_U)); assertEquals(SINGLE_X, SINGLE_X.and(SINGLE_Z)); - // higher width + // higher length var result = BitVector.of(U, X, ZERO, ONE, ONE).and(BitVector.of(ONE, ONE, ZERO, ZERO, ONE)); assertEquals(BitVector.of(U, X, ZERO, ZERO, ONE), result); } @@ -164,7 +165,7 @@ class BitVectorTest assertEquals(SINGLE_1, SINGLE_1.or(SINGLE_U)); assertEquals(SINGLE_X, SINGLE_X.or(SINGLE_Z)); - // higher width + // higher length var result = BitVector.of(U, X, ZERO, ONE, ZERO).or(BitVector.of(ZERO, ZERO, ZERO, ONE, ONE)); assertEquals(BitVector.of(U, X, ZERO, ONE, ONE), result); } @@ -182,7 +183,7 @@ class BitVectorTest assertEquals(SINGLE_U, SINGLE_0.xor(SINGLE_U)); assertEquals(SINGLE_X, SINGLE_X.xor(SINGLE_Z)); - // higher width + // higher length var result = BitVector.of(U, X, ZERO, ONE, ONE).xor(BitVector.of(ONE, ZERO, ZERO, ZERO, ONE)); assertEquals(BitVector.of(U, X, ZERO, ONE, ZERO), result); } @@ -199,17 +200,17 @@ class BitVectorTest assertEquals(SINGLE_X, SINGLE_X.not()); assertEquals(SINGLE_X, SINGLE_Z.not()); - // higher width + // higher length var result = BitVector.of(U, X, ZERO, ONE, Z).not(); assertEquals(BitVector.of(U, X, ONE, ZERO, X), result); } @Test - void testWidth() + void testLength() { - assertEquals(0, BitVector.of().width()); - assertEquals(1, SINGLE_0.width()); - assertEquals(3, BitVector.of(X, X, Z).width()); + assertEquals(0, BitVector.of().length()); + assertEquals(1, SINGLE_0.length()); + assertEquals(3, BitVector.of(X, X, Z).length()); } @Test