Further renaming of length to width

[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..b83a5ff 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,15 +38,6 @@ 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()
        {
@@ -58,34 +49,22 @@ class BitVectorTest
 
        }
 
-       @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
@@ -149,7 +128,7 @@ class BitVectorTest
                assertEquals(SINGLE_U, SINGLE_0.join(SINGLE_U));
                assertEquals(SINGLE_X, SINGLE_X.join(SINGLE_Z));
 
-               // higher length
+               // higher width
                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);
        }
@@ -167,7 +146,7 @@ class BitVectorTest
                assertEquals(SINGLE_0, SINGLE_0.and(SINGLE_U));
                assertEquals(SINGLE_X, SINGLE_X.and(SINGLE_Z));
 
-               // higher length
+               // higher width
                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);
        }
@@ -185,7 +164,7 @@ class BitVectorTest
                assertEquals(SINGLE_1, SINGLE_1.or(SINGLE_U));
                assertEquals(SINGLE_X, SINGLE_X.or(SINGLE_Z));
 
-               // higher length
+               // higher width
                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);
        }
@@ -203,7 +182,7 @@ class BitVectorTest
                assertEquals(SINGLE_U, SINGLE_0.xor(SINGLE_U));
                assertEquals(SINGLE_X, SINGLE_X.xor(SINGLE_Z));
 
-               // higher length
+               // higher width
                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);
        }
@@ -220,17 +199,17 @@ class BitVectorTest
                assertEquals(SINGLE_X, SINGLE_X.not());
                assertEquals(SINGLE_X, SINGLE_Z.not());
 
-               // higher length
+               // higher width
                var result = BitVector.of(U, X, ZERO, ONE, Z).not();
                assertEquals(BitVector.of(U, X, ONE, ZERO, X), result);
        }
 
        @Test
-       void testLength()
+       void testWidth()
        {
-               assertEquals(0, BitVector.of().length());
-               assertEquals(1, SINGLE_0.length());
-               assertEquals(3, BitVector.of(X, X, Z).length());
+               assertEquals(0, BitVector.of().width());
+               assertEquals(1, SINGLE_0.width());
+               assertEquals(3, BitVector.of(X, X, Z).width());
        }
 
        @Test