[JENKINS-51767] xUnit 2.x XSD does not validate NUnit 2.x XML report …

…file Fix original NUnit 2.x XSD file to validate the report file when there are test-suite and test-case alternate elements as children of a test-suite element.
jenkinsci · Jun 8, 2018 · 354a5981c1cada514926d62a2712a750311931a8 · 354a598
1 parent 4e45887
commit 354a5981c1cada514926d62a2712a750311931a8
diff --git a/src/main/resources/org/jenkinsci/plugins/xunit/types/nunit-2.x.xsd b/src/main/resources/org/jenkinsci/plugins/xunit/types/nunit-2.x.xsd
@@ -13,7 +13,7 @@
 	</xs:complexType>
 	<xs:element name="message" type="xs:string" />
 	<xs:complexType name="resultsType">
-  
-		<xs:choice>
+  
+		<xs:choice maxOccurs="unbounded">
 			<xs:element name="test-suite" type="test-suiteType" maxOccurs="unbounded" />
 			<xs:element name="test-case" type="test-caseType" maxOccurs="unbounded" minOccurs="0" />
 		</xs:choice>

diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/NUnitTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/NUnitTest.java
@@ -48,7 +48,8 @@
                                              { "JENKINS-51481 report produced by DUnit to NUnit logger", 10 }, //
                                              { "JENKINS-51556 works", 11 }, //
                                              { "JENKINS-51556 cause JEP-200 issue", 12 }, //
-  
-                                              { "JENKINS-51561 NUnit 3.x produce report in NUnit 2.x format", 13 } //
+  
+                                              { "JENKINS-51561 NUnit 3.x produce report in NUnit 2.x format", 13 }, //
+  
+                                              { "JENKINS-51767", 14 } //
        });
    }