Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.core / test / net / mograsim / logic / core / types / BitVectorTest.java

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 6c4670f..2b46a6c 100644 (file)
--- 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
@@ -38,54 +38,34 @@ class BitVectorTest
                assertEquals(BitVector.of(X, X, X), BitVector.of(X, 3));
        }
 
-       @Test
-       void testFrom()
-       {
-               assertEquals(BitVector.parse("101"), BitVector.from(BigInteger.valueOf(0b101), 3));
-               assertEquals(BitVector.parse("01010"), BitVector.from(BigInteger.valueOf(0b01010), 5));
-               assertEquals(BitVector.parse("10101"), BitVector.from(BigInteger.valueOf(-11), 5));
-               assertEquals(BitVector.parse("0000"), BitVector.from(BigInteger.valueOf(0), 4));
-       }
-
        @Test
        void testGetUnsignedValue()
        {
                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
-       void testToBigInteger()
-       {
-               assertEquals(BigInteger.valueOf(0b101), BitVector.parse("101").toBigInteger(false));
-               assertEquals(BigInteger.valueOf(0b01010), BitVector.parse("01010").toBigInteger(false));
-               assertEquals(BigInteger.valueOf(0), BitVector.parse("0000").toBigInteger(false));
-
-//             assertEquals(BigInteger.valueOf(-11), BitVector.parse("10101").toBigInteger(true)); TODO
-
-               assertThrows(NumberFormatException.class, () -> BitVector.parse("00X1").toBigInteger(false));
        }
 
        @Test
        void testOfLongInt()
        {
-               assertEquals(BitVector.parse("101"), BitVector.of(0b101L, 3));
-               assertEquals(BitVector.parse("01010"), BitVector.of(0b01010L, 5));
-               assertEquals(BitVector.parse("10101"), BitVector.of(-11L, 5));
-               assertEquals(BitVector.parse("0000"), BitVector.of(0L, 4));
+               assertEquals(BitVector.parse("101"), BitVector.from(0b101L, 3));
+               assertEquals(BitVector.parse("01010"), BitVector.from(0b01010L, 5));
+               assertEquals(BitVector.parse("10101"), BitVector.from(-11L, 5));
+               assertEquals(BitVector.parse("0000"), BitVector.from(0L, 4));
        }
 
        @Test
        void testOfBigIntegerInt()
        {
-               assertEquals(BitVector.parse("101"), BitVector.of(BigInteger.valueOf(0b101), 3));
-               assertEquals(BitVector.parse("01010"), BitVector.of(BigInteger.valueOf(0b01010), 5));
-               assertEquals(BitVector.parse("10101"), BitVector.of(BigInteger.valueOf(-11), 5));
-               assertEquals(BitVector.parse("0000"), BitVector.of(BigInteger.valueOf(0), 4));
+               assertEquals(BitVector.parse("101"), BitVector.from(BigInteger.valueOf(0b101), 3));
+               assertEquals(BitVector.parse("01010"), BitVector.from(BigInteger.valueOf(0b01010), 5));
+               assertEquals(BitVector.parse("10101"), BitVector.from(BigInteger.valueOf(-11), 5));
+               assertEquals(BitVector.parse("0000"), BitVector.from(BigInteger.valueOf(0), 4));
        }
 
        @Test