Skip to content

Commit fed2e25

Browse files
committed
Merge remote-tracking branch 'upstream/octane-dev-latest' into octane-dev-latest
2 parents 8fdc83f + b533109 commit fed2e25

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/java/com/microfocus/application/automation/tools/octane/tests/junit/JUnitTestResult.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ public void writeXmlElement(XMLStreamWriter writer) throws XMLStreamException {
117117
writer.writeAttribute("message", String.valueOf(testError.getErrorMsg()));
118118
writer.writeCharacters(testError.getStackTraceStr());
119119
writer.writeEndElement();
120+
} else if (testError != null && testError.getErrorMsg() != null) {//warning case
121+
writer.writeStartElement("error");
122+
writer.writeAttribute("message", String.valueOf(testError.getErrorMsg()));
123+
writer.writeEndElement();
120124
}
121125

122126
if (description != null && !description.isEmpty()) {

src/main/java/com/microfocus/application/automation/tools/octane/tests/junit/JUnitXmlIterator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ protected void onEvent(XMLEvent event) throws XMLStreamException, IOException, I
165165
String stdoutValue = readNextValue();
166166
if (stdoutValue != null) {
167167
if (hpRunnerType.equals(HPRunnerType.UFT) && stdoutValue.contains("Test result: Warning")) {
168-
status = TestResultStatus.FAILED;
169168
errorMsg = "Test ended with 'Warning' status.";
170169
}
171170

0 commit comments

Comments
 (0)