TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 23:36:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved the init code to the constructor

Browse Source
This commit is contained in:
hneemann 2020-11-28 09:39:04 +01:00
parent c56e921728
commit 71cc6fc8ec
1 changed files with 73 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/main/java/de/neemann/digital/testing/TestExecutor.java
View File

@ -33,14 +33,14 @@ public class TestExecutor {
private final Model model; private final Model model;
private final LineEmitter lines; private final LineEmitter lines;
private final ValueTable results; private final ValueTable results;
private final ArrayList<VirtualSignal> virtualSignals; private final Context context;
private final ArrayList<TestSignal> inputs;
private final ArrayList<TestSignal> outputs;
private boolean errorOccurred; private boolean errorOccurred;
private int failedCount; private int failedCount;
private int passedCount; private int passedCount;
private int rowCount; private int rowCount;
private boolean toManyResults = false; private boolean toManyResults = false;
private ArrayList<TestSignal> inputs;
private ArrayList<TestSignal> outputs;
private int visibleRows; private int visibleRows;
private boolean allowMissingInputs; private boolean allowMissingInputs;
@ -79,21 +79,84 @@ public class TestExecutor {
*/ */
public TestExecutor(TestCaseDescription testCase, Model model) throws TestingDataException { public TestExecutor(TestCaseDescription testCase, Model model) throws TestingDataException {
names = testCase.getNames(); names = testCase.getNames();
virtualSignals = testCase.getVirtualSignals();
this.model = model; this.model = model;
results = new ValueTable(names); results = new ValueTable(names);
visibleRows = 0; visibleRows = 0;
lines = testCase.getLines(); lines = testCase.getLines();
HashSet<String> usedSignals = new HashSet<>();
inputs = new ArrayList<>();
outputs = new ArrayList<>();
for (Signal s : model.getInputs()) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
inputs.add(new TestSignal(index, s.getValue()));
addTo(usedSignals, s.getName());
}
ObservableValue outValue = s.getBidirectionalReader();
if (outValue != null) {
final String outName = s.getName() + "_out";
final int inIndex = getIndexOf(outName);
if (inIndex >= 0) {
outputs.add(new TestSignal(inIndex, outValue));
addTo(usedSignals, outName);
}
}
}
for (Clock c : model.getClocks()) {
final int index = getIndexOf(c.getLabel());
if (index >= 0) {
inputs.add(new TestSignal(index, c.getClockOutput()));
addTo(usedSignals, c.getLabel());
}
}
for (Signal s : model.getOutputs()) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
outputs.add(new TestSignal(index, s.getValue()));
addTo(usedSignals, s.getName());
}
}
context = new Context().setModel(model);
for (VirtualSignal s : testCase.getVirtualSignals()) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
outputs.add(new TestSignal(index, s.getValue(context)));
addTo(usedSignals, s.getName());
}
}
for (String name : names)
if (!usedSignals.contains(name))
if (allowMissingInputs)
inputs.add(new TestSignal(getIndexOf(name), null));
else
throw new TestingDataException(Lang.get("err_testSignal_N_notFound", name));
if (inputs.size() == 0)
throw new TestingDataException(Lang.get("err_noTestInputSignalsDefined"));
if (outputs.size() == 0)
throw new TestingDataException(Lang.get("err_noTestOutputSignalsDefined"));
model.init();
model.addObserver(event -> {
if (event.getType() == ModelEventType.ERROR_OCCURRED)
errorOccurred = true;
}, ModelEventType.ERROR_OCCURRED);
} }
/** /**
* Sets the model to the given row. * Sets the model to the given row.
* *
* @param row the row to advance the model to * @param row the row to advance the model to
* @throws TestingDataException DataException * @throws ParserException ParserException
* @throws ParserException ParserException
*/ */
public void executeTo(int row) throws TestingDataException, ParserException { public void executeTo(int row) throws ParserException {
execute(new LineListener() { execute(new LineListener() {
private int r = row; private int r = row;
@ -114,10 +177,9 @@ public class TestExecutor {
* Creates the result by comparing the testing vector with the given model * Creates the result by comparing the testing vector with the given model
* *
* @return the result of the test execution * @return the result of the test execution
* @throws TestingDataException DataException
* @throws ParserException ParserException * @throws ParserException ParserException
*/ */
public TestExecutor.Result execute() throws TestingDataException, ParserException { public TestExecutor.Result execute() throws ParserException {
return execute(values -> checkRow(model, values), true); return execute(values -> checkRow(model, values), true);
} }
@ -127,78 +189,11 @@ public class TestExecutor {
* @param lineListener the line listener to use * @param lineListener the line listener to use
* @param closeModel if true the model is closed * @param closeModel if true the model is closed
* @return the result of the test execution * @return the result of the test execution
* @throws TestingDataException DataException * @throws ParserException ParserException
* @throws ParserException ParserException
*/ */
private TestExecutor.Result execute(LineListener lineListener, boolean closeModel) throws TestingDataException, ParserException { private TestExecutor.Result execute(LineListener lineListener, boolean closeModel) throws ParserException {
try { try {
HashSet<String> usedSignals = new HashSet<>();
inputs = new ArrayList<>();
outputs = new ArrayList<>();
for (Signal s : model.getInputs()) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
inputs.add(new TestSignal(index, s.getValue()));
addTo(usedSignals, s.getName());
}
ObservableValue outValue = s.getBidirectionalReader();
if (outValue != null) {
final String outName = s.getName() + "_out";
final int inIndex = getIndexOf(outName);
if (inIndex >= 0) {
outputs.add(new TestSignal(inIndex, outValue));
addTo(usedSignals, outName);
}
}
}
for (Clock c : model.getClocks()) {
final int index = getIndexOf(c.getLabel());
if (index >= 0) {
inputs.add(new TestSignal(index, c.getClockOutput()));
addTo(usedSignals, c.getLabel());
}
}
for (Signal s : model.getOutputs()) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
outputs.add(new TestSignal(index, s.getValue()));
addTo(usedSignals, s.getName());
}
}
Context context = new Context().setModel(model);
for (VirtualSignal s : virtualSignals) {
final int index = getIndexOf(s.getName());
if (index >= 0) {
outputs.add(new TestSignal(index, s.getValue(context)));
addTo(usedSignals, s.getName());
}
}
for (String name : names)
if (!usedSignals.contains(name))
if (allowMissingInputs)
inputs.add(new TestSignal(getIndexOf(name), null));
else
throw new TestingDataException(Lang.get("err_testSignal_N_notFound", name));
if (inputs.size() == 0)
throw new TestingDataException(Lang.get("err_noTestInputSignalsDefined"));
if (outputs.size() == 0)
throw new TestingDataException(Lang.get("err_noTestOutputSignalsDefined"));
model.init();
model.addObserver(event -> {
if (event.getType() == ModelEventType.ERROR_OCCURRED)
errorOccurred = true;
}, ModelEventType.ERROR_OCCURRED);
lines.emitLines(new LineListenerResolveDontCare(lineListener, inputs), context); lines.emitLines(new LineListenerResolveDontCare(lineListener, inputs), context);
return new Result(); return new Result();
} finally { } finally {
if (closeModel) if (closeModel)