X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftests%2FComponentTest.java;h=b015d21aaae62341aa742024807a376775bdb3b5;hb=a12025ee38a7c1c7539890d799c8bae1222a1136;hp=a47f7921e2ade2497f02d4baaa1b53cac19f1464;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java index a47f7921..b015d21a 100644 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java +++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java @@ -1,6 +1,5 @@ package net.mograsim.logic.core.tests; -import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -26,6 +25,7 @@ import net.mograsim.logic.core.wires.Wire; import net.mograsim.logic.core.wires.Wire.ReadEnd; import net.mograsim.logic.core.wires.Wire.ReadWriteEnd; +@SuppressWarnings("unused") class ComponentTest { private Timeline t = new Timeline(11); @@ -295,19 +295,19 @@ class ComponentTest t.addEvent((e) -> { if (!flag) - fail(); + fail("Events executed out of order!"); flag = false; }, 15); t.addEvent((e) -> { if (flag) - fail(); + fail("Events executed out of order!"); flag = true; }, 10); t.addEvent((e) -> { if (flag) - fail(); + fail("Events executed out of order!"); flag = true; }, 20); t.addEvent((e) -> @@ -318,7 +318,7 @@ class ComponentTest t.executeUntil(t.laterThan(20), 100); if (!flag) - fail(); + fail("Not all events were executed in order!"); } @Test @@ -342,12 +342,12 @@ class ComponentTest wI2.feedSignals(Bit.ONE, Bit.Z); ReadEnd rE = w.createReadOnlyEnd(); - rE.addObserver((i, oldValues) -> fail("WireEnd notified observer, although value did not change.")); + rE.registerObserver((i) -> fail("WireEnd notified observer, although value did not change.")); t.executeAll(); rE.close(); wI1.feedSignals(Bit.X, Bit.X); t.executeAll(); - wI1.addObserver((i, oldValues) -> fail("WireEnd notified observer, although it was closed.")); + wI1.registerObserver((i) -> fail("WireEnd notified observer, although it was closed.")); wI1.close(); assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z); }