X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FTestBitDisplay.java;h=d821752b830f5a84069697792da49614c48652b5;hb=70afb26181aba8de30ea6f796ea5c2a573d9ecab;hp=d7c715dec4d201df321e2fd50e385b55f133d55f;hpb=72b00816f86e5d34d871c87fea76a94ffca25246;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 d7c715de..d821752b 100644
--- a/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@ -2,31 +2,36 @@ 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.types.Bit;
+import era.mi.logic.wires.Wire.WireEnd;
 
-public final class TestBitDisplay extends BitDisplay {
+public final class TestBitDisplay extends BitDisplay
+{
 
-	public TestBitDisplay(WireArray in) {
+	public TestBitDisplay(WireEnd in)
+	{
 		super(in);
 	}
 
-	public void assertDisplays(Bit... expected) {
-		assertArrayEquals(expected, getDisplayedValue());
+	public void assertDisplays(Bit... expected)
+	{
+		assertArrayEquals(expected, getDisplayedValue().getBits());
 	}
 
-	public void assertAfterSimulationIs(Bit... expected) {
+	public void assertAfterSimulationIs(Bit... expected)
+	{
 		Simulation.TIMELINE.executeAll();
 		assertDisplays(expected);
 	}
 
-	public void assertAfterSimulationIs(LongConsumer r, Bit... expected) {
-		while (Simulation.TIMELINE.hasNext()) {
+	public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
+	{
+		while (Simulation.TIMELINE.hasNext())
+		{
 			Simulation.TIMELINE.executeNext();
 			r.accept(Simulation.TIMELINE.getSimulationTime());
 		}
@@ -34,8 +39,9 @@ public final class TestBitDisplay extends BitDisplay {
 	}
 
 	@Override
-	protected void compute() {
+	protected void compute()
+	{
 		super.compute();
-		System.out.println("update: value is " + Arrays.toString(getDisplayedValue()));
+		System.out.println("update: value is " + getDisplayedValue());
 	}
 }