Merged logic into master

[Mograsim.git] / era.mi / src / era / mi / logic / tests / TestBitDisplay.java

diff --git a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
index d821752..cb0494e 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -1,47 +1,47 @@
-package era.mi.logic.tests;\r
-\r
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;\r
-\r
-import java.util.function.LongConsumer;\r
-\r
-import era.mi.logic.Simulation;\r
-import era.mi.logic.components.BitDisplay;\r
-import era.mi.logic.types.Bit;\r
-import era.mi.logic.wires.Wire.WireEnd;\r
-\r
-public final class TestBitDisplay extends BitDisplay\r
-{\r
-\r
-       public TestBitDisplay(WireEnd in)\r
-       {\r
-               super(in);\r
-       }\r
-\r
-       public void assertDisplays(Bit... expected)\r
-       {\r
-               assertArrayEquals(expected, getDisplayedValue().getBits());\r
-       }\r
-\r
-       public void assertAfterSimulationIs(Bit... expected)\r
-       {\r
-               Simulation.TIMELINE.executeAll();\r
-               assertDisplays(expected);\r
-       }\r
-\r
-       public void assertAfterSimulationIs(LongConsumer r, Bit... expected)\r
-       {\r
-               while (Simulation.TIMELINE.hasNext())\r
-               {\r
-                       Simulation.TIMELINE.executeNext();\r
-                       r.accept(Simulation.TIMELINE.getSimulationTime());\r
-               }\r
-               assertDisplays(expected);\r
-       }\r
-\r
-       @Override\r
-       protected void compute()\r
-       {\r
-               super.compute();\r
-               System.out.println("update: value is " + getDisplayedValue());\r
-       }\r
-}\r
+package era.mi.logic.tests;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import java.util.function.LongConsumer;
+
+import era.mi.logic.Simulation;
+import era.mi.logic.components.BitDisplay;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire.WireEnd;
+
+public final class TestBitDisplay extends BitDisplay
+{
+
+       public TestBitDisplay(WireEnd in)
+       {
+               super(in);
+       }
+
+       public void assertDisplays(Bit... expected)
+       {
+               assertArrayEquals(expected, getDisplayedValue().getBits());
+       }
+
+       public void assertAfterSimulationIs(Bit... expected)
+       {
+               Simulation.TIMELINE.executeAll();
+               assertDisplays(expected);
+       }
+
+       public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
+       {
+               while (Simulation.TIMELINE.hasNext())
+               {
+                       Simulation.TIMELINE.executeNext();
+                       r.accept(Simulation.TIMELINE.getSimulationTime());
+               }
+               assertDisplays(expected);
+       }
+
+       @Override
+       protected void compute()
+       {
+               super.compute();
+               System.out.println("update: value is " + getDisplayedValue());
+       }
+}