Adjusting the text compare to ignore whitespace.

build/ci-cd/python/xmlComparison.py

@@ -1,5 +1,6 @@
 # imports
 import sys
+import re
 from lxml import etree
 from printColors import bcolors
 
@@ -35,7 +36,11 @@ def compareElements(e1, e2, xpath, position):
                 print(bcolors.FAIL + "Different attribute values at path: "+xpath+"/@"+ attrKey + bcolors.ENDC)
                 retval = False
     # check text
-    if e1.text != e2.text:
+    xstr = lambda s: s or ""
+    pattern = "\s+"
+    text1 = re.sub(pattern, xstr(e1.text), "")
+    text2 = re.sub(pattern, xstr(e2.text), "")
+    if text1 != text2:
         print(bcolors.FAIL + "Different text at path: "+xpath+"/text()" + bcolors.ENDC)
         retval = False
 
@@ -68,8 +73,9 @@ def compareElements(e1, e2, xpath, position):
 xml2 = sys.argv[2]
 
 # parse the documents
-doc1 = etree.parse(xml1)
-doc2 = etree.parse(xml2)
+parser = etree.XMLParser(remove_comments=True,remove_blank_text=True,collect_ids=False)
+doc1 = etree.parse(xml1, parser)
+doc2 = etree.parse(xml2, parser)
 
 # get the root element
 root1 = doc1.getroot()

build/ci-cd/validate-round-trips.sh

@@ -106,7 +106,7 @@ while IFS="|" read path format model converttoformats || [[ -n "$path" ]]; do
         fi
 
         # compare the XML files to see if there is data loss
-        echo "${P_INFO}Checking XML->JSON->XML conversion for '${P_END}${file}${P_ERROR}'.${P_END}\n"
+        echo "${P_INFO}Checking XML->JSON->XML conversion for '${P_END}${file}${P_ERROR}'.${P_END}"
         python ${OSCALDIR}/build/ci-cd/python/xmlComparison.py "$back_to_xml" "$file"
         cmd_exitcode=$?
         if [ $cmd_exitcode != 0 ]; then