From aeb98c0f06e1d1afc00a0556bb5359a3ab3c2901 Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Fri, 8 Nov 2019 14:08:58 +0100 Subject: [PATCH] updated unitests --- src/serversdk/request.cpp | 4 +- src/serversdk/request.h | 2 - src/serversdk/soaprequest.cpp | 4 +- test/auto/auto.pro | 3 +- test/auto/basic/basic.pro | 11 ----- test/auto/basic/tst_basictest.cpp | 41 ------------------- .../unittests.pro => request/request.pro} | 3 +- .../{unittests => request}/tst_request.cpp | 11 ++++- test/auto/unittests/tst_request.h | 21 ---------- 9 files changed, 16 insertions(+), 84 deletions(-) delete mode 100644 test/auto/basic/basic.pro delete mode 100644 test/auto/basic/tst_basictest.cpp rename test/auto/{unittests/unittests.pro => request/request.pro} (85%) rename test/auto/{unittests => request}/tst_request.cpp (68%) delete mode 100644 test/auto/unittests/tst_request.h diff --git a/src/serversdk/request.cpp b/src/serversdk/request.cpp index 4aa4a6e..44eed2a 100644 --- a/src/serversdk/request.cpp +++ b/src/serversdk/request.cpp @@ -28,8 +28,8 @@ QNetworkRequest Request::networkRequest() const request.setRawHeader("Accept-Encoding", "gzip, deflate"); #endif - // Enabling HTTP/2 ( not supported on Ubuntu 16.04 ) - // request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); + // Enabling HTTP/2 ( does not work on Qt 5.9.8 ) + request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); return request; } diff --git a/src/serversdk/request.h b/src/serversdk/request.h index 424365c..ff4d51c 100644 --- a/src/serversdk/request.h +++ b/src/serversdk/request.h @@ -24,8 +24,6 @@ public: QString url() const; void setUrl(const QString &url); - - // Authorization QString userName() const; void setUserName(const QString &userName); diff --git a/src/serversdk/soaprequest.cpp b/src/serversdk/soaprequest.cpp index 77606fd..cdee8c6 100644 --- a/src/serversdk/soaprequest.cpp +++ b/src/serversdk/soaprequest.cpp @@ -12,7 +12,7 @@ SoapRequest::SoapRequest(QString action, QString endpoint, QByteArray data) QNetworkRequest SoapRequest::networkRequest() const { Q_ASSERT(!this->url().isEmpty()); - QNetworkRequest request(QUrl(this->url())); + QNetworkRequest request = Request::networkRequest(); // Have to set header QString header; @@ -33,7 +33,7 @@ QNetworkRequest SoapRequest::networkRequest() const request.setRawHeader("Accept-Encoding", "gzip, deflate"); // Enabling HTTP/2 ( not supported on Ubuntu 16.04 ) - // request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); + request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); return request; } diff --git a/test/auto/auto.pro b/test/auto/auto.pro index 043d922..682e89d 100644 --- a/test/auto/auto.pro +++ b/test/auto/auto.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - basic \ soap \ - unittests \ + request \ utils diff --git a/test/auto/basic/basic.pro b/test/auto/basic/basic.pro deleted file mode 100644 index c847d21..0000000 --- a/test/auto/basic/basic.pro +++ /dev/null @@ -1,11 +0,0 @@ -QT += testlib -QT -= gui - -CONFIG += qt console warn_on depend_includepath testcase -CONFIG -= app_bundle - -TEMPLATE = app - -SOURCES += tst_basictest.cpp - -include(../../../serversdkint.pri) diff --git a/test/auto/basic/tst_basictest.cpp b/test/auto/basic/tst_basictest.cpp deleted file mode 100644 index 8c5b717..0000000 --- a/test/auto/basic/tst_basictest.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) Filip Bucek - All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited - * Proprietary and confidential - * Written by Filip Bucek , 2019 - */ -#include - -// add necessary includes here - -class basicTest : public QObject -{ - Q_OBJECT - -public: - basicTest(); - ~basicTest(); - -private slots: - void test_case1(); - -}; - -basicTest::basicTest() -{ - -} - -basicTest::~basicTest() -{ - -} - -void basicTest::test_case1() -{ - -} - -QTEST_APPLESS_MAIN(basicTest) - -#include "tst_basictest.moc" diff --git a/test/auto/unittests/unittests.pro b/test/auto/request/request.pro similarity index 85% rename from test/auto/unittests/unittests.pro rename to test/auto/request/request.pro index d55d3a8..ca6c7cb 100644 --- a/test/auto/unittests/unittests.pro +++ b/test/auto/request/request.pro @@ -3,7 +3,6 @@ CONFIG += testcase # neccesary to have posibility to run: make check UnitTest SOURCES += \ tst_request.cpp -HEADERS += \ - tst_request.h + include(../../../serversdkint.pri) diff --git a/test/auto/unittests/tst_request.cpp b/test/auto/request/tst_request.cpp similarity index 68% rename from test/auto/unittests/tst_request.cpp rename to test/auto/request/tst_request.cpp index 638d8cf..a782974 100644 --- a/test/auto/unittests/tst_request.cpp +++ b/test/auto/request/tst_request.cpp @@ -1,9 +1,16 @@ -#include "tst_request.h" +#include #include "serversdk/request.h" namespace serversdk { +class RequestTest : public QObject +{ + Q_OBJECT +private: + Q_SLOT void basicAuthorization_test(); +}; + void RequestTest::basicAuthorization_test() { QString expected = "Basic VGVzdGVyOlRlc3Q="; @@ -17,3 +24,5 @@ void RequestTest::basicAuthorization_test() } QTEST_APPLESS_MAIN(serversdk::RequestTest) + +#include "tst_request.moc" diff --git a/test/auto/unittests/tst_request.h b/test/auto/unittests/tst_request.h deleted file mode 100644 index 27a0dcb..0000000 --- a/test/auto/unittests/tst_request.h +++ /dev/null @@ -1,21 +0,0 @@ - -#pragma once - -#include - -namespace serversdk { - -class RequestTest : public QObject -{ - Q_OBJECT -private: - // Default testcases ( not needed to declare it ) - // Q_SLOT void initTestCase(); - // Q_SLOT void cleanupTestCase(); - // void wont_run(); // no Q_SLOT ( only slots will be runned within tests ) - - - Q_SLOT void basicAuthorization_test(); -}; - -} //