X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FCoreComponentTest.java;h=12df5844a5754ad0e7a203ddc5ccb2a11d5c332f;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=3b670472c6e88dcb94cdec59c3501617288ad16c;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git

diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java
index 3b670472..12df5844 100644
--- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java
+++ b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java
@@ -40,9 +40,9 @@ class CoreComponentTest
 	@Test
 	void circuitExampleTest()
 	{
-		CoreWire a = new CoreWire(t, 1, 1), b = new CoreWire(t, 1, 1), c = new CoreWire(t, 1, 10), d = new CoreWire(t, 2, 1), e = new CoreWire(t, 1, 1),
-				f = new CoreWire(t, 1, 1), g = new CoreWire(t, 1, 1), h = new CoreWire(t, 2, 1), i = new CoreWire(t, 2, 1), j = new CoreWire(t, 1, 1),
-				k = new CoreWire(t, 1, 1);
+		CoreWire a = new CoreWire(t, 1, 1), b = new CoreWire(t, 1, 1), c = new CoreWire(t, 1, 10), d = new CoreWire(t, 2, 1),
+				e = new CoreWire(t, 1, 1), f = new CoreWire(t, 1, 1), g = new CoreWire(t, 1, 1), h = new CoreWire(t, 2, 1),
+				i = new CoreWire(t, 2, 1), j = new CoreWire(t, 1, 1), k = new CoreWire(t, 1, 1);
 		new CoreAndGate(t, 1, f.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
 		new CoreNotGate(t, 1, f.createReadOnlyEnd(), g.createReadWriteEnd());
 		new CoreUnidirectionalMerger(t, h.createReadWriteEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd());
@@ -205,7 +205,8 @@ class CoreComponentTest
 	@Test
 	void muxTest()
 	{
-		CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5), out = new CoreWire(t, 4, 1);
+		CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5),
+				out = new CoreWire(t, 4, 1);
 		ReadWriteEnd selectIn = select.createReadWriteEnd();
 
 		selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
@@ -217,7 +218,7 @@ class CoreComponentTest
 		t.executeAll();
 
 		assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
-		selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+		selectIn.feedSignals(Bit.ONE, Bit.ZERO);
 		t.executeAll();
 
 		assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
@@ -232,7 +233,8 @@ class CoreComponentTest
 	@Test
 	void demuxTest()
 	{
-		CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5), in = new CoreWire(t, 4, 1);
+		CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5),
+				in = new CoreWire(t, 4, 1);
 		ReadWriteEnd selectIn = select.createReadWriteEnd();
 
 		selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
@@ -245,7 +247,7 @@ class CoreComponentTest
 		assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);
 		assertBitArrayEquals(c.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);
-		selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+		selectIn.feedSignals(Bit.ONE, Bit.ZERO);
 		t.executeAll();
 
 		assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
@@ -344,8 +346,8 @@ class CoreComponentTest
 	@Test
 	void rsLatchCircuitTest()
 	{
-		CoreWire r = new CoreWire(t, 1, 1), s = new CoreWire(t, 1, 1), t1 = new CoreWire(t, 1, 15), t2 = new CoreWire(t, 1, 1), q = new CoreWire(t, 1, 1),
-				nq = new CoreWire(t, 1, 1);
+		CoreWire r = new CoreWire(t, 1, 1), s = new CoreWire(t, 1, 1), t1 = new CoreWire(t, 1, 15), t2 = new CoreWire(t, 1, 1),
+				q = new CoreWire(t, 1, 1), nq = new CoreWire(t, 1, 1);
 
 		new CoreOrGate(t, 1, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());
 		new CoreOrGate(t, 1, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());
@@ -380,12 +382,12 @@ class CoreComponentTest
 	void numericValueTest()
 	{
 		CoreWire a = new CoreWire(t, 4, 1);
-		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
+		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ONE);
 
 		t.executeAll();
 
-		assertEquals(15, a.getUnsignedValue());
-		assertEquals(-1, a.getSignedValue());
+		assertEquals(11, a.getValues().getUnsignedValueLong());
+		assertEquals(-5, a.getValues().getSignedValueLong());
 	}
 
 	boolean flag = false;