X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FTestBitDisplay.java;h=28dc1cc1bd65feea62e20b2236ca04f0adf2f1be;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=9913116354f4179f3c0b2207aa56e6c9c50194e8;hpb=d31f9734d6aa233682ef80d7e9322dd500123bfd;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
index 99131163..28dc1cc1 100644
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -2,40 +2,39 @@ package era.mi.logic.tests;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-import java.util.Arrays;
 import java.util.function.LongConsumer;
 
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
 import era.mi.logic.components.BitDisplay;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire.ReadEnd;
 
 public final class TestBitDisplay extends BitDisplay
 {
 
-	public TestBitDisplay(WireArray in)
+	public TestBitDisplay(Timeline timeline, ReadEnd in)
 	{
-		super(in);
+		super(timeline, in);
 	}
 
 	public void assertDisplays(Bit... expected)
 	{
-		assertArrayEquals(expected, getDisplayedValue());
+		assertArrayEquals(expected, getDisplayedValue().getBits());
 	}
 
 	public void assertAfterSimulationIs(Bit... expected)
 	{
-		Simulation.TIMELINE.executeAll();
+		timeline.executeAll();
 		assertDisplays(expected);
 	}
 
 	public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
 	{
-		while (Simulation.TIMELINE.hasNext())
-			{
-				Simulation.TIMELINE.executeNext();
-				r.accept(Simulation.TIMELINE.getSimulationTime());
-			}
+		while (timeline.hasNext())
+		{
+			timeline.executeNext();
+			r.accept(timeline.getSimulationTime());
+		}
 		assertDisplays(expected);
 	}
 
@@ -43,6 +42,6 @@ public final class TestBitDisplay extends BitDisplay
 	protected void compute()
 	{
 		super.compute();
-		System.out.println("update: value is " + Arrays.toString(getDisplayedValue()));
+		System.out.println("update: value is " + getDisplayedValue());
 	}
 }