X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FComponentTest.java;h=e61299edae8d83ef13d55560176e3ded1b3474c6;hb=eca4d29d3f518c0a3a08c2cbf116915050b6bdfb;hp=d69cd009aa2aaaafcfeb6132898d42b99cedc4fd;hpb=4398143ae40a2c41031bacabe9151f0e93d02d67;p=Mograsim.git

diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java
index d69cd009..e61299ed 100644
--- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java
+++ b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/ComponentTest.java
@@ -8,8 +8,13 @@ import java.math.BigInteger;
 import java.util.Random;
 import java.util.function.LongConsumer;
 
-import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 import net.mograsim.logic.core.components.Connector;
 import net.mograsim.logic.core.components.Demux;
@@ -35,7 +40,7 @@ class ComponentTest
 {
 	private Timeline t = new Timeline(11);
 
-	@Before
+	@BeforeEach
 	void resetTimeline()
 	{
 		t.reset();
@@ -149,6 +154,18 @@ class ComponentTest
 		assertBitArrayEquals(b.getValues(), Bit.Z, Bit.U, Bit.X);
 	}
 
+	@Test
+	void fusionTest4()
+	{
+		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);
+		a.createReadWriteEnd();
+		t.executeAll();
+
+		Wire.fuse(a, b);
+		t.executeAll();
+		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U);
+	}
+
 //	@Test
 //	void connectorTest()
 //	{
@@ -416,6 +433,8 @@ class ComponentTest
 			fail("Not all events were executed in order!");
 	}
 
+	// TODO: Adapt this test, now that update notifications are issued whenever any input to a wire changes
+	@Disabled("Out of date")
 	@Test
 	void multipleInputs()
 	{
@@ -446,6 +465,7 @@ class ComponentTest
 		assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
 	}
 
+	@Disabled("Braucht den Connector noch irgendjemand?")
 	@Test
 	void wireConnections()
 	{