tests: util: Re-write XML for comparison instead of str replacement

qxmpp-project · Nov 8, 2024 · d782d6f · d782d6f
1 parent 03df550
commit d782d6f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/tests/TestClient.h b/tests/TestClient.h
@@ -43,11 +43,14 @@ class TestClient : public QXmppClient
         QCoreApplication::processEvents();
         resetIdCount();
     }
-
     void expect(QString &&packet)
     {
         QVERIFY2(!m_sentPackets.empty(), "No packet was sent!");
-        QCOMPARE(m_sentPackets.takeFirst().replace(u'\'', u'"'), packet.replace(u'\'', u'"'));
+
+        auto expectedXml = rewriteXml(packet);
+        auto actualXml = rewriteXml(m_sentPackets.takeFirst());
+        QCOMPARE(actualXml, expectedXml);
+
         resetIdCount();
     }
     QString takePacket()

diff --git a/tests/util.h b/tests/util.h
@@ -51,6 +51,29 @@ inline QDomElement xmlToDom(const String &xml)
     return doc.documentElement();
 }
 
+template<typename String>
+QString rewriteXml(const String &inputXml)
+{
+    QString outputXml;
+    QXmlStreamReader reader(inputXml);
+    QXmlStreamWriter writer(&outputXml);
+    while (reader.readNext() != QXmlStreamReader::EndDocument) {
+        if (reader.hasError()) {
+            qDebug() << "Parsing error:";
+            qDebug().noquote() << inputXml;
+            qDebug().noquote() << reader.error() << reader.errorString();
+            throw std::exception();
+        }
+
+        // do not generate '<?xml version="1.0"?>'
+        if (reader.tokenType() == QXmlStreamReader::StartDocument) {
+            continue;
+        }
+        writer.writeCurrentToken(reader);
+    }
+    return outputXml;
+}
+
 template<typename T>
 static QByteArray packetToXml(const T &packet)
 {