projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated new types, tests still work, not used yet
[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
dbacc44
..
9fac0c9
100644
(file)
--- a/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@
-5,15
+5,15
@@
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.util.Arrays;
\r
import java.util.function.LongConsumer;
\r
\r
import java.util.Arrays;
\r
import java.util.function.LongConsumer;
\r
\r
-import era.mi.logic.Bit;
\r
import era.mi.logic.Simulation;
\r
import era.mi.logic.components.BitDisplay;
\r
import era.mi.logic.Simulation;
\r
import era.mi.logic.components.BitDisplay;
\r
-import era.mi.logic.wires.WireArray;
\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
\r
public final class TestBitDisplay extends BitDisplay
\r
{
\r
\r
- public TestBitDisplay(Wire
Array
in)
\r
+ public TestBitDisplay(Wire
End
in)
\r
{
\r
super(in);
\r
}
\r
{
\r
super(in);
\r
}
\r
@@
-32,10
+32,10
@@
public final class TestBitDisplay extends BitDisplay
public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
\r
{
\r
while (Simulation.TIMELINE.hasNext())
\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
+ {
\r
+ Simulation.TIMELINE.executeNext();
\r
+ r.accept(Simulation.TIMELINE.getSimulationTime());
\r
+ }
\r
assertDisplays(expected);
\r
}
\r
\r
assertDisplays(expected);
\r
}
\r
\r