test: normalize actual values to work with old/new libxml2

Author: kou

test/test-element.lua

@@ -337,13 +337,19 @@ function TestElement.test_append_element()
                        })
 end
 
+local function normalize_attributes_order(text)
+  local normalized_text, n_substitutions =
+    text:gsub([[class="A" id="1"]], [[id="1" class="A"]])
+  return normalized_text
+end
+
 function TestElement.test_append_element_with_attribute()
   local document = xmlua.XML.parse("<root/>")
   local root = document:root()
   local child = root:append_element("child", {id="1", class="A"})
   luaunit.assertEquals({
-                         child:to_xml(),
-                         document:to_xml(),
+                         normalize_attributes_order(child:to_xml()),
+                         normalize_attributes_order(document:to_xml()),
                        },
                        {
                          [[<child id="1" class="A"/>]],
@@ -365,9 +371,9 @@ function TestElement.test_append_element_with_namespace()
   local root = document:root()
   local child = root:append_element("xhtml:child", {id="1", class="A"})
   luaunit.assertEquals({
-                         child:to_xml(),
+                         normalize_attributes_order(child:to_xml()),
                          ffi.string(child.node.ns.href),
-                         document:to_xml(),
+                         normalize_attributes_order(document:to_xml()),
                        },
                        {
                          [[<xhtml:child id="1" class="A"/>]],
@@ -567,8 +573,8 @@ function TestElement.test_insert_element_with_attributes()
   local root = document:root()
   local child = root:insert_element(2, "new-child", {id="1", class="A"})
   luaunit.assertEquals({
-                         child:to_xml(),
-                         document:to_xml(),
+                         normalize_attributes_order(child:to_xml()),
+                         normalize_attributes_order(document:to_xml()),
                        },
                        {
                          [[<new-child id="1" class="A"/>]],
@@ -597,8 +603,8 @@ function TestElement.test_insert_element_with_namespace()
                                     "xhtml:new-child",
                                     {id="1", class="A"})
   luaunit.assertEquals({
-                         child:to_xml(),
-                         document:to_xml(),
+                         normalize_attributes_order(child:to_xml()),
+                         normalize_attributes_order(document:to_xml()),
                        },
                        {
                          [[<xhtml:new-child id="1" class="A"/>]],

test/test-xml-build.lua

@@ -43,6 +43,14 @@ function TestXMLBuild.test_root_namespace()
                        })
 end
 
+local function normalize_attributes_order(text)
+  local normalized_text, n_substitutions =
+    text:gsub([[id="1" class="A"]], [[class="A" id="1"]])
+  normalized_text, n_substitutions =
+    normalized_text:gsub([[id="2" class="B"]], [[class="B" id="2"]])
+  return normalized_text
+end
+
 function TestXMLBuild.test_root_children()
   local tree = {
     "root",
@@ -60,7 +68,7 @@ function TestXMLBuild.test_root_children()
     }
   }
   local document = XML.build(tree)
-  luaunit.assertEquals(document:to_xml(),
+  luaunit.assertEquals(normalize_attributes_order(document:to_xml()),
                        [[
 <?xml version="1.0" encoding="UTF-8"?>
 <root class="A" id="1">This is text.<child class="B" id="2"/></root>
@@ -88,7 +96,7 @@ function TestXMLBuild.test_nested()
     }
   }
   local document = XML.build(tree)
-  luaunit.assertEquals(document:to_xml(),
+  luaunit.assertEquals(normalize_attributes_order(document:to_xml()),
                        [[
 <?xml version="1.0" encoding="UTF-8"?>
 <root class="A" id="1">root text<child class="B" id="2">child text<grand-child/></child></root>