X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorTest.java;h=11b5febf30daf8c736c8be906122e64fef4845a9;hb=91969fbb8e1a846c21cdfe6dc7e2b20534d86119;hp=6c4670f5322f87c549d47bf62abdb8b3507e6da6;hpb=3e6ac3d7fd389191d02c1c6982fbf093421ce4f2;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 6c4670f5..11b5febf 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
@@ -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