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=b80b2f30e467f08b35351162910e1fa7aeb00c0e;hpb=e6d8e1a6099a1bc26af3851860bfd849543278c3;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 b80b2f30..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
@@ -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);
@@ -123,11 +124,39 @@ class ComponentTest
 		t.reset();
 		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);
 		Wire.fuse(a, b);
-		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.U, Bit.Z);
+		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()
 	{