X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FComponentTest.java;h=cb2195edae4a438b7f1c59fcd1d9fd79bb13511a;hb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;hp=a18228bb3f5a8de4eff3124b34d2bc0c320062fd;hpb=49f569b513c36e8ad421fd5a547bf34bd830652a;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/era/mi/logic/tests/ComponentTest.java
index a18228bb..cb2195ed 100644
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -3,11 +3,13 @@ package era.mi.logic.tests;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
+import java.util.function.LongConsumer;
 
 import org.junit.jupiter.api.Test;
 
-import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
+import era.mi.logic.components.Connector;
+import era.mi.logic.components.Demux;
 import era.mi.logic.components.Merger;
 import era.mi.logic.components.Mux;
 import era.mi.logic.components.Splitter;
@@ -15,9 +17,12 @@ import era.mi.logic.components.TriStateBuffer;
 import era.mi.logic.components.gates.AndGate;
 import era.mi.logic.components.gates.NotGate;
 import era.mi.logic.components.gates.OrGate;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.components.gates.XorGate;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
 
+@SuppressWarnings("unused")
 class ComponentTest
 {
 
@@ -25,319 +30,356 @@ class ComponentTest
 	void circuitExampleTest()
 	{
 		Simulation.TIMELINE.reset();
-		WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), c = new WireArray(1, 10), d = new WireArray(2, 1), e = new WireArray(1, 1),
-				f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1), j = new WireArray(1, 1), k = new WireArray(1, 1);
-		new AndGate(1, a, b, f);
-		new NotGate(1, f, g);
-		new Merger(h, c, g);
-		new Mux(1, i, e, h, d);
-		new Splitter(i, k, j);
-		
-		a.createInput().feedSignals(Bit.ZERO);
-		b.createInput().feedSignals(Bit.ONE);
-		c.createInput().feedSignals(Bit.ZERO);
-		d.createInput().feedSignals(Bit.ONE, Bit.ONE);
-		e.createInput().feedSignals(Bit.ZERO);
-		
-		while(Simulation.TIMELINE.hasNext())
-		{
-			Simulation.TIMELINE.executeNext();
-		}
-		
+		Wire a = new Wire(1, 1), b = new Wire(1, 1), c = new Wire(1, 10), d = new Wire(2, 1), e = new Wire(1, 1), f = new Wire(1, 1),
+				g = new Wire(1, 1), h = new Wire(2, 1), i = new Wire(2, 1), j = new Wire(1, 1), k = new Wire(1, 1);
+		new AndGate(1, f.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
+		new NotGate(1, f.createReadOnlyEnd(), g.createEnd());
+		new Merger(h.createEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd());
+		new Mux(1, i.createEnd(), e.createReadOnlyEnd(), h.createReadOnlyEnd(), d.createReadOnlyEnd());
+		new Splitter(i.createReadOnlyEnd(), k.createEnd(), j.createEnd());
+
+		a.createEnd().feedSignals(Bit.ZERO);
+		b.createEnd().feedSignals(Bit.ONE);
+		c.createEnd().feedSignals(Bit.ZERO);
+		d.createEnd().feedSignals(Bit.ONE, Bit.ONE);
+		e.createEnd().feedSignals(Bit.ZERO);
+
+		Simulation.TIMELINE.executeAll();
+
 		assertEquals(Bit.ONE, j.getValue());
 		assertEquals(Bit.ZERO, k.getValue());
 	}
 
-    @Test
-    void splitterTest()
-    {
-	Simulation.TIMELINE.reset();
-	WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);
-	in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
-	new Splitter(in, a, b, c);
-
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void splitterTest()
 	{
-	    Simulation.TIMELINE.executeNext();
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(3, 1), b = new Wire(2, 1), c = new Wire(3, 1), in = new Wire(8, 1);
+		in.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+		new Splitter(in.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd());
+
+		Simulation.TIMELINE.executeAll();
+
+		assertBitArrayEquals(a.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO);
+		assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO);
+		assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE);
 	}
 
