projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged logicui 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
be4d95a
..
cb0494e
100644
(file)
--- a/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@
-2,25
+2,24
@@
package era.mi.logic.tests;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import java.util.Arrays;
import java.util.function.LongConsumer;
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.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(Wire
Array
in)
+ public TestBitDisplay(Wire
End
in)
{
super(in);
}
public void assertDisplays(Bit... expected)
{
{
super(in);
}
public void assertDisplays(Bit... expected)
{
- assertArrayEquals(expected, getDisplayedValue());
+ assertArrayEquals(expected, getDisplayedValue()
.getBits()
);
}
public void assertAfterSimulationIs(Bit... expected)
}
public void assertAfterSimulationIs(Bit... expected)
@@
-43,6
+42,6
@@
public final class TestBitDisplay extends BitDisplay
protected void compute()
{
super.compute();
protected void compute()
{
super.compute();
- System.out.println("update: value is " +
Arrays.toString(getDisplayedValue()
));
+ System.out.println("update: value is " +
getDisplayedValue(
));
}
}
}
}