fixup! Add support for infoset dataType member

Author: stevedlawrence

daffodil-core/src/main/scala/org/apache/daffodil/lib/xml/XMLUtils.scala

@@ -912,6 +912,18 @@ Differences were (path, expected, actual):
     res
   }
 
+  // Normalize xmlns mappings to improve comparisons. Avoids differences in whitespace,
+  // namespace ordering, and bindings like xmlns:xsi which is optionally added by some infoset
+  // outputters that have support for xsi:type
+  private def normalizeMappings(mappings: String): String = {
+    mappings
+      .trim()
+      .split("\\s+")
+      .filterNot(_.startsWith("xmlns:xsi="))
+      .sorted
+      .mkString(" ")
+  }
+
   def computeDiffOne(
     an: Node,
     bn: Node,
@@ -950,8 +962,10 @@ Differences were (path, expected, actual):
         val maybeType: Option[String] = Option(typeA.getOrElse(typeB.getOrElse(null)))
         val nilledA = a.attribute(XSI_NAMESPACE.toString, "nil")
         val nilledB = b.attribute(XSI_NAMESPACE.toString, "nil")
-        val mappingsA = if (checkNamespaces) nsbA.buildString(aParentScope).trim else ""
-        val mappingsB = if (checkNamespaces) nsbB.buildString(bParentScope).trim else ""
+        val mappingsA =
+          if (checkNamespaces) normalizeMappings(nsbA.buildString(aParentScope)) else ""
+        val mappingsB =
+          if (checkNamespaces) normalizeMappings(nsbB.buildString(bParentScope)) else ""
 
         if (labelA != labelB) {
           // different label

daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetOutputter.scala

@@ -59,7 +59,7 @@ class ScalaXMLInfosetOutputter(showFreedInfo: Boolean = false)
   private def getScope(diElem: DIElement): NamespaceBinding = {
     val minScope = diElem.metadata.minimizedScope
     // if including xsi:type is enabled, ensure the xsi namespace is defined on the root element
-    if (getIncludeDataType() && stack.length == 1 && minScope.getPrefix("xsi") == null) {
+    if (getIncludeDataType() && stack.length == 1 && minScope.getURI("xsi") == null) {
       NamespaceBinding("xsi", XMLUtils.XSI_NAMESPACE, minScope)
     } else {
       minScope

daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetOutputter.scala

@@ -114,7 +114,7 @@ class XMLTextInfosetOutputter private (
       }
       // if including xsi:type is enabled, ensure the xsi namespace is defined on the root
       // element
-      if (getIncludeDataType() && !hasStartedRoot && nsbStart.getPrefix("xsi") == null) {
+      if (getIncludeDataType() && !hasStartedRoot && nsbStart.getURI("xsi") == null) {
         writer.write(" xmlns:xsi=\"" + XMLUtils.XSI_NAMESPACE + "\"")
       }
     }