-	assertTrue(Arrays.equals(a.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }));
-	assertTrue(Arrays.equals(b.getValues(), new Bit[] { Bit.ONE, Bit.ZERO }));
-	assertTrue(Arrays.equals(c.getValues(), new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }));
-    }
+	@Test
+	void mergerTest()
+	{
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(3, 1), b = new Wire(2, 1), c = new Wire(3, 1), out = new Wire(8, 1);
+		a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
+		b.createEnd().feedSignals(Bit.ONE, Bit.ZERO);
+		c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+
+		new Merger(out.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
 
-    @Test
-    void mergerTest()
-    {
-	Simulation.TIMELINE.reset();
-	WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);
-	a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
-	b.createInput().feedSignals(Bit.ONE, Bit.ZERO);
-	c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+		Simulation.TIMELINE.executeAll();
 
-	new Merger(out, a, b, c);
+		assertTrue(
+				Arrays.equals(out.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
+	}
 
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void triStateBufferTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Wire a = new Wire(1, 1), b = new Wire(1, 1), en = new Wire(1, 1), notEn = new Wire(1, 1);
+		new NotGate(1, en.createReadOnlyEnd(), notEn.createEnd());
+		new TriStateBuffer(1, a.createReadOnlyEnd(), b.createEnd(), en.createReadOnlyEnd());
+		new TriStateBuffer(1, b.createReadOnlyEnd(), a.createEnd(), notEn.createReadOnlyEnd());
 
-	assertTrue(Arrays.equals(out.getValues(),
-		new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
-    }
+		WireEnd enI = en.createEnd(), aI = a.createEnd(), bI = b.createEnd();
+		enI.feedSignals(Bit.ONE);
+		aI.feedSignals(Bit.ONE);
+		bI.feedSignals(Bit.Z);
 
-    @Test
-    void triStateBufferTest()
-    {
-	WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), en = new WireArray(1, 1),
-		notEn = new WireArray(1, 1);
-	new NotGate(1, en, notEn);
-	new TriStateBuffer(1, a, b, en);
-	new TriStateBuffer(1, b, a, notEn);
+		Simulation.TIMELINE.executeAll();
 
-	WireArrayInput enI = en.createInput(), aI = a.createInput(), bI = b.createInput();
-	enI.feedSignals(Bit.ONE);
-	aI.feedSignals(Bit.ONE);
+		assertEquals(Bit.ONE, b.getValue());
 
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		bI.feedSignals(Bit.ZERO);
 
-	assertEquals(Bit.ONE, b.getValue());
+		Simulation.TIMELINE.executeAll();
 
-	bI.feedSignals(Bit.ZERO);
+		assertEquals(Bit.X, b.getValue());
+		assertEquals(Bit.ONE, a.getValue());
 
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		aI.clearSignals();
+		enI.feedSignals(Bit.ZERO);
 
-	assertEquals(Bit.X, b.getValue());
-	assertEquals(Bit.ONE, a.getValue());
+		Simulation.TIMELINE.executeAll();
 
-	aI.clearSignals();
-	enI.feedSignals(Bit.ZERO);
+		assertEquals(Bit.ZERO, a.getValue());
 
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
 	}
 
-	assertEquals(Bit.ZERO, a.getValue());
+	@Test
+	void muxTest()
+	{
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(4, 3), b = new Wire(4, 6), c = new Wire(4, 4), select = new Wire(2, 5), out = new Wire(4, 1);
+		WireEnd selectIn = select.createEnd();
 
-    }
+		selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+		a.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+		c.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-    @Test
-    void muxTest()
-    {
-	Simulation.TIMELINE.reset();
-	WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
-		select = new WireArray(2, 5), out = new WireArray(4, 1);
-	WireArrayInput selectIn = select.createInput();
+		new Mux(1, out.createEnd(), select.createReadOnlyEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
+		Simulation.TIMELINE.executeAll();
 
-	selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
-	a.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
-	c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+		assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+		selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+		Simulation.TIMELINE.executeAll();
+
+		assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+
+		selectIn.feedSignals(Bit.ONE, Bit.ONE);
+		Simulation.TIMELINE.executeAll();
+
+		assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
-	new Mux(1, out, select, a, b, c);
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
 	}
 
-	assertTrue(Arrays.equals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues()));
-	selectIn.feedSignals(Bit.ZERO, Bit.ONE);
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void demuxTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(4, 3), b = new Wire(4, 6), c = new Wire(4, 4), select = new Wire(2, 5), in = new Wire(4, 1);
+		WireEnd selectIn = select.createEnd();
 
-	assertTrue(Arrays.equals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues()));
+		selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+		in.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 
-	selectIn.feedSignals(Bit.ONE, Bit.ONE);
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		new Demux(1, in.createReadOnlyEnd(), select.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd());
+		Simulation.TIMELINE.executeAll();
 
-	assertTrue(Arrays.equals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues()));
+		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);
+		Simulation.TIMELINE.executeAll();
 
