projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Timeline events notify the simulation thread now
[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
a448eb0
..
cb0494e
100644
(file)
--- 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 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(WireArray in) {
+ public TestBitDisplay(WireEnd in)
+ {
super(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);
}
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());
}
Simulation.TIMELINE.executeNext();
r.accept(Simulation.TIMELINE.getSimulationTime());
}
@@
-34,8
+39,9
@@
public final class TestBitDisplay extends BitDisplay {
}
@Override
}
@Override
- protected void compute() {
+ protected void compute()
+ {
super.compute();
super.compute();
- System.out.println("update: value is " +
Arrays.toString(getDisplayedValue()
));
+ System.out.println("update: value is " +
getDisplayedValue(
));
}
}
}
}