diff options
author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-08-25 22:35:13 +0200 |
---|---|---|
committer | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-08-25 22:35:13 +0200 |
commit | 433b23a5207bd3922785f41356d7029d1b275cf0 (patch) | |
tree | 6730467afa097ff98f7d6ae9a9622449ae3e1815 /tests | |
parent | a6c7dbfef8283be12698ae304d4ef1af5aa4cc60 (diff) | |
download | qtwebsockets-433b23a5207bd3922785f41356d7029d1b275cf0.tar.gz |
Replaced tabs by spaces
Diffstat (limited to 'tests')
-rw-r--r-- | tests/tst_compliance.cpp | 142 | ||||
-rw-r--r-- | tests/tst_websockets.cpp | 194 | ||||
-rw-r--r-- | tests/unittests.h | 76 |
3 files changed, 206 insertions, 206 deletions
diff --git a/tests/tst_compliance.cpp b/tests/tst_compliance.cpp index d56fc1f..fb0936a 100644 --- a/tests/tst_compliance.cpp +++ b/tests/tst_compliance.cpp @@ -8,30 +8,30 @@ class ComplianceTest : public QObject { - Q_OBJECT + Q_OBJECT public: - ComplianceTest(); + ComplianceTest(); private Q_SLOTS: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - /** - * @brief Runs the autobahn tests against our implementation - */ - void autobahnTest(); + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + /** + * @brief Runs the autobahn tests against our implementation + */ + void autobahnTest(); private: - QUrl m_url; + QUrl m_url; - void runTestCases(int startNbr, int stopNbr = -1); - void runTestCase(int nbr, int total); + void runTestCases(int startNbr, int stopNbr = -1); + void runTestCase(int nbr, int total); }; ComplianceTest::ComplianceTest() : - m_url("ws://localhost:9001") + m_url("ws://localhost:9001") { } @@ -53,71 +53,71 @@ void ComplianceTest::cleanup() void ComplianceTest::runTestCase(int nbr, int total) { - if (nbr == total) - { - return; - } - QWebSocket *pWebSocket = new QWebSocket; - QSignalSpy spy(pWebSocket, SIGNAL(disconnected())); - - //next for every case, connect to url - //ws://ipaddress:port/runCase?case=<number>&agent=<agentname> - //where agent name will be QWebSocket - QObject::connect(pWebSocket, &QWebSocket::textMessageReceived, [=](QString message) { - pWebSocket->write(message); - }); - QObject::connect(pWebSocket, &QWebSocket::binaryMessageReceived, [=](QByteArray message) { - pWebSocket->write(message); - }); - - qDebug() << "Executing test" << (nbr + 1) << "/" << total; - QUrl url = m_url; - url.setPath("/runCase?"); - QUrlQuery query; - query.addQueryItem("case", QString::number(nbr + 1)); - query.addQueryItem("agent", "QWebSockets/0.9"); - url.setQuery(query); - pWebSocket->open(url); - spy.wait(60000); - pWebSocket->close(); - delete pWebSocket; - pWebSocket = 0; - runTestCase(nbr + 1, total); + if (nbr == total) + { + return; + } + QWebSocket *pWebSocket = new QWebSocket; + QSignalSpy spy(pWebSocket, SIGNAL(disconnected())); + + //next for every case, connect to url + //ws://ipaddress:port/runCase?case=<number>&agent=<agentname> + //where agent name will be QWebSocket + QObject::connect(pWebSocket, &QWebSocket::textMessageReceived, [=](QString message) { + pWebSocket->write(message); + }); + QObject::connect(pWebSocket, &QWebSocket::binaryMessageReceived, [=](QByteArray message) { + pWebSocket->write(message); + }); + + qDebug() << "Executing test" << (nbr + 1) << "/" << total; + QUrl url = m_url; + url.setPath("/runCase?"); + QUrlQuery query; + query.addQueryItem("case", QString::number(nbr + 1)); + query.addQueryItem("agent", "QWebSockets/0.9"); + url.setQuery(query); + pWebSocket->open(url); + spy.wait(60000); + pWebSocket->close(); + delete pWebSocket; + pWebSocket = 0; + runTestCase(nbr + 1, total); } void ComplianceTest::runTestCases(int startNbr, int stopNbr) { - runTestCase(startNbr, stopNbr); + runTestCase(startNbr, stopNbr); } void ComplianceTest::autobahnTest() { - //connect to autobahn server at url ws://ipaddress:port/getCaseCount - QWebSocket *pWebSocket = new QWebSocket; - QUrl url = m_url; - int numberOfTestCases = 0; - QSignalSpy spy(pWebSocket, SIGNAL(disconnected())); - QObject::connect(pWebSocket, &QWebSocket::textMessageReceived, [&](QString message) { - numberOfTestCases = message.toInt(); - }); - - url.setPath("/getCaseCount"); - pWebSocket->open(url); - spy.wait(60000); - QVERIFY(numberOfTestCases > 0); - - QObject::disconnect(pWebSocket, &QWebSocket::textMessageReceived, 0, 0); - - runTestCases(0, numberOfTestCases); - - url.setPath("/updateReports?"); - QUrlQuery query; - query.addQueryItem("agent", "QWebSockets"); - url.setQuery(query); - pWebSocket->open(url); - spy.wait(60000); - delete pWebSocket; - pWebSocket = 0; + //connect to autobahn server at url ws://ipaddress:port/getCaseCount + QWebSocket *pWebSocket = new QWebSocket; + QUrl url = m_url; + int numberOfTestCases = 0; + QSignalSpy spy(pWebSocket, SIGNAL(disconnected())); + QObject::connect(pWebSocket, &QWebSocket::textMessageReceived, [&](QString message) { + numberOfTestCases = message.toInt(); + }); + + url.setPath("/getCaseCount"); + pWebSocket->open(url); + spy.wait(60000); + QVERIFY(numberOfTestCases > 0); + + QObject::disconnect(pWebSocket, &QWebSocket::textMessageReceived, 0, 0); + + runTestCases(0, numberOfTestCases); + + url.setPath("/updateReports?"); + QUrlQuery query; + query.addQueryItem("agent", "QWebSockets"); + url.setQuery(query); + pWebSocket->open(url); + spy.wait(60000); + delete pWebSocket; + pWebSocket = 0; } DECLARE_TEST(ComplianceTest) diff --git a/tests/tst_websockets.cpp b/tests/tst_websockets.cpp index c404eef..ff4b6fd 100644 --- a/tests/tst_websockets.cpp +++ b/tests/tst_websockets.cpp @@ -8,71 +8,71 @@ class WebSocketsTest : public QObject { - Q_OBJECT + Q_OBJECT public: - WebSocketsTest(); + WebSocketsTest(); private Q_SLOTS: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - /** - * @brief testTextMessage Tests sending and receiving a text message - */ - void testTextMessage(); - - void testBinaryMessage(); - - /** - * @brief Tests the method localAddress and localPort - */ - void testLocalAddress(); - - /** - * @brief Test the methods peerAddress, peerName and peerPort - */ - void testPeerAddress(); - - /** - * @brief Test the methods proxy() and setProxy() and check if it can be correctly set - */ - void testProxy(); - - /** - * @brief Runs the autobahn tests against our implementation - */ - //void autobahnTest(); + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + /** + * @brief testTextMessage Tests sending and receiving a text message + */ + void testTextMessage(); + + void testBinaryMessage(); + + /** + * @brief Tests the method localAddress and localPort + */ + void testLocalAddress(); + + /** + * @brief Test the methods peerAddress, peerName and peerPort + */ + void testPeerAddress(); + + /** + * @brief Test the methods proxy() and setProxy() and check if it can be correctly set + */ + void testProxy(); + + /** + * @brief Runs the autobahn tests against our implementation + */ + //void autobahnTest(); private: - QWebSocket *m_pWebSocket; - QUrl m_url; + QWebSocket *m_pWebSocket; + QUrl m_url; }; WebSocketsTest::WebSocketsTest() : - m_pWebSocket(0), - m_url("ws://localhost:9000") + m_pWebSocket(0), + m_url("ws://localhost:9000") { } void WebSocketsTest::initTestCase() { - m_pWebSocket = new QWebSocket(); - m_pWebSocket->open(m_url, true); - QTRY_VERIFY_WITH_TIMEOUT(m_pWebSocket->state() == QAbstractSocket::ConnectedState, 1000); - QVERIFY(m_pWebSocket->isValid()); + m_pWebSocket = new QWebSocket(); + m_pWebSocket->open(m_url, true); + QTRY_VERIFY_WITH_TIMEOUT(m_pWebSocket->state() == QAbstractSocket::ConnectedState, 1000); + QVERIFY(m_pWebSocket->isValid()); } void WebSocketsTest::cleanupTestCase() { - if (m_pWebSocket) - { - m_pWebSocket->close(); - //QVERIFY2(m_pWebSocket->waitForDisconnected(1000), "Disconnection failed."); - delete m_pWebSocket; - m_pWebSocket = 0; - } + if (m_pWebSocket) + { + m_pWebSocket->close(); + //QVERIFY2(m_pWebSocket->waitForDisconnected(1000), "Disconnection failed."); + delete m_pWebSocket; + m_pWebSocket = 0; + } } void WebSocketsTest::init() @@ -85,79 +85,79 @@ void WebSocketsTest::cleanup() void WebSocketsTest::testTextMessage() { - const char *message = "Hello world!"; + const char *message = "Hello world!"; - QSignalSpy spy(m_pWebSocket, SIGNAL(textMessageReceived(QString))); + QSignalSpy spy(m_pWebSocket, SIGNAL(textMessageReceived(QString))); - QCOMPARE(m_pWebSocket->write(message), (qint64)strlen(message)); + QCOMPARE(m_pWebSocket->write(message), (qint64)strlen(message)); - QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); - QCOMPARE(spy.count(), 1); - QCOMPARE(spy.at(0).count(), 1); - QCOMPARE(spy.takeFirst().at(0).toString(), QString(message)); + QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).count(), 1); + QCOMPARE(spy.takeFirst().at(0).toString(), QString(message)); - spy.clear(); - QString qMessage(message); - QCOMPARE(m_pWebSocket->write(qMessage), (qint64)qMessage.length()); - QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); - QCOMPARE(spy.count(), 1); - QCOMPARE(spy.at(0).count(), 1); - QCOMPARE(spy.takeFirst().at(0).toString(), qMessage); + spy.clear(); + QString qMessage(message); + QCOMPARE(m_pWebSocket->write(qMessage), (qint64)qMessage.length()); + QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).count(), 1); + QCOMPARE(spy.takeFirst().at(0).toString(), qMessage); } void WebSocketsTest::testBinaryMessage() { - QSignalSpy spy(m_pWebSocket, SIGNAL(binaryMessageReceived(QByteArray))); + QSignalSpy spy(m_pWebSocket, SIGNAL(binaryMessageReceived(QByteArray))); - QByteArray data("Hello world!"); + QByteArray data("Hello world!"); - QCOMPARE(m_pWebSocket->write(data), (qint64)data.size()); + QCOMPARE(m_pWebSocket->write(data), (qint64)data.size()); - QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); - QCOMPARE(spy.count(), 1); - QCOMPARE(spy.at(0).count(), 1); - QCOMPARE(spy.takeFirst().at(0).toByteArray(), data); + QTRY_VERIFY_WITH_TIMEOUT(spy.count() != 0, 1000); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).count(), 1); + QCOMPARE(spy.takeFirst().at(0).toByteArray(), data); } void WebSocketsTest::testLocalAddress() { - QCOMPARE(m_pWebSocket->localAddress().toString(), QString("127.0.0.1")); - quint16 localPort = m_pWebSocket->localPort(); - QVERIFY2(localPort > 0, "Local port is invalid."); + QCOMPARE(m_pWebSocket->localAddress().toString(), QString("127.0.0.1")); + quint16 localPort = m_pWebSocket->localPort(); + QVERIFY2(localPort > 0, "Local port is invalid."); } void WebSocketsTest::testPeerAddress() { - QHostInfo hostInfo = QHostInfo::fromName(m_url.host()); - QList<QHostAddress> addresses = hostInfo.addresses(); - QVERIFY(addresses.length() > 0); - QHostAddress peer = m_pWebSocket->peerAddress(); - bool found = false; - Q_FOREACH(QHostAddress a, addresses) - { - if (a == peer) - { - found = true; - break; - } - } - - if (!found) - { - QFAIL("PeerAddress is not found as a result of a reverse lookup"); - } - QCOMPARE(m_pWebSocket->peerName(), m_url.host()); - QCOMPARE(m_pWebSocket->peerPort(), (quint16)m_url.port(80)); + QHostInfo hostInfo = QHostInfo::fromName(m_url.host()); + QList<QHostAddress> addresses = hostInfo.addresses(); + QVERIFY(addresses.length() > 0); + QHostAddress peer = m_pWebSocket->peerAddress(); + bool found = false; + Q_FOREACH(QHostAddress a, addresses) + { + if (a == peer) + { + found = true; + break; + } + } + + if (!found) + { + QFAIL("PeerAddress is not found as a result of a reverse lookup"); + } + QCOMPARE(m_pWebSocket->peerName(), m_url.host()); + QCOMPARE(m_pWebSocket->peerPort(), (quint16)m_url.port(80)); } void WebSocketsTest::testProxy() { - QNetworkProxy oldProxy = m_pWebSocket->proxy(); - QNetworkProxy proxy(QNetworkProxy::HttpProxy, QString("proxy.network.com"), 80); - m_pWebSocket->setProxy(proxy); - QCOMPARE(proxy, m_pWebSocket->proxy()); - m_pWebSocket->setProxy(oldProxy); - QCOMPARE(oldProxy, m_pWebSocket->proxy()); + QNetworkProxy oldProxy = m_pWebSocket->proxy(); + QNetworkProxy proxy(QNetworkProxy::HttpProxy, QString("proxy.network.com"), 80); + m_pWebSocket->setProxy(proxy); + QCOMPARE(proxy, m_pWebSocket->proxy()); + m_pWebSocket->setProxy(oldProxy); + QCOMPARE(oldProxy, m_pWebSocket->proxy()); } //DECLARE_TEST(WebSocketsTest) diff --git a/tests/unittests.h b/tests/unittests.h index a06fd24..923c218 100644 --- a/tests/unittests.h +++ b/tests/unittests.h @@ -15,46 +15,46 @@ typedef QList<QObject*> TestList; inline TestList& testList() { - static TestList list; - return list; + static TestList list; + return list; } inline bool findObject(QObject* object) { - TestList& list = testList(); - if (list.contains(object)) - { - return true; - } - Q_FOREACH (QObject* test, list) - { - if (test->objectName() == object->objectName()) - { - return true; - } - } - return false; + TestList& list = testList(); + if (list.contains(object)) + { + return true; + } + Q_FOREACH (QObject* test, list) + { + if (test->objectName() == object->objectName()) + { + return true; + } + } + return false; } inline void addTest(QObject* object) { - TestList& list = testList(); - if (!findObject(object)) - { - list.append(object); - } + TestList& list = testList(); + if (!findObject(object)) + { + list.append(object); + } } inline int run(int argc, char *argv[]) { - int ret = 0; + int ret = 0; - Q_FOREACH (QObject* test, testList()) - { - ret += QTest::qExec(test, argc, argv); - } - testList().clear(); - return ret; + Q_FOREACH (QObject* test, testList()) + { + ret += QTest::qExec(test, argc, argv); + } + testList().clear(); + return ret; } } // end namespace @@ -63,24 +63,24 @@ template <class T> class Test { public: - QSharedPointer<T> child; + QSharedPointer<T> child; - Test(const QString& name) : child(new T) - { - child->setObjectName(name); - AutoTest::addTest(child.data()); - } + Test(const QString& name) : child(new T) + { + child->setObjectName(name); + AutoTest::addTest(child.data()); + } }; #define DECLARE_TEST(className) static Test<className> t(#className); #define TEST_MAIN \ -int main(int argc, char *argv[]) \ + int main(int argc, char *argv[]) \ { \ - QCoreApplication app(argc, argv); \ - int ret = AutoTest::run(argc, argv); \ - return ret; \ -} + QCoreApplication app(argc, argv); \ + int ret = AutoTest::run(argc, argv); \ + return ret; \ + } //return app.exec(); #endif |