summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Updated license headersAntti Kokko2016-01-2015-255/+180
| | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I191cd4111d18052fbe80bbe21bf851bf4795a1a6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Add QML test casesNobuaki Sukegawa2015-12-281-4/+44
| | | | | Change-Id: Ie652bddf7f98271d01ebe6818817ea28d9c83fae Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Test: replace obsolete QUrl::addQueryItem()Liang Qi2015-10-211-1/+3
| | | | | Change-Id: I266b98d309a8912efb988a4c7a006d6fefb48531 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-204-21/+192
|\ | | | | | | Change-Id: I8d2c4b0982623839b880a9d8fbe7f5ee69d33ad3
| * Test: replace obsolete QChar::fromAscii()Liang Qi2015-10-201-2/+2
| | | | | | | | | | | | Change-Id: Ib41421e87af66d6ba9248b66e713e452d226143d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-201-1/+1
| |\ | | | | | | | | | Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
| | * Test: stablize tst_QWebSocket::tst_moveToThread()5.5Liang Qi2015-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For e8335d48, the test is flaky, but old CI treated it as a PASS. Task-number: QTBUG-48843 Change-Id: I4d2c0d270824d7b1e954e9174493fba2c1c5433f Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-023-5/+176
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
| | * Fix DoS vulnerabilityv5.5.15.5.1Kurt Pattyn2015-09-062-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add checks on maximum header line length and on the maximum number of header lines. Task-number: QTBUG-48123 Change-Id: I65dbeb53af7aa0dfa137ce31fc2549940559314e Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Set parent of internal socket objectsPeter Kümmel2015-09-041-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After moving the websocket into another thread current code doesn't work because then the QTcpSocket/QSslSocket objects reside in a different thread, for instance: "QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread" QObject::moveToThread(QThread*) also moves QObjects's children, therefore their internal socket objects need to be children of QWebSocket. QWebSocket has ownership of the internal socket, and the smart pointer is not needed any more. Change of cleanup code to prevent crashes with clang/msvc builds: QWebSocketPrivate is a scoped member of QObject (not QWebSocket) and is destroyed after QObject destructor body was executed, and so m_pSocket&co had already been destroyed (being children) when the destructor of QWebSocketPrivate is called via the scoped pointer. Analogous to 64927e04f202d33b9a9a1f94141ef692c0b513ac Change-Id: I1ade6cda3fa793c30332cc5e103025e2dda3c78c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | rsv1-3 should be bool instead of intLiang Qi2015-09-141-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | And reorded the data members of QWebSocketFrame to save some space. Change-Id: I6fdaf74f344ac84e5a3f19883309455503a7ec4c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Maks Naumov <maksqwe1@ukr.net> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-312-4/+6
| | | | | | | | | | | | | | | | | | | | | Fix usage of API that is marked deprecated. Change-Id: Ie1bd25b22a8bd4faa6885ac3670dcc3c25c17ab2 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-319-9/+0
|/ / | | | | | | | | Change-Id: I0315e4692f680dec121f8e8fa5d90dd2826f4900 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-0/+1
|\ \ | |/ | | | | Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
| * WebSocketServer: use int type for portLiang Qi2015-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | QML engine doesn't support quint16 as a QML type. Task-number: QTBUG-46790 Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-3028-13/+273
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/websockets/qwebsocket_p.cpp Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
| * Doc: Add documentation on how to test with Autobahn|TestsuiteLiang Qi2015-06-031-0/+58
| | | | | | | | | | | | Change-Id: Ia18acdc3c54e2bb48209406d2a6f9e156b67324c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * tests: enable cmake in auto testsLiang Qi2015-05-221-1/+1
| | | | | | | | | | Change-Id: Idbfbaa86675381110f35118baf16cac891976707 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-228-0/+199
| | | | | | | | | | | | | | | | | | It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * tests: move all auto tests to websockets sub directoryLiang Qi2015-05-2220-14/+17
| | | | | | | | | | | | | | cmake is not included. Change-Id: I9ab6244d8b6b3752f26070b0b15ae70c0cab6d82 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix incorrectly encoded data tagSimon Hausmann2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | Properly encode the provided sequence in UTF-8, so that the XML output of testlib is correctly encoded. Otherwise parsing the XML output in an automated manner breaks. Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Add missing check for socket connection in testFrederik Gladhorn2015-06-111-0/+1
| | | | | | | | | | | | | | | | | | In a5cb3b8ff10fcf1def8bde6f814582be1c19b83b I made the tst_openRequest less reliable because the socketConnectedSpy is no longer checked. Change-Id: Id721fa4aa203eeb85a5fce85a5270bc14cc37ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Fix flaky test: QTRY_COMPARE instead of qWaitFrederik Gladhorn2015-06-101-15/+6
| | | | | | | | | | Change-Id: Iad643950d669addf90f68b2bf9be29c755f9c1d9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-261-1/+9
| | | | | | | | | | | | Task-number: QTBUG-40842 Change-Id: I02787a0e55701966e564a312d51297f4160bd89a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-113-3/+50
|\ \ | |/ | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-151-0/+34
| |\ | | | | | | | | | Change-Id: I29f5a2acb7ba0313d9e2ac2c005a988d208b617e
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-081-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lifetime of incoming QTcpSocket/QSslSocket are managed by the QTcpServer/QSslServer and thus the QWebSocketPrivate should clear the pointer to the socket when the socket is destroyed. Added auto test for the crash. Task-number: QTBUG-45331 Change-Id: I6e30e7cdcca22aa810ccc1a1d4d7d77c7cb2c349 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | The resource needs to be sent encoded in the HTTP request. Task-number: QTBUG-44889 Change-Id: I3c6c56f5fea1553f3b5751de7da0cfc76150f4b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Fix urls in client compliance testLuca Niccoli2015-04-091-2/+2
| | | | | | | | | | | | | | | Change-Id: I0dc9427934cc7523b524966d45820f96b6a4642d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client-side constructor was leaving it uninitialized, which would sometimes lead to spurious error signals being emitted. Task-number: QTBUG-44893 Change-Id: I7a17f1a16d9a5fe4218beb6d92993c1889ad836b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-081-0/+22
|/ / | | | | | | | | | | | | | | | | | | | | Request headers are not yet handled, only the QNetworkRequest::url() is taken into consideration. [ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request() Task-number: QTBUG-40842 Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Enable websocket tests on WindowsLuca Niccoli2015-03-131-8/+2
| | | | | | | | | | | | | | | | | | | | | | The listening socket must be opened on the loopback interface, otherwise the test client won't be able to connect. Also, name resolution can take a lot of time to fail, so we must wait longer when trying to connect to a non-existing host. Change-Id: I6d6744bc89e6e851cf49db5ae2c19aa652c0a8a4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-241-0/+22
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-0/+22
| |\ \ | | |/ | | | | | | Change-Id: I96657102802860c8490c162462324e661592d879
| | * fix the port in Host field in handshake requestLiang Qi2015-02-201-0/+22
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-39355 Change-Id: I06993193fe9618ace93552aed573a3eee5de18fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | | Update copyright headersJani Heikkinen2015-02-1611-81/+73
|/ / | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I8467410bfad44e8d3fe6bd5724c61bb0c07c91f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-9/+5
|\ \ | |/ | | | | Change-Id: Ie23422945b48b33a0608053c5f18700fd8133df5
| * Use old-style SIGNAL and SLOT macros in tst_qwebsocket.cppDmitry Shachnev2015-01-261-9/+5
| | | | | | | | | | | | | | | | | | | | | | Without that, this test is failing on some architectures. Task-number: QTBUG-43804 Done-with: Helge Deller <deller@gmx.de> Change-Id: I7d275ca6d0baa70e504bbb4a31c65c2ed65d2118 Reviewed-by: Helge Deller <deller@gmx.de> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-0/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6ceee770359e72a026575ea9fee51c3f97561163
| * QWebSocket should remember close code and reasonv5.4.15.4.1Frederik Gladhorn2014-12-291-0/+5
| | | | | | | | | | | | Task-number: QTBUG-42982 Change-Id: I50dbff96d7d64a5213e6ea6ba7bb9429b21b1fb2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-213-0/+135
|\ \ | |/ | | | | Change-Id: Ifc23e46ef1623cfba93571ff03c6c62a3b2fd117
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-033-0/+135
| |\ | | | | | | | | | Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
| | * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-033-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid Date header in handshake response on systems with non- english system locale. Task-number: QTBUG-40866 Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| | * Compile fix without proxy supportMaurice Kalinowski2014-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is required for for the autotests to compile. Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7)
* | | Fix QWebSocket's handling of query parameters with encoded charactersJuha Turunen2014-10-111-2/+5
|/ / | | | | | | | | | | | | | | | | QWebSocket used decoded version of the query part of the URL to construct the first line of the HTTP request. Task-number: QTBUG-41285 Change-Id: If16210f1b92e389dae8b1057a2d911122c31e2db Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-091-5/+5
| | | | | | | | | | | | | | | | | | QWebSocketServer should not use case-sensitive compare to validate http headers for incoming connections. Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3 Task-number: QTBUG-40615 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2410-180/+100
| | | | | | | | | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Compile fix without proxy supportMaurice Kalinowski2014-07-071-0/+4
| | | | | | | | | | Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-0/+18
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-251-0/+18
| | | | | | | | | | | | Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23 Task-number: QTBUG-39568 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status