-    }
+		assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);
+		assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 
-    @Test
-    void andTest()
-    {
-	Simulation.TIMELINE.reset();
-	AndGate gate = new AndGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-	gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-	gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+		selectIn.feedSignals(Bit.ONE, Bit.ONE);
+		Simulation.TIMELINE.executeAll();
+
+		assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+		assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);
+		assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
 	}
-	assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }));
-    }
-
-    @Test
-    void orTest()
-    {
-	Simulation.TIMELINE.reset();
-	OrGate gate = new OrGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-	gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-	gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
-
-	while (Simulation.TIMELINE.hasNext())
+
+	@Test
+	void andTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);
+		new AndGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
+		a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+		b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-	assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }));
-    }
+		Simulation.TIMELINE.executeAll();
 
-    @Test
-    void rsLatchCircuitTest()
-    {
-	Simulation.TIMELINE.reset();
-	WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1),
-		q = new WireArray(1, 1), nq = new WireArray(1, 1);
+		assertBitArrayEquals(c.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO);
+	}
 
-	new OrGate(1, r, nq, t2);
-	new OrGate(1, s, q, t1);
-	new NotGate(1, t2, q);
-	new NotGate(1, t1, nq);
+	@Test
+	void orTest()
+	{
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);
+		new OrGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
+		a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+		b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-	WireArrayInput sIn = s.createInput(), rIn = r.createInput();
+		Simulation.TIMELINE.executeAll();
 
-	sIn.feedSignals(Bit.ONE);
-	rIn.feedSignals(Bit.ZERO);
+		assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE);
+	}
 
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void xorTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(3, 1), b = new Wire(3, 2), c = new Wire(3, 1), d = new Wire(3, 1);
+		new XorGate(1, d.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
+		a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);
+		b.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+		c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
 
-	assertEquals(q.getValue(), Bit.ONE);
-	assertEquals(nq.getValue(), Bit.ZERO);
+		Simulation.TIMELINE.executeAll();
 
-	sIn.feedSignals(Bit.ZERO);
+		assertBitArrayEquals(d.getValues(), Bit.ZERO, Bit.ONE, Bit.ONE);
+	}
 
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void notTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Simulation.TIMELINE.reset();
+		Wire a = new Wire(3, 1), b = new Wire(3, 2);
+		new NotGate(1, a.createReadOnlyEnd(), b.createEnd());
+		a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);
 
-	assertEquals(q.getValue(), Bit.ONE);
-	assertEquals(nq.getValue(), Bit.ZERO);
+		Simulation.TIMELINE.executeAll();
 
-	rIn.feedSignals(Bit.ONE);
+		assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO, Bit.ZERO);
+	}
 
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void rsLatchCircuitTest()
 	{
-	    Simulation.TIMELINE.executeNext();
-	}
+		Simulation.TIMELINE.reset();
+		Wire r = new Wire(1, 1), s = new Wire(1, 1), t1 = new Wire(1, 15), t2 = new Wire(1, 1), q = new Wire(1, 1), nq = new Wire(1, 1);
 
-	assertEquals(q.getValue(), Bit.ZERO);
-	assertEquals(nq.getValue(), Bit.ONE);
-    }
+		new OrGate(1, t2.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());
+		new OrGate(1, t1.createEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());
+		new NotGate(1, t2.createReadOnlyEnd(), q.createEnd());
+		new NotGate(1, t1.createReadOnlyEnd(), nq.createEnd());
 
