projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Timeline now passed via constructor
[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
cb0494e
..
28dc1cc
100644
(file)
--- a/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
+++ b/
era.mi/src/era/mi/logic/tests/TestBitDisplay.java
@@
-4,17
+4,17
@@
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.util.function.LongConsumer;
import java.util.function.LongConsumer;
-import era.mi.logic.Simulation;
import era.mi.logic.components.BitDisplay;
import era.mi.logic.components.BitDisplay;
+import era.mi.logic.timeline.Timeline;
import era.mi.logic.types.Bit;
import era.mi.logic.types.Bit;
-import era.mi.logic.wires.Wire.
Wire
End;
+import era.mi.logic.wires.Wire.
Read
End;
public final class TestBitDisplay extends BitDisplay
{
public final class TestBitDisplay extends BitDisplay
{
- public TestBitDisplay(
Wire
End in)
+ public TestBitDisplay(
Timeline timeline, Read
End in)
{
{
- super(in);
+ super(
timeline,
in);
}
public void assertDisplays(Bit... expected)
}
public void assertDisplays(Bit... expected)
@@
-24,16
+24,16
@@
public final class TestBitDisplay extends BitDisplay
public void assertAfterSimulationIs(Bit... expected)
{
public void assertAfterSimulationIs(Bit... expected)
{
-
Simulation.TIMELINE
.executeAll();
+
timeline
.executeAll();
assertDisplays(expected);
}
public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
{
assertDisplays(expected);
}
public void assertAfterSimulationIs(LongConsumer r, Bit... expected)
{
- while (
Simulation.TIMELINE
.hasNext())
+ while (
timeline
.hasNext())
{
{
-
Simulation.TIMELINE
.executeNext();
- r.accept(
Simulation.TIMELINE
.getSimulationTime());
+
timeline
.executeNext();
+ r.accept(
timeline
.getSimulationTime());
}
assertDisplays(expected);
}
}
assertDisplays(expected);
}