QML Engine: Support for "PATCH" method for XMLHTTPRequest

Support for HTTP PATCH method was added to QQmlXMLHttpRequest. Tests for
PATCH method in XMLHttpRequest were added.

[ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now
supports the PATCH method in HTTP requests.

Task-number: QTBUG-38175
Change-Id: Ib3c104b558f626bb63624e234f1362adcf6cbd4d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

src/qml/qml/qqmlxmlhttprequest.cpp

@@ -1235,7 +1235,8 @@ void QQmlXMLHttpRequest::requestFromUrl(const QUrl &url)
     } else if (m_method == QLatin1String("DELETE")) {
         m_network = networkAccessManager()->deleteResource(request);
     } else if ((m_method == QLatin1String("OPTIONS")) ||
-            m_method == QLatin1String("PROPFIND")) {
+               m_method == QLatin1String("PROPFIND") ||
+               m_method == QLatin1String("PATCH")) {
         QBuffer *buffer = new QBuffer;
         buffer->setData(m_data);
         buffer->open(QIODevice::ReadOnly);
@@ -1735,7 +1736,8 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
         method != QLatin1String("POST") &&
         method != QLatin1String("DELETE") &&
         method != QLatin1String("OPTIONS") &&
-        method != QLatin1String("PROPFIND"))
+        method != QLatin1String("PROPFIND") &&
+        method != QLatin1String("PATCH"))
         V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Unsupported HTTP method type");
 
     // Argument 1 - URL

tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect

@@ -0,0 +1,17 @@
+PATCH /qqmlxmlhttprequest.cpp HTTP/1.1
+Accept-Language: en-US
+If-Match: "ETagNumber"
+Content-Type: application/example
+Content-Length: 247
+Connection: Keep-Alive
+Accept-Encoding: gzip, deflate
+User-Agent: Mozilla/5.0
+Host: {{ServerHostUrl}}
+
+--- a/qqmlxmlhttprequest.cpp
++++ b/qqmlxmlhttprequest.cpp
+@@ -1238,11 +1238,13 @@
+-    } else if (m_method == QLatin1String("OPTIONS")) {
++    } else if (m_method == QLatin1String("OPTIONS") ||
++            (m_method == QLatin1String("PATCH"))) {
+

tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml

@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+    property bool headerOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("PATCH", url);
+        x.setRequestHeader("Accept-Language","en-US");
+        x.setRequestHeader("If-Match","\"ETagNumber\"");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+                headerOK = (x.getResponseHeader("Content-Location") == "/qqmlxmlhttprequest.cpp") &&
+                    (x.getResponseHeader("ETag") == "\"ETagNumber\"") &&
+                    (x.status == "204");
+            } else if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText === "");
+            }
+        }
+
+        var body = "--- a/qqmlxmlhttprequest.cpp\n" +
+            "+++ b/qqmlxmlhttprequest.cpp\n" +
+            "@@ -1238,11 +1238,13 @@\n" +
+            "-    } else if (m_method == QLatin1String(\"OPTIONS\")) {\n" +
+            "+    } else if (m_method == QLatin1String(\"OPTIONS\") ||\n" +
+            "+            (m_method == QLatin1String(\"PATCH\"))) {\n"
+
+        x.send(body);
+    }
+}

tests/auto/qml/qqmlxmlhttprequest/data/send_patch.reply

@@ -0,0 +1,3 @@
+HTTP/1.1 204 No Content
+Content-Location: /qqmlxmlhttprequest.cpp
+ETag: "ETagNumber"

tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp

@@ -71,6 +71,7 @@ private slots:
     void send_withdata_data();
     void send_options();
     void send_options_data();
+    void send_patch();
     void abort();
     void abort_unsent();
     void abort_opened();
@@ -639,6 +640,26 @@ void tst_qqmlxmlhttprequest::send_options_data()
     QTest::newRow("OPTIONS (with data)") << "testdocument.html" << "send_data.10.expect" << "send_data.9.qml" << "send_data.2.reply";
 }
 
+void tst_qqmlxmlhttprequest::send_patch()
+{
+    TestHTTPServer server;
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
+    QVERIFY(server.wait(testFileUrl("send_patch.expect"),
+                        testFileUrl("send_patch.reply"),
+                        // the content of response file will be ignored due to 204 status code
+                        testFileUrl("testdocument.html")));
+
+    QQmlComponent component(&engine, testFileUrl("send_patch.qml"));
+    QScopedPointer<QObject> object(component.beginCreate(engine.rootContext()));
+    QVERIFY(!object.isNull());
+    object->setProperty("url", server.urlString("/qqmlxmlhttprequest.cpp"));
+    component.completeCreate();
+
+    QTRY_VERIFY(object->property("dataOK").toBool());
+    QTRY_VERIFY(object->property("headerOK").toBool());
+}
+
+
 // Test abort() has no effect in unsent state
 void tst_qqmlxmlhttprequest::abort_unsent()
 {