Junit XML: Fix invalid characters in generated report

When generating reports with invalid characters, Azure Pipelines will report an error and not parse the file. This applies to any character not in the allowed character range of XML 1.0 specification [1]. Fixed by removing all invalid characters before serialization. [1] https://www.w3.org/TR/REC-xml/#charsets
logmanoriginal · Jan 7, 2024 · 11379cd · 11379cd
1 parent ec4f2e1
commit 11379cd
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 19 deletions.
diff --git a/Caraya JUnit for Azure Pipelines.lvproj b/Caraya JUnit for Azure Pipelines.lvproj
@@ -18,6 +18,7 @@
 		</Item>
 		<Item Name="Tests" Type="Folder">
 			<Item Name="JUnit Conversion Tests.lvlib" Type="Library" URL="../Tests/JUnit Conversion Tests/JUnit Conversion Tests.lvlib"/>
+			<Item Name="JUnit XML Tests.lvlib" Type="Library" URL="../Tests/JUnit XML Tests/JUnit XML Tests.lvlib"/>
 		</Item>
 		<Item Name="JUnit Conversion.lvlib" Type="Library" URL="../JUnit Conversion/JUnit Conversion.lvlib"/>
 		<Item Name="JUnit for Azure Pipelines.lvclass" Type="LVClass" URL="../JUnit for Azure Pipelines/JUnit for Azure Pipelines.lvclass"/>

