diff options
Diffstat (limited to 'tests/auto/qml/qqmlxmlhttprequest')
13 files changed, 99 insertions, 99 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml index d5bb84ddc0..7fcbc9367a 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml @@ -15,7 +15,7 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - x.abort(); + x.abort(); if (x.readyState == XMLHttpRequest.UNSENT) readyState = true; @@ -23,7 +23,7 @@ QtObject { x.open("PUT", url); x.setRequestHeader("Accept-Language", "en-US"); - x.abort(); + x.abort(); x.open("GET", url); x.setRequestHeader("Accept-Language", "en-US"); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml index 4f58062a26..0a85c6b16f 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml @@ -15,7 +15,7 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - x.abort(); + x.abort(); if (x.readyState == XMLHttpRequest.UNSENT) readyState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/element.qml b/tests/auto/qml/qqmlxmlhttprequest/data/element.qml index 9b190f3a43..e0701d511a 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/element.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/element.qml @@ -115,8 +115,8 @@ QtObject { function checkXML(document) { - checkElement(document.documentElement, - document.documentElement.childNodes[0], + checkElement(document.documentElement, + document.documentElement.childNodes[0], document.documentElement.childNodes[1]); } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml index 580688b835..a9066093d4 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml @@ -20,12 +20,12 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - try { - x.getResponseHeader("Test-Header"); - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - unsentException = true; - } + try { + x.getResponseHeader("Test-Header"); + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + unsentException = true; + } if (x.readyState == XMLHttpRequest.UNSENT) readyState = true; @@ -36,25 +36,25 @@ QtObject { if (x.readyState == XMLHttpRequest.OPENED) openedState = true; - try { - x.getResponseHeader("Test-Header"); - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - openedException = true; - } + try { + x.getResponseHeader("Test-Header"); + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + openedException = true; + } var headers = "connection: close\r\ncontent-type: text/html; charset=UTF-8\r\ntest-header: TestValue\r\nmultitest-header: TestValue, SecondTestValue\r\ncontent-length: 11"; // Test to the end x.onreadystatechange = function() { - if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) { - headersReceivedState = true; + if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) { + headersReceivedState = true; - headersReceivedHeader = (x.getAllResponseHeaders() == headers); - } else if (x.readyState == XMLHttpRequest.DONE) { - doneState = headersReceivedState && true; + headersReceivedHeader = (x.getAllResponseHeaders() == headers); + } else if (x.readyState == XMLHttpRequest.DONE) { + doneState = headersReceivedState && true; - doneHeader = (x.getAllResponseHeaders() == headers); + doneHeader = (x.getAllResponseHeaders() == headers); dataOK = (x.responseText == "QML Rocks!\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml index 203967e539..0219d7b2fc 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml @@ -26,12 +26,12 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - try { - x.getResponseHeader("Test-Header"); - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - unsentException = true; - } + try { + x.getResponseHeader("Test-Header"); + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + unsentException = true; + } if (x.readyState == XMLHttpRequest.UNSENT) readyState = true; @@ -42,29 +42,29 @@ QtObject { if (x.readyState == XMLHttpRequest.OPENED) openedState = true; - try { - x.getResponseHeader("Test-Header"); - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - openedException = true; - } + try { + x.getResponseHeader("Test-Header"); + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + openedException = true; + } // Test to the end x.onreadystatechange = function() { - if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) { - headersReceivedState = true; - - headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == ""); - headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue"); - headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue"); - headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == ""); - } else if (x.readyState == XMLHttpRequest.DONE) { - doneState = headersReceivedState && true; - - doneNullHeader = (x.getResponseHeader("Nonexistant-header") == ""); - doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue"); - doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue"); - doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == ""); + if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) { + headersReceivedState = true; + + headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == ""); + headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue"); + headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue"); + headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == ""); + } else if (x.readyState == XMLHttpRequest.DONE) { + doneState = headersReceivedState && true; + + doneNullHeader = (x.getResponseHeader("Nonexistant-header") == ""); + doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue"); + doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue"); + doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == ""); dataOK = (x.responseText == "QML Rocks!\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml index 5a4093b9f1..88207c19ca 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/invalidMethodUsage.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.0 QtObject { property bool readyState: false diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml index e5c7b74553..5b01caad39 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirectError.qml @@ -5,7 +5,7 @@ QtObject { property bool dataOK: false property bool done: false - + Component.onCompleted: { var x = new XMLHttpRequest; x.open("GET", url); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml index 0894573ecc..cd6e1f99ad 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirectRecur.qml @@ -5,7 +5,7 @@ QtObject { property bool dataOK: false property bool done: false - + Component.onCompleted: { var x = new XMLHttpRequest; x.open("GET", url); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml b/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml index 003d1954e9..c658feb5aa 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/redirects.qml @@ -5,7 +5,7 @@ QtObject { property bool dataOK: false property bool done: false - + Component.onCompleted: { var x = new XMLHttpRequest; x.open("GET", url); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml index 4e0caa7171..65ce90853d 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml @@ -19,7 +19,7 @@ QtObject { x.send(); try { - x.send() + x.send() } catch (e) { if (e.code == DOMException.INVALID_STATE_ERR) test = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml index 5feac17711..22c45c099d 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml @@ -19,22 +19,22 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - try { - var a = x.status; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - unsentException = true; - } + try { + var a = x.status; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + unsentException = true; + } x.open("GET", url); x.setRequestHeader("Accept-Language", "en-US"); - try { - var a = x.status; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - openedException = true; - } + try { + var a = x.status; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + openedException = true; + } // Test to the end x.onreadystatechange = function() { @@ -65,11 +65,11 @@ QtObject { x.send() - try { - var a = x.status; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - sentException = true; - } + try { + var a = x.status; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + sentException = true; + } } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml index 3c74efc091..bf59a1e9f9 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml @@ -19,22 +19,22 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - try { - var a = x.statusText; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - unsentException = true; - } + try { + var a = x.statusText; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + unsentException = true; + } x.open("GET", url); x.setRequestHeader("Accept-Language", "en-US"); - try { - var a = x.statusText; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - openedException = true; - } + try { + var a = x.statusText; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + openedException = true; + } // Test to the end x.onreadystatechange = function() { @@ -65,11 +65,11 @@ QtObject { x.send() - try { - var a = x.statusText; - } catch (e) { - if (e.code == DOMException.INVALID_STATE_ERR) - sentException = true; - } + try { + var a = x.statusText; + } catch (e) { + if (e.code == DOMException.INVALID_STATE_ERR) + sentException = true; + } } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp index 9c67e6e2e9..17becb3714 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp +++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp @@ -208,7 +208,7 @@ void tst_qqmlxmlhttprequest::instanceStateValues() QCOMPARE(object->property("done").toInt(), 4); } -// Test calling constructor +// Test calling constructor void tst_qqmlxmlhttprequest::constructor() { QQmlComponent component(&engine, testFileUrl("constructor.qml")); @@ -436,7 +436,7 @@ void tst_qqmlxmlhttprequest::setRequestHeader_sent() component.completeCreate(); QCOMPARE(object->property("test").toBool(), true); - + QTRY_VERIFY(object->property("dataOK").toBool() == true); } @@ -796,7 +796,7 @@ void tst_qqmlxmlhttprequest::statusText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); QVERIFY(server.wait(testFileUrl("status.expect"), - replyUrl, + replyUrl, testFileUrl("testdocument.html"))); QQmlComponent component(&engine, testFileUrl("statusText.qml")); @@ -836,7 +836,7 @@ void tst_qqmlxmlhttprequest::responseText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); QVERIFY(server.wait(testFileUrl("status.expect"), - replyUrl, + replyUrl, bodyUrl)); QQmlComponent component(&engine, testFileUrl("responseText.qml")); @@ -883,7 +883,7 @@ void tst_qqmlxmlhttprequest::nonUtf8() QMetaObject::invokeMethod(object.data(), "startRequest"); QTRY_VERIFY(object->property("dataOK").toBool() == true); - + QCOMPARE(object->property("responseText").toString(), responseText); if (!xmlRootNodeValue.isEmpty()) { @@ -980,10 +980,10 @@ void tst_qqmlxmlhttprequest::redirects() object->setProperty("expectedText", ""); component.completeCreate(); - for (int ii = 0; ii < 60; ++ii) { - if (object->property("done").toBool()) break; - QTest::qWait(50); - } + for (int ii = 0; ii < 60; ++ii) { + if (object->property("done").toBool()) break; + QTest::qWait(50); + } QVERIFY(object->property("done").toBool() == true); QCOMPARE(object->property("dataOK").toBool(), true); |