TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-10 05:15:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cliTestPercent'

Browse Source
This commit is contained in:
hneemann 2020-08-05 18:08:12 +02:00
commit 3e88b262ba
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/neemann/digital/cli/CommandLineTester.java
View File

@ -97,7 +97,12 @@ public class CommandLineTester {
out.println(label + ": passed"); out.println(label + ": passed");
testsPassed++; testsPassed++;
} else { } else {
out.println(label + ": failed"); String message = label + ": failed";
if (te.isErrorOccurred())
message += " due to an error";
else
message += " (" + te.failedPercent() + "%)";
out.println(message);
errorCount++; errorCount++;
} }
errorDetector.check(); errorDetector.check();

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

@ -28,7 +28,9 @@ public class TestExecutor {
private final ArrayList<String> names; private final ArrayList<String> names;
private final LineEmitter lines; private final LineEmitter lines;
private final ValueTable results; private final ValueTable results;
private boolean allPassed; private boolean errorOccurred;
private int failedCount;
private int passedCount;
private boolean toManyResults = false; private boolean toManyResults = false;
private ArrayList<TestSignal> inputs; private ArrayList<TestSignal> inputs;
private ArrayList<TestSignal> outputs; private ArrayList<TestSignal> outputs;
@ -58,7 +60,6 @@ public class TestExecutor {
* @throws ParserException ParserException * @throws ParserException ParserException
*/ */
public TestExecutor create(Model model) throws TestingDataException, NodeException, ParserException { public TestExecutor create(Model model) throws TestingDataException, NodeException, ParserException {
allPassed = true;
HashSet<String> usedSignals = new HashSet<>(); HashSet<String> usedSignals = new HashSet<>();
inputs = new ArrayList<>(); inputs = new ArrayList<>();
@ -112,7 +113,7 @@ public class TestExecutor {
model.init(); model.init();
model.addObserver(event -> { model.addObserver(event -> {
if (event.getType() == ModelEventType.ERROR_OCCURRED) if (event.getType() == ModelEventType.ERROR_OCCURRED)
allPassed = false; errorOccurred = true;
}, ModelEventType.ERROR_OCCURRED); }, ModelEventType.ERROR_OCCURRED);
lines.emitLines(new LineListenerResolveDontCare(values -> checkRow(model, values), inputs), new Context().setModel(model)); lines.emitLines(new LineListenerResolveDontCare(values -> checkRow(model, values), inputs), new Context().setModel(model));
@ -168,7 +169,7 @@ public class TestExecutor {
model.doStep(); model.doStep();
} catch (RuntimeException e) { } catch (RuntimeException e) {
allPassed = false; errorOccurred = true;
throw e; throw e;
} }
@ -176,11 +177,14 @@ public class TestExecutor {
for (TestSignal out : outputs) { for (TestSignal out : outputs) {
MatchedValue matchedValue = new MatchedValue(values[out.index], out.value); MatchedValue matchedValue = new MatchedValue(values[out.index], out.value);
res[out.index] = matchedValue; res[out.index] = matchedValue;
if (!matchedValue.isPassed()) { if (!matchedValue.isPassed())
allPassed = false;
ok = false; ok = false;
} }
}
if (ok)
passedCount++;
else
failedCount++;
if (visibleRows < (ok ? MAX_RESULTS : ERR_RESULTS)) { if (visibleRows < (ok ? MAX_RESULTS : ERR_RESULTS)) {
visibleRows++; visibleRows++;
@ -205,9 +209,27 @@ public class TestExecutor {
* @return true if all tests have passed * @return true if all tests have passed
*/ */
public boolean allPassed() { public boolean allPassed() {
return allPassed; return !errorOccurred && failedCount == 0 && passedCount > 0;
} }
/**
* @return true if the test failed due to an error
*/
public boolean isErrorOccurred() {
return errorOccurred;
}
/**
* @return the percentage of failed test rows
*/
public int failedPercent() {
if (passedCount == 0)
return 100;
int p = 100 * failedCount / passedCount;
if (p == 0 && failedCount > 0)
p = 1;
return p;
}
/** /**
* Indicates if there are to many entries in the table to show. * Indicates if there are to many entries in the table to show.