Skip to content

Commit

Permalink
[SUREFIRE-1559] XML Report elements rerunError, rerunFailure, flakyFa…
Browse files Browse the repository at this point in the history 
…ilure, flakyError should contain element stackTrace and should not be simpleContent.
  • Loading branch information
@Tibor17
Tibor17 committed Sep 12, 2018
1 parent 33147ad commit 15475f2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 32 deletions.
12 changes: 12 additions & 0 deletions ...re-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,21 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW
}
}

boolean hasNestedElements = createOutErrElementsInside & stackTrace != null;

if ( stackTrace != null )
{
if ( hasNestedElements )
{
ppw.startElement( "stackTrace" );
}

ppw.writeText( extraEscape( stackTrace, false ) );

if ( hasNestedElements )
{
ppw.endElement();
}
}

if ( createOutErrElementsInside )
Expand Down
66 changes: 34 additions & 32 deletions maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,30 @@
<xs:extension base="xs:string">
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="time" type="SUREFIRE_TIME" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="rerunFailure" nillable="true" minOccurs="0" maxOccurs="unbounded">
<xs:element name="rerunFailure" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="time" type="SUREFIRE_TIME" />
</xs:extension>
</xs:simpleContent>
<xs:sequence>
<xs:element name="stackTrace" type="xs:string"/>
<xs:element name="system-out" type="xs:string" minOccurs="0"/>
<xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="flakyFailure" nillable="true" minOccurs="0" maxOccurs="unbounded">
<xs:element name="flakyFailure" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="time" type="SUREFIRE_TIME" /> </xs:extension>
</xs:simpleContent>
<xs:sequence>
<xs:element name="stackTrace" type="xs:string"/>
<xs:element name="system-out" type="xs:string" minOccurs="0"/>
<xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="skipped" nillable="true" minOccurs="0" maxOccurs="1">
Expand All @@ -92,28 +92,30 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="rerunError" nillable="true" minOccurs="0" maxOccurs="unbounded">
<xs:element name="rerunError" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="time" type="SUREFIRE_TIME" /> </xs:extension>
</xs:simpleContent>
<xs:sequence>
<xs:element name="stackTrace" type="xs:string"/>
<xs:element name="system-out" type="xs:string" minOccurs="0"/>
<xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="flakyError" nillable="true" minOccurs="0" maxOccurs="unbounded">
<xs:element name="flakyError" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="time" type="SUREFIRE_TIME" /> </xs:extension>
</xs:simpleContent>
<xs:sequence>
<xs:element name="stackTrace" type="xs:string"/>
<xs:element name="system-out" type="xs:string" minOccurs="0"/>
<xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="message" type="xs:string"/>
<xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="system-out" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="system-err" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="system-out" type="xs:string" minOccurs="0"/>
<xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="classname" type="xs:string"/>
Expand Down

0 comments on commit 15475f2

Please sign in to comment.