X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FComponentTest.java;h=3ee55760f3ecfe1e724bafb7ebf52e51e7c7b6fe;hb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;hp=c1f0e199010d8dcb16896b98f3bc6ac28abcf287;hpb=d67ded9f20c85280a044d94d8278897ca6c49384;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 c1f0e199..3ee55760 100644
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -1,16 +1,15 @@
 package era.mi.logic.tests;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+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.Demux;
 import era.mi.logic.components.Merger;
 import era.mi.logic.components.Mux;
 import era.mi.logic.components.Splitter;
@@ -58,9 +57,9 @@ class ComponentTest
 
 	Simulation.TIMELINE.executeAll();
 
-	assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }, a.getValues());
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO }, b.getValues());
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }, c.getValues());
+	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);
     }
 
     @Test
@@ -128,19 +127,52 @@ class ComponentTest
 	new Mux(1, out, select, a, b, c);
 	Simulation.TIMELINE.executeAll();
 
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues());
+	assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 	selectIn.feedSignals(Bit.ZERO, Bit.ONE);
 	Simulation.TIMELINE.executeAll();
 
-	assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues());
+	assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
 	selectIn.feedSignals(Bit.ONE, Bit.ONE);
 	Simulation.TIMELINE.executeAll();
 
-	assertArrayEquals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues());
+	assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
     }
 
+    @Test
+    void demuxTest()
+    {
+	Simulation.TIMELINE.reset();
+	WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
+		select = new WireArray(2, 5), in = new WireArray(4, 1);
+	WireArrayInput selectIn = select.createInput();
+
+	selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+	in.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+
+	new Demux(1, in, select, a, b, c);
+	Simulation.TIMELINE.executeAll();
+
+	assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+	assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+	Simulation.TIMELINE.executeAll();
+
+	assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+
+	selectIn.feedSignals(Bit.ONE, Bit.ONE);
+	Simulation.TIMELINE.executeAll();
+
+	assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+	assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+
+    }
+    
     @Test
     void andTest()
     {
@@ -150,7 +182,7 @@ class ComponentTest
 	gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
 	Simulation.TIMELINE.executeAll();
-	assertArrayEquals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }, gate.getOut().getValues());
+	assertBitArrayEquals(gate.getOut().getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO);
     }
 
     @Test
@@ -163,7 +195,7 @@ class ComponentTest
 
 	Simulation.TIMELINE.executeAll();
 
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }, gate.getOut().getValues());
+	assertBitArrayEquals(gate.getOut().getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE);
     }
 
     @Test
@@ -225,64 +257,98 @@ class ComponentTest
 	wI1.feedSignals(Bit.ONE, Bit.Z);
 	wI2.feedSignals(Bit.Z, Bit.X);
 	Simulation.TIMELINE.executeAll();
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.X }, w.getValues());
+	assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X);
 
 	wI2.feedSignals(Bit.ZERO, Bit.Z);
 	Simulation.TIMELINE.executeAll();
-	assertArrayEquals(new Bit[] { Bit.X, Bit.Z }, w.getValues());
+	assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z);
 
 	wI2.feedSignals(Bit.Z, Bit.Z);
 	Simulation.TIMELINE.executeAll();
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
+	assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
 
 	wI2.feedSignals(Bit.ONE, Bit.Z);
-	w.addObserver((i) -> fail("WireArray notified observer, although value did not change."));
+	w.addObserver((i, oldValues) -> fail("WireArray notified observer, although value did not change."));
 	Simulation.TIMELINE.executeAll();
-	assertArrayEquals(new Bit[] { Bit.ONE, Bit.Z }, w.getValues());
+	assertBitArrayEquals(w.getValues(), 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);
-//	}
+	@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);
+		TestBitDisplay test2 = new TestBitDisplay(a);
+		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);
+
+		Connector c1 = new Connector(b, c);
+		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);
+		
+		Connector c2 = new Connector(a, b);
+		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);
+	}
 
     private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
     {
-	assertArrayEquals(expected, actual);
+    	assertArrayEquals(expected, actual);
     }
 }