-    @Test
-    void numericValueTest()
-    {
-	Simulation.TIMELINE.reset();
+		WireEnd sIn = s.createEnd(), rIn = r.createEnd();
 
-	WireArray a = new WireArray(4, 1);
-	a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
+		sIn.feedSignals(Bit.ONE);
+		rIn.feedSignals(Bit.ZERO);
 
-	while (Simulation.TIMELINE.hasNext())
-	{
-	    Simulation.TIMELINE.executeNext();
+		Simulation.TIMELINE.executeAll();
+
+		assertEquals(Bit.ONE, q.getValue());
+		assertEquals(Bit.ZERO, nq.getValue());
+
+		sIn.feedSignals(Bit.ZERO);
+
+		Simulation.TIMELINE.executeAll();
+		assertEquals(Bit.ONE, q.getValue());
+		assertEquals(Bit.ZERO, nq.getValue());
+
+		rIn.feedSignals(Bit.ONE);
+
+		Simulation.TIMELINE.executeAll();
+
+		assertEquals(Bit.ZERO, q.getValue());
+		assertEquals(Bit.ONE, nq.getValue());
 	}
 
-	assertEquals(a.getUnsignedValue(), 15);
-	assertEquals(a.getSignedValue(), -1);
-    }
-
-    @Test
-    void multipleInputs()
-    {
-	Simulation.TIMELINE.reset();
-	WireArray w = new WireArray(2, 1);
-	WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();
-	wI1.feedSignals(Bit.ONE, Bit.Z);
-	wI2.feedSignals(Bit.Z, Bit.X);
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void numericValueTest()
 	{
-	    Simulation.TIMELINE.executeNext();
+		Simulation.TIMELINE.reset();
+
+		Wire a = new Wire(4, 1);
+		a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
+
+		Simulation.TIMELINE.executeAll();
+
+		assertEquals(15, a.getUnsignedValue());
+		assertEquals(-1, a.getSignedValue());
 	}
-	assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.X }));
 
-	wI2.feedSignals(Bit.ZERO, Bit.Z);
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void multipleInputs()
 	{
-	    Simulation.TIMELINE.executeNext();
+		Simulation.TIMELINE.reset();
+		Wire w = new Wire(2, 1);
+		WireEnd wI1 = w.createEnd(), wI2 = w.createEnd();
+		wI1.feedSignals(Bit.ONE, Bit.Z);
+		wI2.feedSignals(Bit.Z, Bit.X);
+		Simulation.TIMELINE.executeAll();
+		assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X);
+
+		wI2.feedSignals(Bit.ZERO, Bit.Z);
+		Simulation.TIMELINE.executeAll();
+		assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z);
+
+		wI2.feedSignals(Bit.Z, Bit.Z);
+		Simulation.TIMELINE.executeAll();
+		assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
+
+		wI2.feedSignals(Bit.ONE, Bit.Z);
+		w.addObserver((i, oldValues) -> fail("WireArray notified observer, although value did not change."));
+		Simulation.TIMELINE.executeAll();
+		assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
 	}
-	assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.X, Bit.Z }));
 
