diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-11-02 01:13:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-02 01:14:24 +0100 |
| commit | 9e13294d31c626c12c87629a52d62d016a1551c2 (patch) | |
| tree | 42513c19a8c778c6cc3d5b381e633a3a4d21b284 /tests | |
| parent | 6af0c16984c3086ba6c1ce5a7e792e5db381d991 (diff) | |
Use full path for includes
Change-Id: I3f8d78527661d76050df5dd6ef71123190c1fecb
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/autobahn/scripts/fuzzingclient.json | 17 | ||||
| -rw-r--r-- | tests/autobahn/scripts/fuzzingserver.json | 12 | ||||
| -rw-r--r-- | tests/manual/compliance/tst_compliance.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/websockets/tst_websockets.cpp | 6 |
4 files changed, 4 insertions, 33 deletions
diff --git a/tests/autobahn/scripts/fuzzingclient.json b/tests/autobahn/scripts/fuzzingclient.json deleted file mode 100644 index c196070..0000000 --- a/tests/autobahn/scripts/fuzzingclient.json +++ /dev/null @@ -1,17 +0,0 @@ - -{ - "options": {"failByDrop": false}, - "outdir": "./reports/servers", - - "servers": [ - { - "agent": "QWebSockets/0.9", - "url": "ws://127.0.0.1:1234", - "options": {"version": 13} - } - ], - - "cases": ["*"], - "exclude-cases": [], - "exclude-agent-cases": {} -} diff --git a/tests/autobahn/scripts/fuzzingserver.json b/tests/autobahn/scripts/fuzzingserver.json deleted file mode 100644 index 24aaca0..0000000 --- a/tests/autobahn/scripts/fuzzingserver.json +++ /dev/null @@ -1,12 +0,0 @@ - -{ - "url": "ws://127.0.0.1:9001", - - "options": {"failByDrop": false}, - "outdir": "./reports/clients", - "webport": 8090, - - "cases": ["*"], - "exclude-cases": [], - "exclude-agent-cases": {} -} diff --git a/tests/manual/compliance/tst_compliance.cpp b/tests/manual/compliance/tst_compliance.cpp index 556cc56..28fb54f 100644 --- a/tests/manual/compliance/tst_compliance.cpp +++ b/tests/manual/compliance/tst_compliance.cpp @@ -44,7 +44,7 @@ #include <QHostInfo> #include <QSslError> #include <QDebug> -#include <QWebSocket> +#include <QtWebSockets/QWebSocket> class tst_ComplianceTest : public QObject { diff --git a/tests/manual/websockets/tst_websockets.cpp b/tests/manual/websockets/tst_websockets.cpp index a0e6ec8..57cb940 100644 --- a/tests/manual/websockets/tst_websockets.cpp +++ b/tests/manual/websockets/tst_websockets.cpp @@ -43,7 +43,7 @@ #include <QSignalSpy> #include <QHostInfo> #include <QDebug> -#include "qwebsocket.h" +#include "QtWebSockets/QWebSocket" class tst_WebSocketsTest : public QObject { @@ -104,9 +104,9 @@ tst_WebSocketsTest::tst_WebSocketsTest() : void tst_WebSocketsTest::initTestCase() { m_pWebSocket = new QWebSocket(); - /*m_pWebSocket->open(m_url, true); + m_pWebSocket->open(m_url, true); QTRY_VERIFY_WITH_TIMEOUT(m_pWebSocket->state() == QAbstractSocket::ConnectedState, 1000); - QVERIFY(m_pWebSocket->isValid());*/ + QVERIFY(m_pWebSocket->isValid()); } void tst_WebSocketsTest::cleanupTestCase() |