Use full path for includes
authorKurt Pattyn <pattyn.kurt@gmail.com>
Sat, 2 Nov 2013 00:13:54 +0000 (01:13 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sat, 2 Nov 2013 00:14:24 +0000 (01:14 +0100)
Change-Id: I3f8d78527661d76050df5dd6ef71123190c1fecb
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
tests/autobahn/scripts/fuzzingclient.json [deleted file]
tests/autobahn/scripts/fuzzingserver.json [deleted file]
tests/manual/compliance/tst_compliance.cpp
tests/manual/websockets/tst_websockets.cpp

diff --git a/tests/autobahn/scripts/fuzzingclient.json b/tests/autobahn/scripts/fuzzingclient.json
deleted file mode 100644 (file)
index c196070..0000000
+++ /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 (file)
index 24aaca0..0000000
+++ /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": {}
-}
index 556cc56..28fb54f 100644 (file)
@@ -44,7 +44,7 @@
 #include <QHostInfo>
 #include <QSslError>
 #include <QDebug>
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 
 class tst_ComplianceTest : public QObject
 {
index a0e6ec8..57cb940 100644 (file)
@@ -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()