Moved main memory to machine module

[Mograsim.git] / net.mograsim.logic.core / test / net / mograsim / logic / core / tests / ComponentTest.java

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 9c5a615..f3f05bb 100644 (file)
--- 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;\r
 import static org.junit.jupiter.api.Assertions.fail;\r
 \r
+import java.math.BigInteger;\r
+import java.util.Random;\r
 import java.util.function.LongConsumer;\r
 \r
+import org.junit.Before;\r
 import org.junit.jupiter.api.Test;\r
 \r
 import net.mograsim.logic.core.components.Connector;\r
@@ -32,6 +35,12 @@ class ComponentTest
 {\r
        private Timeline t = new Timeline(11);\r
 \r
+       @Before\r
+       void resetTimeline()\r
+       {\r
+               t.reset();\r
+       }\r
+\r
        @Test\r
        void circuitExampleTest()\r
        {\r
@@ -59,7 +68,6 @@ class ComponentTest
        @Test\r
        void splitterTest()\r
        {\r
-               t.reset();\r
                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);\r
                in.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
                new Splitter(t, in.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), c.createReadWriteEnd());\r
@@ -74,7 +82,6 @@ class ComponentTest
        @Test\r
        void mergerTest()\r
        {\r
-               t.reset();\r
                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);\r
                a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);\r
                b.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO);\r
@@ -90,7 +97,6 @@ class ComponentTest
        @Test\r
        void fusionTest1()\r
        {\r
-               t.reset();\r
                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);\r
                Wire.fuse(a, out, 0, 0, a.length);\r
                Wire.fuse(b, out, 0, a.length, b.length);\r
@@ -121,7 +127,6 @@ class ComponentTest
        @Test\r
        void fusionTest2()\r
        {\r
-               t.reset();\r
                Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);\r
                Wire.fuse(a, b);\r
                ReadWriteEnd rw = a.createReadWriteEnd();\r
@@ -136,7 +141,6 @@ class ComponentTest
        @Test\r
        void fusionTest3()\r
        {\r
-               t.reset();\r
                Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);\r
                a.createReadWriteEnd().feedSignals(Bit.Z, Bit.U, Bit.X);\r
                t.executeAll();\r
@@ -193,7 +197,6 @@ class ComponentTest
        @Test\r
        void muxTest()\r
        {\r
-               t.reset();\r
                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);\r
                ReadWriteEnd selectIn = select.createReadWriteEnd();\r
 \r
@@ -221,7 +224,6 @@ class ComponentTest
        @Test\r
        void demuxTest()\r
        {\r
-               t.reset();\r
                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);\r
                ReadWriteEnd selectIn = select.createReadWriteEnd();\r
 \r
@@ -254,7 +256,6 @@ class ComponentTest
        @Test\r
        void andTest()\r
        {\r
-               t.reset();\r
                Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1);\r
                new AndGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
@@ -268,7 +269,6 @@ class ComponentTest
        @Test\r
        void orTest()\r
        {\r
-               t.reset();\r
                Wire a = new Wire(t, 4, 1), b = new Wire(t, 4, 3), c = new Wire(t, 4, 1);\r
                new OrGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
@@ -282,7 +282,6 @@ class ComponentTest
        @Test\r
        void nandTest()\r
        {\r
-               t.reset();\r
                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);\r
                new NandGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
@@ -297,7 +296,6 @@ class ComponentTest
        @Test\r
        void norTest()\r
        {\r
-               t.reset();\r
                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);\r
                new NorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
@@ -312,7 +310,6 @@ class ComponentTest
        @Test\r
        void xorTest()\r
        {\r
-               t.reset();\r
                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);\r
                new XorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
@@ -327,7 +324,6 @@ class ComponentTest
        @Test\r
        void notTest()\r
        {\r
-               t.reset();\r
                Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 2);\r
                new NotGate(t, 1, a.createReadOnlyEnd(), b.createReadWriteEnd());\r
                a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
@@ -340,7 +336,6 @@ class ComponentTest
        @Test\r
        void rsLatchCircuitTest()\r
        {\r
-               t.reset();\r
                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),\r
                                nq = new Wire(t, 1, 1);\r
 \r
@@ -376,8 +371,6 @@ class ComponentTest
        @Test\r
        void numericValueTest()\r
        {\r
-               t.reset();\r
-\r
                Wire a = new Wire(t, 4, 1);\r
                a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);\r
 \r
@@ -426,7 +419,6 @@ class ComponentTest
        @Test\r
        void multipleInputs()\r
        {\r
-               t.reset();\r
                Wire w = new Wire(t, 2, 1);\r
                ReadWriteEnd wI1 = w.createReadWriteEnd(), wI2 = w.createReadWriteEnd();\r
                wI1.feedSignals(Bit.ONE, Bit.Z);\r
@@ -459,8 +451,6 @@ class ComponentTest
        {\r
                // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde\r
 \r
-               t.reset();\r
-\r
                Wire a = new Wire(t, 1, 2);\r
                Wire b = new Wire(t, 1, 2);\r
                Wire c = new Wire(t, 1, 2);\r