Skip to content

Commit accc46c

Browse files
assert test != null for PostTestEvent
Old logic would have thrown an NullPointerException.
1 parent c847c87 commit accc46c

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -325,28 +325,25 @@ assert logFalseCondition(test != null, () -> "Could not find test id \"" + event
325325

326326
private void doProcess(final PostTestEvent event) {
327327
final Test test = run.getTest(event.getId());
328-
if (test == null) {
329-
logger.severe(() -> "Could not find test id \"" + event.getId() + "\" when processing PostTestEvent "
330-
+ event.toString() + ".");
328+
assert logFalseCondition(test != null, () -> "Could not find test id \"" + event.getId()
329+
+ "\" when processing PostTestEvent " + event.toString() + ".");
330+
test.setStartTime(event.getStartTime());
331+
test.setEndTime(event.getEndTime());
332+
test.setExecutionTime(event.getExecutionTime());
333+
test.setCounter(event.getCounter());
334+
test.setErrorStack(event.getErrorStack());
335+
test.setServerOutput(event.getServerOutput());
336+
if (test.getServerOutput() != null) {
337+
run.setInfoCount(run.getInfoCount() + 1);
338+
}
339+
test.setFailedExpectations(event.getFailedExpectations());
340+
test.setWarnings(event.getWarnings());
341+
if (test.getWarnings() != null) {
342+
test.getCounter().setWarning(1);
331343
} else {
332-
test.setStartTime(event.getStartTime());
333-
test.setEndTime(event.getEndTime());
334-
test.setExecutionTime(event.getExecutionTime());
335-
test.setCounter(event.getCounter());
336-
test.setErrorStack(event.getErrorStack());
337-
test.setServerOutput(event.getServerOutput());
338-
if (test.getServerOutput() != null) {
339-
run.setInfoCount(run.getInfoCount() + 1);
340-
}
341-
test.setFailedExpectations(event.getFailedExpectations());
342-
test.setWarnings(event.getWarnings());
343-
if (test.getWarnings() != null) {
344-
test.getCounter().setWarning(1);
345-
} else {
346-
test.getCounter().setWarning(0);
347-
}
348-
run.getCounter().setWarning(run.getCounter().getWarning() + test.getCounter().getWarning());
344+
test.getCounter().setWarning(0);
349345
}
346+
run.getCounter().setWarning(run.getCounter().getWarning() + test.getCounter().getWarning());
350347
run.getCounter().setDisabled(run.getCounter().getDisabled() + event.getCounter().getDisabled());
351348
run.getCounter().setSuccess(run.getCounter().getSuccess() + event.getCounter().getSuccess());
352349
run.getCounter().setFailure(run.getCounter().getFailure() + event.getCounter().getFailure());

0 commit comments

Comments
 (0)