-	wI2.feedSignals(Bit.Z, Bit.Z);
-	while (Simulation.TIMELINE.hasNext())
+	@Test
+	void wireConnections()
 	{
-	    Simulation.TIMELINE.executeNext();
+		// Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
+
+		Simulation.TIMELINE.reset();
+
+		Wire a = new Wire(1, 2);
+		Wire b = new Wire(1, 2);
+		Wire c = new Wire(1, 2);
+		WireEnd aI = a.createEnd();
+		WireEnd bI = b.createEnd();
+		WireEnd cI = c.createEnd();
+
+		TestBitDisplay test = new TestBitDisplay(c.createReadOnlyEnd());
+		TestBitDisplay test2 = new TestBitDisplay(a.createReadOnlyEnd());
+		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);
+
+		cI.feedSignals(Bit.X);
+		test.assertAfterSimulationIs(print, Bit.X);
+
+		cI.feedSignals(Bit.X);
+		cI.feedSignals(Bit.Z);
+		test.assertAfterSimulationIs(print, Bit.Z);
+
+		new Connector(b.createEnd(), c.createEnd()).connect();
+		test.assertAfterSimulationIs(print, Bit.Z);
+		System.err.println("ONE");
+		bI.feedSignals(Bit.ONE);
+		test.assertAfterSimulationIs(print, Bit.ONE);
+		System.err.println("ZERO");
+		bI.feedSignals(Bit.ZERO);
+		test.assertAfterSimulationIs(print, Bit.ZERO);
+		System.err.println("Z");
+		bI.feedSignals(Bit.Z);
+		test.assertAfterSimulationIs(print, Bit.Z);
+
+		new Connector(a.createEnd(), b.createEnd()).connect();
+		System.err.println("Z 2");
+		aI.feedSignals(Bit.Z);
+		test.assertAfterSimulationIs(print, Bit.Z);
+		test2.assertAfterSimulationIs(Bit.Z);
+		System.err.println("ONE 2");
+		aI.feedSignals(Bit.ONE);
+		test.assertAfterSimulationIs(print, Bit.ONE);
+		test2.assertAfterSimulationIs(Bit.ONE);
+		System.err.println("ZERO 2");
+		aI.feedSignals(Bit.ZERO);
+		test.assertAfterSimulationIs(print, Bit.ZERO);
+		test2.assertAfterSimulationIs(Bit.ZERO);
+		System.err.println("Z 2 II");
+		aI.feedSignals(Bit.Z);
+		test.assertAfterSimulationIs(print, Bit.Z);
+		test2.assertAfterSimulationIs(Bit.Z);
+
+		System.err.println("No Conflict yet");
+		bI.feedSignals(Bit.ONE);
+		test.assertAfterSimulationIs(print, Bit.ONE);
+		test2.assertAfterSimulationIs(Bit.ONE);
+		aI.feedSignals(Bit.ONE);
+		test.assertAfterSimulationIs(print, Bit.ONE);
+		test2.assertAfterSimulationIs(Bit.ONE);
+		System.err.println("Conflict");
+		aI.feedSignals(Bit.ZERO);
+		test.assertAfterSimulationIs(print, Bit.X);
+		test2.assertAfterSimulationIs(Bit.X);
+		aI.feedSignals(Bit.ONE);
+		test.assertAfterSimulationIs(print, Bit.ONE);
+		test2.assertAfterSimulationIs(Bit.ONE);
 	}
-	assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
 
-	wI2.feedSignals(Bit.ONE, Bit.Z);
-	w.addObserver((i) -> fail("WireArray notified observer, although value did not change."));
-	while (Simulation.TIMELINE.hasNext())
+	private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
 	{
-	    Simulation.TIMELINE.executeNext();
+		assertArrayEquals(expected, actual);
 	}
-	assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
-    }
-
-//	@Test
-//	void wireConnections()
-//	{
-//		// Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
-//		
-//		Simulation.TIMELINE.reset();
-//
-//		WireArray a = new WireArray(1, 2);
-//		WireArray b = new WireArray(1, 2);
-//		WireArray c = new WireArray(1, 2);
-//		WireArrayInput aI = a.createInput();
-//		WireArrayInput bI = b.createInput();
-//		WireArrayInput cI = c.createInput();
-//
-//		TestBitDisplay test = new TestBitDisplay(c);
-//		LongConsumer print = time -> System.out.format("Time %2d\n   %s\n   %s\n   %s\n", time, a, b, c);
-//
-//		cI.feedSignals(Bit.ONE);
-//		test.assertAfterSimulationIs(print, Bit.ONE);
-//
-//		cI.feedSignals(Bit.X);
-//		test.assertAfterSimulationIs(print, Bit.X);
-//
-//		cI.feedSignals(Bit.X);
-//		cI.feedSignals(Bit.Z);
-//		test.assertAfterSimulationIs(print, Bit.Z);
-//
-//		Connector c1 = new Connector(b, c);
-//		test.assertAfterSimulationIs(print, Bit.Z);
-//		System.out.println("ONE");
-//		bI.feedSignals(Bit.ONE);
-//		test.assertAfterSimulationIs(print, Bit.ONE);
-//		System.out.println("ZERO");
-//		bI.feedSignals(Bit.ZERO);
-//		test.assertAfterSimulationIs(print, Bit.ZERO);
-//		System.out.println("Z");
-//		bI.feedSignals(Bit.Z);
-//		test.assertAfterSimulationIs(Bit.Z);
-//	}
-
-    private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
-    {
-	assertArrayEquals(expected, actual);
-    }
 }