diff --git a/JUnit XML/JUnit XML.lvlib b/JUnit XML/JUnit XML.lvlib
diff --git a/JUnit XML/Normalize String.vi b/JUnit XML/Normalize String.vi
diff --git a/JUnit XML/Test Case/Serialize.vi b/JUnit XML/Test Case/Serialize.vi
diff --git a/JUnit XML/Test Suite/Serialize.vi b/JUnit XML/Test Suite/Serialize.vi
diff --git a/Tests/JUnit XML Tests/Get Invalid Chars.vi b/Tests/JUnit XML Tests/Get Invalid Chars.vi
diff --git a/Tests/JUnit XML Tests/JUnit XML Tests.lvlib b/Tests/JUnit XML Tests/JUnit XML Tests.lvlib
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Library LVVersion="13008000">
+	<Property Name="NI.Lib.Icon" Type="Bin">%Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5X&lt;A91M&lt;/W-,&lt;'&amp;&lt;9+K1,7Q,&lt;)%N&lt;!NMA3X)DW?-RJ(JQ"I\%%Z,(@`BA#==ZB3RN;]28_,V7@P_W`:R`&gt;HV*SU_WE@\N_XF[3:^^TX\+2YP)D7K6;G-RV3P)R`ZS%=_]J'XP/5N&lt;XH,7V\SEJ?]Z#5P?=J4HP+5JTTFWS%0?=B$DD1G(R/.1==!IT.+D)`B':\B'2Z@9XC':XC':XBUC?%:HO%:HO&amp;R7QT0]!T0]!S0I4&lt;*&lt;)?=:XA-(]X40-X40-VDSGC?"GC4N9(&lt;)"D2,L;4ZGG?ZH%;T&gt;-]T&gt;-]T?.S.%`T.%`T.)^&lt;NF8J4@-YZ$S'C?)JHO)JHO)R&gt;"20]220]230[;*YCK=ASI2F=)1I.Z5/Z5PR&amp;)^@54T&amp;5TT&amp;5TQO&lt;5_INJ6Z;"[(H#&gt;ZEC&gt;ZEC&gt;Z$"(*ETT*ETT*9^B)HO2*HO2*(F.&amp;]C20]C2)GN4UE1:,.[:/+5A?0^NOS?UJ^3&lt;*\9B9GT@7JISVW7*NIFC&lt;)^:$D`5Q9TWE7)M@;V&amp;D,6;M29DVR]6#R],%GC47T9_/=@&gt;Z5V&gt;V57&gt;V5E&gt;V5(OV?^T[FTP?\`?YX7ZRP6\D=LH%_8S/U_E5R_-R$I&gt;$\0@\W/VW&lt;[_"&lt;Y[X&amp;],0^^+,]T_J&gt;`J@_B_]'_.T`$KO.@I"O[^NF!!!!!!</Property>
+	<Property Name="NI.Lib.SourceVersion" Type="Int">318799872</Property>
+	<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
+	<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
+	<Item Name="Support" Type="Folder">
+		<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
+		<Item Name="Get Invalid Chars.vi" Type="VI" URL="../Get Invalid Chars.vi"/>
+	</Item>
+	<Item Name="Normalize String - String with Invalid Character - Normalized String does not contain Invalid Character.vi" Type="VI" URL="../Normalize String - String with Invalid Character - Normalized String does not contain Invalid Character.vi"/>
+	<Item Name="Test Case.Serialize - Invalid character in Classname - XML does not contain invalid character.vi" Type="VI" URL="../Test Case.Serialize - Invalid character in Classname - XML does not contain invalid character.vi"/>
+	<Item Name="Test Case.Serialize - Invalid character in Message - XML does not contain invalid character.vi" Type="VI" URL="../Test Case.Serialize - Invalid character in Message - XML does not contain invalid character.vi"/>
+	<Item Name="Test Case.Serialize - Invalid character in Name - XML does not contain invalid character.vi" Type="VI" URL="../Test Case.Serialize - Invalid character in Name - XML does not contain invalid character.vi"/>
+	<Item Name="Test Case.Serialize - Invalid character in Stack Trace - XML does not contain invalid character.vi" Type="VI" URL="../Test Case.Serialize - Invalid character in Stack Trace - XML does not contain invalid character.vi"/>
+	<Item Name="Test Case.Serialize - Invalid character in Type - XML does not contain invalid character.vi" Type="VI" URL="../Test Case.Serialize - Invalid character in Type - XML does not contain invalid character.vi"/>
+	<Item Name="Test Suite.Serialize - Invalid character in Hostname - XML does not contain invalid character.vi" Type="VI" URL="../Test Suite.Serialize - Invalid character in Hostname - XML does not contain invalid character.vi"/>
+	<Item Name="Test Suite.Serialize - Invalid character in Name - XML does not contain invalid character.vi" Type="VI" URL="../Test Suite.Serialize - Invalid character in Name - XML does not contain invalid character.vi"/>
+	<Item Name="Test Suite.Serialize - Invalid character in Package - XML does not contain invalid character.vi" Type="VI" URL="../Test Suite.Serialize - Invalid character in Package - XML does not contain invalid character.vi"/>
+</Library>
diff --git a/...- String with Invalid Character - Normalized String does not contain Invalid Character.vi b/...- String with Invalid Character - Normalized String does not contain Invalid Character.vi
diff --git a/...se.Serialize - Invalid character in Classname - XML does not contain invalid character.vi b/...se.Serialize - Invalid character in Classname - XML does not contain invalid character.vi
diff --git a/...Case.Serialize - Invalid character in Message - XML does not contain invalid character.vi b/...Case.Serialize - Invalid character in Message - XML does not contain invalid character.vi
diff --git a/...st Case.Serialize - Invalid character in Name - XML does not contain invalid character.vi b/...st Case.Serialize - Invalid character in Name - XML does not contain invalid character.vi
diff --git a/....Serialize - Invalid character in Stack Trace - XML does not contain invalid character.vi b/....Serialize - Invalid character in Stack Trace - XML does not contain invalid character.vi
diff --git a/...st Case.Serialize - Invalid character in Type - XML does not contain invalid character.vi b/...st Case.Serialize - Invalid character in Type - XML does not contain invalid character.vi
diff --git a/...ite.Serialize - Invalid character in Hostname - XML does not contain invalid character.vi b/...ite.Serialize - Invalid character in Hostname - XML does not contain invalid character.vi
diff --git a/...t Suite.Serialize - Invalid character in Name - XML does not contain invalid character.vi b/...t Suite.Serialize - Invalid character in Name - XML does not contain invalid character.vi
diff --git a/...uite.Serialize - Invalid character in Package - XML does not contain invalid character.vi b/...uite.Serialize - Invalid character in Package - XML does not contain invalid character.vi