X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FComponentTest.java;h=d69cd009aa2aaaafcfeb6132898d42b99cedc4fd;hb=3e6ac3d7fd389191d02c1c6982fbf093421ce4f2;hp=29bc9717ecbe4db4e73c13750db63597d6e6a067;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;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 29bc9717..d69cd009 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
@@ -4,8 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.math.BigInteger;
+import java.util.Random;
 import java.util.function.LongConsumer;
 
+import org.junit.Before;
 import org.junit.jupiter.api.Test;
 
 import net.mograsim.logic.core.components.Connector;
@@ -32,6 +35,12 @@ class ComponentTest
 {
 	private Timeline t = new Timeline(11);
 
+	@Before
+	void resetTimeline()
+	{
+		t.reset();
+	}
+
 	@Test
 	void circuitExampleTest()
 	{
@@ -59,7 +68,6 @@ class ComponentTest
 	@Test
 	void splitterTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 3, 1), b = new Wire(t, 2, 1), c = new Wire(t, 3, 1), in = new Wire(t, 8, 1);
 		in.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 		new Splitter(t, in.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), c.createReadWriteEnd());
@@ -74,7 +82,6 @@ class ComponentTest
 	@Test
 	void mergerTest()
 	{
-		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);
 		a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
 		b.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO);
@@ -90,11 +97,10 @@ class ComponentTest
 	@Test
 	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);
-		Wire.fuse(a, out, 0, 0, a.length);
-		Wire.fuse(b, out, 0, a.length, b.length);
-		Wire.fuse(c, out, 0, a.length + b.length, c.length);
+		Wire.fuse(a, out, 0, 0, a.width);
+		Wire.fuse(b, out, 0, a.width, b.width);
+		Wire.fuse(c, out, 0, a.width + b.width, c.width);
 		ReadWriteEnd rA = a.createReadWriteEnd();
 		rA.feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
 		ReadWriteEnd rB = b.createReadWriteEnd();
@@ -121,7 +127,6 @@ class ComponentTest
 	@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();
@@ -136,7 +141,6 @@ class ComponentTest
 	@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();
@@ -193,7 +197,6 @@ class ComponentTest
 	@Test
 	void muxTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 3), b = new Wire(t, 4, 6), c = new Wire(t, 4, 4), select = new Wire(t, 2, 5), out = new Wire(t, 4, 1);
 		ReadWriteEnd selectIn = select.createReadWriteEnd();
 
@@ -221,7 +224,6 @@ class ComponentTest
 	@Test
 	void demuxTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 3), b = new Wire(t, 4, 6), c = new Wire(t, 4, 4), select = new Wire(t, 2, 5), in = new Wire(t, 4, 1);
 		ReadWriteEnd selectIn = select.createReadWriteEnd();
 
@@ -254,7 +256,6 @@ class ComponentTest
 	@Test
 	void andTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1);
 		new AndGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
@@ -268,7 +269,6 @@ class ComponentTest
 	@Test
 	void orTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1);
 		new OrGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
@@ -282,7 +282,6 @@ class ComponentTest
 	@Test
 	void nandTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1), d = new Wire(t, 4, 1);
 		new NandGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
@@ -297,7 +296,6 @@ class ComponentTest
 	@Test
 	void norTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1), d = new Wire(t, 4, 1);
 		new NorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
@@ -312,7 +310,6 @@ class ComponentTest
 	@Test
 	void xorTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 2), c = new Wire(t, 3, 1), d = new Wire(t, 3, 1);
 		new XorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);
@@ -327,7 +324,6 @@ class ComponentTest
 	@Test
 	void notTest()
 	{
-		t.reset();
 		Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 2);
 		new NotGate(t, 1, a.createReadOnlyEnd(), b.createReadWriteEnd());
 		a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);
@@ -340,7 +336,6 @@ class ComponentTest
 	@Test
 	void rsLatchCircuitTest()
 	{
-		t.reset();
 		Wire r = new Wire(t, 1, 1), s = new Wire(t, 1, 1), t1 = new Wire(t, 1, 15), t2 = new Wire(t, 1, 1), q = new Wire(t, 1, 1),
 				nq = new Wire(t, 1, 1);
 
@@ -376,8 +371,6 @@ class ComponentTest
 	@Test
 	void numericValueTest()
 	{
-		t.reset();
-
 		Wire a = new Wire(t, 4, 1);
 		a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
 
@@ -426,7 +419,6 @@ class ComponentTest
 	@Test
 	void multipleInputs()
 	{
-		t.reset();
 		Wire w = new Wire(t, 2, 1);
 		ReadWriteEnd wI1 = w.createReadWriteEnd(), wI2 = w.createReadWriteEnd();
 		wI1.feedSignals(Bit.ONE, Bit.Z);
@@ -459,8 +451,6 @@ class ComponentTest
 	{
 		// Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
 
-		t.reset();
-
 		Wire a = new Wire(t, 1, 2);
 		Wire b = new Wire(t, 1, 2);
 		Wire c = new Wire(t, 1, 2);