Fix tests to adapt to Qt 6.8's QNAM sending lowercase headers

KDAB · Aug 21, 2024 · 84fff36 · 84fff36
1 parent f89999e
commit 84fff36
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/testtools/httpserver_p.h b/testtools/httpserver_p.h
@@ -104,7 +104,7 @@ class HttpServerThread : public QThread
     QByteArray header(const QByteArray &value) const
     {
         QMutexLocker lock(&m_mutex);
-        return m_headers.value(value);
+        return m_headers.value(value, m_headers.value(value.toLower()));
     }
 
     /**

diff --git a/unittests/serverlib/test_serverlib.cpp b/unittests/serverlib/test_serverlib.cpp
@@ -1345,10 +1345,18 @@ private Q_SLOTS:
         loop.exec();
         reply->readAll();
 
-        QVERIFY(reply->rawHeaderList().contains("Access-Control-Allow-Origin"));
-        QCOMPARE(reply->rawHeader("Access-Control-Allow-Origin").constData(), "*");
-        QVERIFY(reply->rawHeaderList().contains("Access-Control-Allow-Headers"));
-        QCOMPARE(reply->rawHeader("Access-Control-Allow-Headers").constData(), "Content-Type");
+        const bool titleCase = reply->rawHeaderList().contains("Access-Control-Allow-Origin");
+        const bool lowerCase = reply->rawHeaderList().contains("access-control-allow-origin");
+        QVERIFY(titleCase || lowerCase);
+        if (titleCase) {
+            QCOMPARE(reply->rawHeader("Access-Control-Allow-Origin").constData(), "*");
+            QVERIFY(reply->rawHeaderList().contains("Access-Control-Allow-Headers"));
+            QCOMPARE(reply->rawHeader("Access-Control-Allow-Headers").constData(), "Content-Type");
+        } else { // Qt >= 6.8
+            QCOMPARE(reply->rawHeader("access-control-allow-origin").constData(), "*");
+            QVERIFY(reply->rawHeaderList().contains("access-control-allow-headers"));
+            QCOMPARE(reply->rawHeader("access-control-allow-headers").constData(), "Content-Type");
+        }
     }
 
     void testTimeout()

diff --git a/unittests/wsdl_document/test_wsdl_document.cpp b/unittests/wsdl_document/test_wsdl_document.cpp
@@ -191,7 +191,9 @@ private Q_SLOTS:
             expectedRequestXml.replace("%1", expectedHeader());
             QVERIFY(xmlBufferCompare(server.receivedData(), expectedRequestXml));
             QCOMPARE(QString::fromUtf8(server.receivedData().constData()), QString::fromUtf8(expectedRequestXml.constData()));
-            QVERIFY(server.receivedHeaders().contains("SoapAction: \"http://www.kdab.com/AddEmployee\""));
+            const QByteArray headers = server.receivedHeaders();
+            QVERIFY(headers.contains("SoapAction: \"http://www.kdab.com/AddEmployee\"")
+                    || headers.contains("soapaction: \"http://www.kdab.com/AddEmployee\"")); // Qt >= 6.8
         }
 
         // Test utf8
@@ -393,7 +395,9 @@ private Q_SLOTS:
         expectedRequestXml.replace("%1", expectedHeader());
         QVERIFY(xmlBufferCompare(server.receivedData(), expectedRequestXml));
         QCOMPARE(QString::fromUtf8(server.receivedData().constData()), QString::fromUtf8(expectedRequestXml.constData()));
-        QVERIFY(server.receivedHeaders().contains("SoapAction: \"http://www.kdab.com/AddEmployee\""));
+        const QByteArray headers = server.receivedHeaders();
+        QVERIFY(headers.contains("SoapAction: \"http://www.kdab.com/AddEmployee\"")
+                || headers.contains("soapaction: \"http://www.kdab.com/AddEmployee\""));
 #endif
     }
 

diff --git a/unittests/wsdl_rpc/test_wsdl_rpc.cpp b/unittests/wsdl_rpc/test_wsdl_rpc.cpp
@@ -110,7 +110,9 @@ private Q_SLOTS:
             expectedRequestXml.replace("%1", expectedHeader);
             QVERIFY(xmlBufferCompare(server.receivedData(), expectedRequestXml));
             QCOMPARE(QString::fromUtf8(server.receivedData().constData()), QString::fromUtf8(expectedRequestXml.constData()));
-            QVERIFY(server.receivedHeaders().contains("SoapAction: \"http://www.kdab.com/AddEmployee\""));
+            const QByteArray headers = server.receivedHeaders();
+            QVERIFY(headers.contains("SoapAction: \"http://www.kdab.com/AddEmployee\"")
+                    || headers.contains("soapaction: \"http://www.kdab.com/AddEmployee\"")); // Qt >= 6.8
         }
 
         // Test utf8