X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FComponentTest.java;h=29bc9717ecbe4db4e73c13750db63597d6e6a067;hb=a84700145147c263ad6692c99117a7cf37832378;hp=a595f0560ff200f017672969356dda315733ec35;hpb=20aa3391efe7ae7d99861741f8b5594f88eae1d9;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
index a595f056..29bc9717 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
@@ -88,7 +88,7 @@ class ComponentTest
 	}
 
 	@Test
-	void fusionTest()
+	void fusionTest1()
 	{
 		t.reset();
 		Wire a = new Wire(t, 3, 1), b = new Wire(t, 2, 1), c = new Wire(t, 3, 1), out = new Wire(t, 8, 1);
@@ -101,6 +101,7 @@ class ComponentTest
 		rB.feedSignals(Bit.ONE, Bit.ZERO);
 		ReadWriteEnd rC = c.createReadWriteEnd();
 		rC.feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+
 		t.executeAll();
 		assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 		out.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
@@ -117,6 +118,45 @@ class ComponentTest
 		assertBitArrayEquals(rC.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO);
 	}
 
+	@Test
+	void fusionTest2()
+	{
+		t.reset();
+		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);
+		Wire.fuse(a, b);
+		ReadWriteEnd rw = a.createReadWriteEnd();
+		t.executeAll();
+		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U);
+
+		rw.feedSignals(Bit.ONE, Bit.U, Bit.Z);
+		t.executeAll();
+		assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.U, Bit.Z);
+	}
+
+	@Test
+	void fusionTest3()
+	{
+		t.reset();
+		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);
+		a.createReadWriteEnd().feedSignals(Bit.Z, Bit.U, Bit.X);
+		t.executeAll();
+		Wire.fuse(a, b);
+		t.executeAll();
+		assertBitArrayEquals(b.getValues(), Bit.Z, Bit.U, Bit.X);
+	}
+
+//	@Test
+//	void connectorTest()
+//	{
+//		t.reset();
+//		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);
+//		new Connector(t, a.createReadWriteEnd(), b.createReadWriteEnd()).connect();
+////		b.createReadWriteEnd();
+//		a.createReadWriteEnd();
+//		t.executeAll();
+//		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U);
+//	}
+
 	@Test
 	void triStateBufferTest()
 	{
@@ -430,7 +470,7 @@ class ComponentTest
 
 		TestBitDisplay test = new TestBitDisplay(t, c.createReadOnlyEnd());
 		TestBitDisplay test2 = new TestBitDisplay(t, a.createReadOnlyEnd());
-		LongConsumer print = time -> System.out.format("Time %2d\n   a: %s\n   b: %s\n   c: %s\n", time, a, b, c);
+		LongConsumer print = time -> System.out.format("Time %2d\n a: %s\n b: %s\n c: %s\n", time, a, b, c);
 
 		cI.feedSignals(Bit.ONE);
 		test.assertAfterSimulationIs(print, Bit.ONE);