Moved network autotests into new directory structure

Task-number: QTBUG-21223

Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc
Reviewed-on: http://codereview.qt-project.org/4259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 9305a6e..653e19c 100644 (file)
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -82,7 +82,6 @@ SUBDIRS=\
     qlineedit \
     qlistview \
     qlistwidget \
-    #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
     qmacstyle \
     qmainwindow \
     qmdisubwindow \
@@ -118,7 +117,6 @@ SUBDIRS=\
     qtabbar \
     qtableview \
     qtablewidget \
-    qtcpsocket \
     qtoolbar \
     qtoolbox \
     qtooltip \

diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 719923b..8172ef8 100644 (file)
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -4,50 +4,6 @@
 # been compiled.
 TEMPLATE=subdirs
 SUBDIRS=\
+    network \
     networkselftest \
-    qabstractnetworkcache \
-    qabstractsocket \
-    qauthenticator \
-    qftp \
-    qhostaddress \
-    qhostinfo \
-    qhttp \
-    qhttpnetworkconnection \
-    qhttpnetworkreply \
-    qhttpsocketengine \
-    platformsocketengine \
-    qnetworkaccessmanager \
-    qnetworkaddressentry \
-    qnetworkcachemetadata \
-    qnetworkconfiguration \
-    qnetworkconfigurationmanager \
-    qnetworkcookie \
-    qnetworkcookiejar \
-    qnetworkdiskcache \
-    qnetworkinterface \
-    qnetworkproxy \
-    qnetworkreply \
-    qnetworkrequest \
-    qnetworksession \
     qobjectperformance \
-    qsocks5socketengine \
-    qsslcertificate \
-    qsslcipher \
-    qsslerror \
-    qsslkey \
-    qsslsocket \
-    qsslsocket_onDemandCertificates_member \
-    qsslsocket_onDemandCertificates_static \
-    qtcpserver \
-    qudpsocket \
-#    qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
-
-!contains(QT_CONFIG, private_tests): SUBDIRS -= \
-    platformsocketengine \
-    qauthenticator \
-    qhostinfo \
-    qhttpnetworkconnection \
-    qhttpnetworkreply \
-    qhttpsocketengine \
-    qsocks5socketengine \
-

diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro
new file mode 100644 (file)
index 0000000..53b16f0
--- /dev/null
+++ b/tests/auto/network/access/access.pro
@@ -0,0 +1,20 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qnetworkdiskcache \
+   qnetworkcookiejar \
+   qnetworkaccessmanager \
+   qnetworkcookie \
+   qnetworkrequest \
+   qhttpnetworkconnection \
+   qnetworkreply \
+   qnetworkcachemetadata \
+   qftp \
+   qhttpnetworkreply \
+   qhttp \
+   qabstractnetworkcache \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          qhttpnetworkconnection \
+          qhttpnetworkreply \
+
+

diff --git a/tests/auto/qabstractnetworkcache/.gitignore b/tests/auto/network/access/qabstractnetworkcache/.gitignore
similarity index 100%
rename from tests/auto/qabstractnetworkcache/.gitignore
rename to tests/auto/network/access/qabstractnetworkcache/.gitignore

diff --git a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
similarity index 100%
rename from tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
rename to tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires500.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi

diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
similarity index 100%
rename from tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
rename to tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi

diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
similarity index 99%
rename from tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
rename to tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 3508ccf..244c9b1 100644 (file)
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -42,8 +42,8 @@
 
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
-#include "../../shared/util.h"
-#include "../network-settings.h"
+#include "../../../../shared/util.h"
+#include "../../../network-settings.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfigmanager.h>

diff --git a/tests/auto/qhttp/.gitattributes b/tests/auto/network/access/qftp/.gitattributes
similarity index 100%
rename from tests/auto/qhttp/.gitattributes
rename to tests/auto/network/access/qftp/.gitattributes

diff --git a/tests/auto/qftp/.gitignore b/tests/auto/network/access/qftp/.gitignore
similarity index 100%
rename from tests/auto/qftp/.gitignore
rename to tests/auto/network/access/qftp/.gitignore

diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
similarity index 100%
rename from tests/auto/qftp/qftp.pro
rename to tests/auto/network/access/qftp/qftp.pro

diff --git a/tests/auto/qnetworkreply/rfc3252.txt b/tests/auto/network/access/qftp/rfc3252.txt
similarity index 100%
rename from tests/auto/qnetworkreply/rfc3252.txt
rename to tests/auto/network/access/qftp/rfc3252.txt

diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
similarity index 99%
rename from tests/auto/qftp/tst_qftp.cpp
rename to tests/auto/network/access/qftp/tst_qftp.cpp
index e31b5ac..117ac92 100644 (file)
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -55,7 +55,7 @@
 #include <QNetworkSession>
 #include <QtNetwork/private/qnetworksession_p.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=

diff --git a/tests/auto/qftp/.gitattributes b/tests/auto/network/access/qhttp/.gitattributes
similarity index 100%
rename from tests/auto/qftp/.gitattributes
rename to tests/auto/network/access/qhttp/.gitattributes

diff --git a/tests/auto/qhttp/.gitignore b/tests/auto/network/access/qhttp/.gitignore
similarity index 100%
rename from tests/auto/qhttp/.gitignore
rename to tests/auto/network/access/qhttp/.gitignore

diff --git a/tests/auto/qhttp/dummyserver.h b/tests/auto/network/access/qhttp/dummyserver.h
similarity index 100%
rename from tests/auto/qhttp/dummyserver.h
rename to tests/auto/network/access/qhttp/dummyserver.h

diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/network/access/qhttp/qhttp.pro
similarity index 100%
rename from tests/auto/qhttp/qhttp.pro
rename to tests/auto/network/access/qhttp/qhttp.pro

diff --git a/tests/auto/qhttp/webserver/rfc3252.txt b/tests/auto/network/access/qhttp/rfc3252.txt
similarity index 100%
rename from tests/auto/qhttp/webserver/rfc3252.txt
rename to tests/auto/network/access/qhttp/rfc3252.txt

diff --git a/tests/auto/qhttp/trolltech b/tests/auto/network/access/qhttp/trolltech
similarity index 100%
rename from tests/auto/qhttp/trolltech
rename to tests/auto/network/access/qhttp/trolltech

diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp
similarity index 99%
rename from tests/auto/qhttp/tst_qhttp.cpp
rename to tests/auto/network/access/qhttp/tst_qhttp.cpp
index 2af8195..8875232 100644 (file)
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp
@@ -57,7 +57,7 @@
 # include <qsslsocket.h>
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=

diff --git a/tests/auto/qhttp/webserver/cgi-bin/retrieve_testfile.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/retrieve_testfile.cgi
similarity index 100%
rename from tests/auto/qhttp/webserver/cgi-bin/retrieve_testfile.cgi
rename to tests/auto/network/access/qhttp/webserver/cgi-bin/retrieve_testfile.cgi

diff --git a/tests/auto/qhttp/webserver/cgi-bin/rfc.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/rfc.cgi
similarity index 100%
rename from tests/auto/qhttp/webserver/cgi-bin/rfc.cgi
rename to tests/auto/network/access/qhttp/webserver/cgi-bin/rfc.cgi

diff --git a/tests/auto/qhttp/webserver/cgi-bin/store_testfile.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/store_testfile.cgi
similarity index 100%
rename from tests/auto/qhttp/webserver/cgi-bin/store_testfile.cgi
rename to tests/auto/network/access/qhttp/webserver/cgi-bin/store_testfile.cgi

diff --git a/tests/auto/qhttp/webserver/index.html b/tests/auto/network/access/qhttp/webserver/index.html
similarity index 100%
rename from tests/auto/qhttp/webserver/index.html
rename to tests/auto/network/access/qhttp/webserver/index.html

diff --git a/tests/auto/qhttp/webserver/rfc3252 b/tests/auto/network/access/qhttp/webserver/rfc3252
similarity index 100%
rename from tests/auto/qhttp/webserver/rfc3252
rename to tests/auto/network/access/qhttp/webserver/rfc3252

diff --git a/tests/auto/qhttp/rfc3252.txt b/tests/auto/network/access/qhttp/webserver/rfc3252.txt
similarity index 100%
rename from tests/auto/qhttp/rfc3252.txt
rename to tests/auto/network/access/qhttp/webserver/rfc3252.txt

diff --git a/tests/auto/qhttpnetworkconnection/.gitignore b/tests/auto/network/access/qhttpnetworkconnection/.gitignore
similarity index 100%
rename from tests/auto/qhttpnetworkconnection/.gitignore
rename to tests/auto/network/access/qhttpnetworkconnection/.gitignore

diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
similarity index 100%
rename from tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
rename to tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro

diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
similarity index 99%
rename from tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
rename to tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index ceb0a07..2d30f6b 100644 (file)
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -45,7 +45,7 @@
 #include "private/qnoncontiguousbytedevice_p.h"
 #include <QAuthenticator>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 class tst_QHttpNetworkConnection: public QObject
 {

diff --git a/tests/auto/qhttpnetworkreply/.gitignore b/tests/auto/network/access/qhttpnetworkreply/.gitignore
similarity index 100%
rename from tests/auto/qhttpnetworkreply/.gitignore
rename to tests/auto/network/access/qhttpnetworkreply/.gitignore

diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
similarity index 100%
rename from tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
rename to tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro

diff --git a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
similarity index 100%
rename from tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
rename to tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp

diff --git a/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
similarity index 100%
rename from tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro
rename to tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro

diff --git a/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
similarity index 100%
rename from tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
rename to tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp

diff --git a/tests/auto/qnetworkcachemetadata/.gitignore b/tests/auto/network/access/qnetworkcachemetadata/.gitignore
similarity index 100%
rename from tests/auto/qnetworkcachemetadata/.gitignore
rename to tests/auto/network/access/qnetworkcachemetadata/.gitignore

diff --git a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
similarity index 100%
rename from tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro
rename to tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro

diff --git a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp b/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
similarity index 100%
rename from tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
rename to tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp

diff --git a/tests/auto/qnetworkcookie/.gitignore b/tests/auto/network/access/qnetworkcookie/.gitignore
similarity index 100%
rename from tests/auto/qnetworkcookie/.gitignore
rename to tests/auto/network/access/qnetworkcookie/.gitignore

diff --git a/tests/auto/qnetworkcookie/qnetworkcookie.pro b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
similarity index 100%
rename from tests/auto/qnetworkcookie/qnetworkcookie.pro
rename to tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro

diff --git a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
similarity index 100%
rename from tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
rename to tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp

diff --git a/tests/auto/qnetworkcookiejar/.gitignore b/tests/auto/network/access/qnetworkcookiejar/.gitignore
similarity index 100%
rename from tests/auto/qnetworkcookiejar/.gitignore
rename to tests/auto/network/access/qnetworkcookiejar/.gitignore

diff --git a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
similarity index 100%
rename from tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
rename to tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro

diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
similarity index 100%
rename from tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
rename to tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp

diff --git a/tests/auto/qnetworkdiskcache/.gitignore b/tests/auto/network/access/qnetworkdiskcache/.gitignore
similarity index 100%
rename from tests/auto/qnetworkdiskcache/.gitignore
rename to tests/auto/network/access/qnetworkdiskcache/.gitignore

diff --git a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
similarity index 100%
rename from tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro
rename to tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro

diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
similarity index 99%
rename from tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
rename to tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 224d1cb..030eae6 100644 (file)
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
 #include <qnetworkdiskcache.h>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 #define EXAMPLE_URL "http://user:pass@www.example.com/#foo"
 //cached objects are organized into these many subdirs

diff --git a/tests/auto/qnetworkreply/.gitattributes b/tests/auto/network/access/qnetworkreply/.gitattributes
similarity index 100%
rename from tests/auto/qnetworkreply/.gitattributes
rename to tests/auto/network/access/qnetworkreply/.gitattributes

diff --git a/tests/auto/qnetworkreply/.gitignore b/tests/auto/network/access/qnetworkreply/.gitignore
similarity index 100%
rename from tests/auto/qnetworkreply/.gitignore
rename to tests/auto/network/access/qnetworkreply/.gitignore

diff --git a/tests/auto/qnetworkreply/bigfile b/tests/auto/network/access/qnetworkreply/bigfile
similarity index 100%
rename from tests/auto/qnetworkreply/bigfile
rename to tests/auto/network/access/qnetworkreply/bigfile

diff --git a/tests/auto/qsslsocket/certs/aspiriniks.ca.crt b/tests/auto/network/access/qnetworkreply/certs/aspiriniks.ca.crt
similarity index 100%
rename from tests/auto/qsslsocket/certs/aspiriniks.ca.crt
rename to tests/auto/network/access/qnetworkreply/certs/aspiriniks.ca.crt

diff --git a/tests/auto/qsslsocket/certs/fluke.cert b/tests/auto/network/access/qnetworkreply/certs/fluke.cert
similarity index 100%
rename from tests/auto/qsslsocket/certs/fluke.cert
rename to tests/auto/network/access/qnetworkreply/certs/fluke.cert

diff --git a/tests/auto/qsslsocket/certs/fluke.key b/tests/auto/network/access/qnetworkreply/certs/fluke.key
similarity index 100%
rename from tests/auto/qsslsocket/certs/fluke.key
rename to tests/auto/network/access/qnetworkreply/certs/fluke.key

diff --git a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem b/tests/auto/network/access/qnetworkreply/certs/qt-test-server-cacert.pem
similarity index 100%
rename from tests/auto/qsslsocket/certs/qt-test-server-cacert.pem
rename to tests/auto/network/access/qnetworkreply/certs/qt-test-server-cacert.pem

diff --git a/tests/auto/qnetworkreply/certs/server.key b/tests/auto/network/access/qnetworkreply/certs/server.key
similarity index 100%
rename from tests/auto/qnetworkreply/certs/server.key
rename to tests/auto/network/access/qnetworkreply/certs/server.key

diff --git a/tests/auto/qnetworkreply/certs/server.pem b/tests/auto/network/access/qnetworkreply/certs/server.pem
similarity index 100%
rename from tests/auto/qnetworkreply/certs/server.pem
rename to tests/auto/network/access/qnetworkreply/certs/server.pem

diff --git a/tests/auto/qnetworkreply/echo/echo.pro b/tests/auto/network/access/qnetworkreply/echo/echo.pro
similarity index 100%
rename from tests/auto/qnetworkreply/echo/echo.pro
rename to tests/auto/network/access/qnetworkreply/echo/echo.pro

diff --git a/tests/auto/qnetworkreply/echo/main.cpp b/tests/auto/network/access/qnetworkreply/echo/main.cpp
similarity index 100%
rename from tests/auto/qnetworkreply/echo/main.cpp
rename to tests/auto/network/access/qnetworkreply/echo/main.cpp

diff --git a/tests/auto/qnetworkreply/empty b/tests/auto/network/access/qnetworkreply/empty
similarity index 100%
rename from tests/auto/qnetworkreply/empty
rename to tests/auto/network/access/qnetworkreply/empty

diff --git a/tests/auto/qnetworkreply/image1.jpg b/tests/auto/network/access/qnetworkreply/image1.jpg
similarity index 100%
rename from tests/auto/qnetworkreply/image1.jpg
rename to tests/auto/network/access/qnetworkreply/image1.jpg

diff --git a/tests/auto/qnetworkreply/image2.jpg b/tests/auto/network/access/qnetworkreply/image2.jpg
similarity index 100%
rename from tests/auto/qnetworkreply/image2.jpg
rename to tests/auto/network/access/qnetworkreply/image2.jpg

diff --git a/tests/auto/qnetworkreply/image3.jpg b/tests/auto/network/access/qnetworkreply/image3.jpg
similarity index 100%
rename from tests/auto/qnetworkreply/image3.jpg
rename to tests/auto/network/access/qnetworkreply/image3.jpg

diff --git a/tests/auto/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
similarity index 100%
rename from tests/auto/qnetworkreply/qnetworkreply.pro
rename to tests/auto/network/access/qnetworkreply/qnetworkreply.pro

diff --git a/tests/auto/qnetworkreply/qnetworkreply.qrc b/tests/auto/network/access/qnetworkreply/qnetworkreply.qrc
similarity index 100%
rename from tests/auto/qnetworkreply/qnetworkreply.qrc
rename to tests/auto/network/access/qnetworkreply/qnetworkreply.qrc

diff --git a/tests/auto/qnetworkreply/resource b/tests/auto/network/access/qnetworkreply/resource
similarity index 100%
rename from tests/auto/qnetworkreply/resource
rename to tests/auto/network/access/qnetworkreply/resource

diff --git a/tests/auto/qftp/rfc3252.txt b/tests/auto/network/access/qnetworkreply/rfc3252.txt
similarity index 100%
rename from tests/auto/qftp/rfc3252.txt
rename to tests/auto/network/access/qnetworkreply/rfc3252.txt

diff --git a/tests/auto/qnetworkreply/smb-file.txt b/tests/auto/network/access/qnetworkreply/smb-file.txt
similarity index 100%
rename from tests/auto/qnetworkreply/smb-file.txt
rename to tests/auto/network/access/qnetworkreply/smb-file.txt

diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
similarity index 100%
rename from tests/auto/qnetworkreply/test/test.pro
rename to tests/auto/network/access/qnetworkreply/test/test.pro

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
similarity index 99%
rename from tests/auto/qnetworkreply/tst_qnetworkreply.cpp
rename to tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 1ae7689..dd9fe8e 100644 (file)
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -81,7 +81,7 @@
 #define SRCDIR "."
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QSharedPointer<char>)
 Q_DECLARE_METATYPE(QNetworkReply*)

diff --git a/tests/auto/qnetworkrequest/.gitignore b/tests/auto/network/access/qnetworkrequest/.gitignore
similarity index 100%
rename from tests/auto/qnetworkrequest/.gitignore
rename to tests/auto/network/access/qnetworkrequest/.gitignore

diff --git a/tests/auto/qnetworkrequest/qnetworkrequest.pro b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
similarity index 100%
rename from tests/auto/qnetworkrequest/qnetworkrequest.pro
rename to tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro

diff --git a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
similarity index 100%
rename from tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
rename to tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp

diff --git a/tests/auto/network/bearer/bearer.pro b/tests/auto/network/bearer/bearer.pro
new file mode 100644 (file)
index 0000000..872a818
--- /dev/null
+++ b/tests/auto/network/bearer/bearer.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qnetworkconfiguration \
+   qnetworkconfigurationmanager \
+   qnetworksession \
+

diff --git a/tests/auto/qbearertestcommon.h b/tests/auto/network/bearer/qbearertestcommon.h
similarity index 100%
rename from tests/auto/qbearertestcommon.h
rename to tests/auto/network/bearer/qbearertestcommon.h

diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
similarity index 100%
rename from tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
rename to tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro

diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
similarity index 100%
rename from tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
rename to tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp

diff --git a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
similarity index 100%
rename from tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
rename to tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro

diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
similarity index 100%
rename from tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
rename to tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp

diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
similarity index 100%
rename from tests/auto/qnetworksession/lackey/lackey.pro
rename to tests/auto/network/bearer/qnetworksession/lackey/lackey.pro

diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
similarity index 100%
rename from tests/auto/qnetworksession/lackey/main.cpp
rename to tests/auto/network/bearer/qnetworksession/lackey/main.cpp

diff --git a/tests/auto/qnetworksession/qnetworksession.pro b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro
similarity index 100%
rename from tests/auto/qnetworksession/qnetworksession.pro
rename to tests/auto/network/bearer/qnetworksession/qnetworksession.pro

diff --git a/tests/auto/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro
similarity index 100%
rename from tests/auto/qnetworksession/test/test.pro
rename to tests/auto/network/bearer/qnetworksession/test/test.pro

diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
similarity index 100%
rename from tests/auto/qnetworksession/test/tst_qnetworksession.cpp
rename to tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp

diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro
new file mode 100644 (file)
index 0000000..d1c901d
--- /dev/null
+++ b/tests/auto/network/kernel/kernel.pro
@@ -0,0 +1,14 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qhostinfo \
+#   qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
+   qauthenticator \
+   qnetworkproxy \
+   qnetworkinterface \
+   qnetworkaddressentry \
+   qhostaddress \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qauthenticator \
+    qhostinfo \
+

diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
similarity index 100%
rename from tests/auto/qauthenticator/qauthenticator.pro
rename to tests/auto/network/kernel/qauthenticator/qauthenticator.pro

diff --git a/tests/auto/qauthenticator/tst_qauthenticator.cpp b/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp
similarity index 100%
rename from tests/auto/qauthenticator/tst_qauthenticator.cpp
rename to tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp

diff --git a/tests/auto/qhostaddress/.gitignore b/tests/auto/network/kernel/qhostaddress/.gitignore
similarity index 100%
rename from tests/auto/qhostaddress/.gitignore
rename to tests/auto/network/kernel/qhostaddress/.gitignore

diff --git a/tests/auto/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
similarity index 100%
rename from tests/auto/qhostaddress/qhostaddress.pro
rename to tests/auto/network/kernel/qhostaddress/qhostaddress.pro

diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
similarity index 100%
rename from tests/auto/qhostaddress/tst_qhostaddress.cpp
rename to tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp

diff --git a/tests/auto/qhostinfo/.gitignore b/tests/auto/network/kernel/qhostinfo/.gitignore
similarity index 100%
rename from tests/auto/qhostinfo/.gitignore
rename to tests/auto/network/kernel/qhostinfo/.gitignore

diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
similarity index 100%
rename from tests/auto/qhostinfo/qhostinfo.pro
rename to tests/auto/network/kernel/qhostinfo/qhostinfo.pro

diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
similarity index 99%
rename from tests/auto/qhostinfo/tst_qhostinfo.cpp
rename to tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index 1c7df1b..58b51bc 100644 (file)
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -94,8 +94,8 @@
 # endif
 #endif
 
-#include "../network-settings.h"
-#include "../../shared/util.h"
+#include "../../../network-settings.h"
+#include "../../../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=

diff --git a/tests/auto/qnetworkaddressentry/.gitignore b/tests/auto/network/kernel/qnetworkaddressentry/.gitignore
similarity index 100%
rename from tests/auto/qnetworkaddressentry/.gitignore
rename to tests/auto/network/kernel/qnetworkaddressentry/.gitignore

diff --git a/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
similarity index 100%
rename from tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro
rename to tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro

diff --git a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp b/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
similarity index 100%
rename from tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
rename to tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp

diff --git a/tests/auto/qnetworkinterface/.gitignore b/tests/auto/network/kernel/qnetworkinterface/.gitignore
similarity index 100%
rename from tests/auto/qnetworkinterface/.gitignore
rename to tests/auto/network/kernel/qnetworkinterface/.gitignore

diff --git a/tests/auto/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
similarity index 100%
rename from tests/auto/qnetworkinterface/qnetworkinterface.pro
rename to tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro

diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
similarity index 99%
rename from tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
rename to tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index ae3436d..7a2f0e5 100644 (file)
--- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -47,7 +47,7 @@
 #include <qtcpsocket.h>
 #include <QNetworkConfigurationManager>
 #include <QNetworkSession>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_FILES=qnetworkinterface.cpp qnetworkinterface.h qnetworkinterface_unix.cpp qnetworkinterface_win.cpp
 

diff --git a/tests/auto/qnetworkproxy/.gitignore b/tests/auto/network/kernel/qnetworkproxy/.gitignore
similarity index 100%
rename from tests/auto/qnetworkproxy/.gitignore
rename to tests/auto/network/kernel/qnetworkproxy/.gitignore

diff --git a/tests/auto/qnetworkproxy/qnetworkproxy.pro b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
similarity index 100%
rename from tests/auto/qnetworkproxy/qnetworkproxy.pro
rename to tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro

diff --git a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp b/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
similarity index 100%
rename from tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp
rename to tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp

diff --git a/tests/auto/qnetworkproxyfactory/.gitignore b/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore
similarity index 100%
rename from tests/auto/qnetworkproxyfactory/.gitignore
rename to tests/auto/network/kernel/qnetworkproxyfactory/.gitignore

diff --git a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
similarity index 100%
rename from tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro
rename to tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro

diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
similarity index 100%
rename from tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
rename to tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp

diff --git a/tests/auto/network/network.pro b/tests/auto/network/network.pro
new file mode 100644 (file)
index 0000000..3eafd7d
--- /dev/null
+++ b/tests/auto/network/network.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   access \
+   bearer \
+   kernel \
+   ssl \
+   socket \
+

diff --git a/tests/auto/platformsocketengine/.gitignore b/tests/auto/network/socket/platformsocketengine/.gitignore
similarity index 100%
rename from tests/auto/platformsocketengine/.gitignore
rename to tests/auto/network/socket/platformsocketengine/.gitignore

diff --git a/tests/auto/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
similarity index 100%
rename from tests/auto/platformsocketengine/platformsocketengine.pri
rename to tests/auto/network/socket/platformsocketengine/platformsocketengine.pri

diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
similarity index 100%
rename from tests/auto/platformsocketengine/platformsocketengine.pro
rename to tests/auto/network/socket/platformsocketengine/platformsocketengine.pro

diff --git a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
similarity index 99%
rename from tests/auto/platformsocketengine/tst_platformsocketengine.cpp
rename to tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
index eaaabae..9e93108 100644 (file)
--- a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
@@ -79,7 +79,7 @@
 
 #include <qstringlist.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_FILES=network/qnativesocketengine.cpp network/qnativesocketengine_p.h network/qnativesocketengine_unix.cpp
 

diff --git a/tests/auto/qabstractsocket/.gitignore b/tests/auto/network/socket/qabstractsocket/.gitignore
similarity index 100%
rename from tests/auto/qabstractsocket/.gitignore
rename to tests/auto/network/socket/qabstractsocket/.gitignore

diff --git a/tests/auto/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
similarity index 100%
rename from tests/auto/qabstractsocket/qabstractsocket.pro
rename to tests/auto/network/socket/qabstractsocket/qabstractsocket.pro

diff --git a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp b/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
similarity index 100%
rename from tests/auto/qabstractsocket/tst_qabstractsocket.cpp
rename to tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp

diff --git a/tests/auto/qhttpsocketengine/.gitignore b/tests/auto/network/socket/qhttpsocketengine/.gitignore
similarity index 100%
rename from tests/auto/qhttpsocketengine/.gitignore
rename to tests/auto/network/socket/qhttpsocketengine/.gitignore

diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
similarity index 100%
rename from tests/auto/qhttpsocketengine/qhttpsocketengine.pro
rename to tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro

diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
similarity index 99%
rename from tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
rename to tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
index 1e1a51b..5a90abe 100644 (file)
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -54,7 +54,7 @@
 #include <qdebug.h>
 #include <qtcpserver.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 class tst_QHttpSocketEngine : public QObject
 {

diff --git a/tests/auto/qlocalsocket/.gitignore b/tests/auto/network/socket/qlocalsocket/.gitignore
similarity index 100%
rename from tests/auto/qlocalsocket/.gitignore
rename to tests/auto/network/socket/qlocalsocket/.gitignore

diff --git a/tests/auto/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
similarity index 100%
rename from tests/auto/qlocalsocket/example/client/client.pro
rename to tests/auto/network/socket/qlocalsocket/example/client/client.pro

diff --git a/tests/auto/qlocalsocket/example/client/main.cpp b/tests/auto/network/socket/qlocalsocket/example/client/main.cpp
similarity index 100%
rename from tests/auto/qlocalsocket/example/client/main.cpp
rename to tests/auto/network/socket/qlocalsocket/example/client/main.cpp

diff --git a/tests/auto/qlocalsocket/example/example.pro b/tests/auto/network/socket/qlocalsocket/example/example.pro
similarity index 100%
rename from tests/auto/qlocalsocket/example/example.pro
rename to tests/auto/network/socket/qlocalsocket/example/example.pro

diff --git a/tests/auto/qlocalsocket/example/server/main.cpp b/tests/auto/network/socket/qlocalsocket/example/server/main.cpp
similarity index 100%
rename from tests/auto/qlocalsocket/example/server/main.cpp
rename to tests/auto/network/socket/qlocalsocket/example/server/main.cpp

diff --git a/tests/auto/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
similarity index 100%
rename from tests/auto/qlocalsocket/example/server/server.pro
rename to tests/auto/network/socket/qlocalsocket/example/server/server.pro

diff --git a/tests/auto/qlocalsocket/lackey/lackey.pro b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
similarity index 100%
rename from tests/auto/qlocalsocket/lackey/lackey.pro
rename to tests/auto/network/socket/qlocalsocket/lackey/lackey.pro

diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/network/socket/qlocalsocket/lackey/main.cpp
similarity index 100%
rename from tests/auto/qlocalsocket/lackey/main.cpp
rename to tests/auto/network/socket/qlocalsocket/lackey/main.cpp

diff --git a/tests/auto/qlocalsocket/lackey/scripts/client.js b/tests/auto/network/socket/qlocalsocket/lackey/scripts/client.js
similarity index 100%
rename from tests/auto/qlocalsocket/lackey/scripts/client.js
rename to tests/auto/network/socket/qlocalsocket/lackey/scripts/client.js

diff --git a/tests/auto/qlocalsocket/lackey/scripts/server.js b/tests/auto/network/socket/qlocalsocket/lackey/scripts/server.js
similarity index 100%
rename from tests/auto/qlocalsocket/lackey/scripts/server.js
rename to tests/auto/network/socket/qlocalsocket/lackey/scripts/server.js

diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro
similarity index 100%
rename from tests/auto/qlocalsocket/qlocalsocket.pro
rename to tests/auto/network/socket/qlocalsocket/qlocalsocket.pro

diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro
similarity index 100%
rename from tests/auto/qlocalsocket/test/test.pro
rename to tests/auto/network/socket/qlocalsocket/test/test.pro

diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
similarity index 99%
rename from tests/auto/qlocalsocket/tst_qlocalsocket.cpp
rename to tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 3dc5e73..57daa92 100644 (file)
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -45,7 +45,7 @@
 #include <qtextstream.h>
 #include <QtNetwork/qlocalsocket.h>
 #include <QtNetwork/qlocalserver.h>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 #ifdef Q_OS_SYMBIAN
     #include <unistd.h>

diff --git a/tests/auto/qsocks5socketengine/.gitignore b/tests/auto/network/socket/qsocks5socketengine/.gitignore
similarity index 100%
rename from tests/auto/qsocks5socketengine/.gitignore
rename to tests/auto/network/socket/qsocks5socketengine/.gitignore

diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
similarity index 100%
rename from tests/auto/qsocks5socketengine/qsocks5socketengine.pro
rename to tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro

diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
similarity index 99%
rename from tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
rename to tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 83d6871..2678816 100644 (file)
--- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -59,7 +59,7 @@
 #include <qmetatype.h>
 #include <qdebug.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QQueue<QByteArray>)
 

diff --git a/tests/auto/qtcpserver/.gitignore b/tests/auto/network/socket/qtcpserver/.gitignore
similarity index 100%
rename from tests/auto/qtcpserver/.gitignore
rename to tests/auto/network/socket/qtcpserver/.gitignore

diff --git a/tests/auto/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
similarity index 100%
rename from tests/auto/qtcpserver/crashingServer/crashingServer.pro
rename to tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro

diff --git a/tests/auto/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
similarity index 100%
rename from tests/auto/qtcpserver/crashingServer/main.cpp
rename to tests/auto/network/socket/qtcpserver/crashingServer/main.cpp

diff --git a/tests/auto/qtcpserver/qtcpserver.pro b/tests/auto/network/socket/qtcpserver/qtcpserver.pro
similarity index 100%
rename from tests/auto/qtcpserver/qtcpserver.pro
rename to tests/auto/network/socket/qtcpserver/qtcpserver.pro

diff --git a/tests/auto/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
similarity index 100%
rename from tests/auto/qtcpserver/test/test.pro
rename to tests/auto/network/socket/qtcpserver/test/test.pro

diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
similarity index 99%
rename from tests/auto/qtcpserver/tst_qtcpserver.cpp
rename to tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index b72e61f..ca28a9c 100644 (file)
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -73,7 +73,7 @@ Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 #include <QNetworkSession>
 #include <QNetworkConfiguration>
 #include <QNetworkConfigurationManager>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=

diff --git a/tests/auto/qtcpsocket/.gitignore b/tests/auto/network/socket/qtcpsocket/.gitignore
similarity index 100%
rename from tests/auto/qtcpsocket/.gitignore
rename to tests/auto/network/socket/qtcpsocket/.gitignore

diff --git a/tests/auto/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro
similarity index 100%
rename from tests/auto/qtcpsocket/qtcpsocket.pro
rename to tests/auto/network/socket/qtcpsocket/qtcpsocket.pro

diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
similarity index 100%
rename from tests/auto/qtcpsocket/stressTest/Test.cpp
rename to tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp

diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
similarity index 100%
rename from tests/auto/qtcpsocket/stressTest/Test.h
rename to tests/auto/network/socket/qtcpsocket/stressTest/Test.h

diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
similarity index 100%
rename from tests/auto/qtcpsocket/stressTest/main.cpp
rename to tests/auto/network/socket/qtcpsocket/stressTest/main.cpp

diff --git a/tests/auto/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
similarity index 100%
rename from tests/auto/qtcpsocket/stressTest/stressTest.pro
rename to tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro

diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
similarity index 100%
rename from tests/auto/qtcpsocket/test/test.pro
rename to tests/auto/network/socket/qtcpsocket/test/test.pro

diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
similarity index 99%
rename from tests/auto/qtcpsocket/tst_qtcpsocket.cpp
rename to tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 39a64ab..bae3f7c 100644 (file)
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -94,8 +94,8 @@
 
 #include "private/qhostinfo_p.h"
 
-#include "../network-settings.h"
-#include "../../shared/util.h"
+#include "../../../network-settings.h"
+#include "../../../../shared/util.h"
 
 Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)

diff --git a/tests/auto/qudpsocket/.gitignore b/tests/auto/network/socket/qudpsocket/.gitignore
similarity index 100%
rename from tests/auto/qudpsocket/.gitignore
rename to tests/auto/network/socket/qudpsocket/.gitignore

diff --git a/tests/auto/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
similarity index 100%
rename from tests/auto/qudpsocket/clientserver/clientserver.pro
rename to tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro

diff --git a/tests/auto/qudpsocket/clientserver/main.cpp b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
similarity index 100%
rename from tests/auto/qudpsocket/clientserver/main.cpp
rename to tests/auto/network/socket/qudpsocket/clientserver/main.cpp

diff --git a/tests/auto/qudpsocket/qudpsocket.pro b/tests/auto/network/socket/qudpsocket/qudpsocket.pro
similarity index 100%
rename from tests/auto/qudpsocket/qudpsocket.pro
rename to tests/auto/network/socket/qudpsocket/qudpsocket.pro

diff --git a/tests/auto/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
similarity index 100%
rename from tests/auto/qudpsocket/test/test.pro
rename to tests/auto/network/socket/qudpsocket/test/test.pro

diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
similarity index 99%
rename from tests/auto/qudpsocket/tst_qudpsocket.cpp
rename to tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index ad7bfbb..83d30cc 100644 (file)
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -53,7 +53,7 @@
 #include <QNetworkInterface>
 
 #include <qstringlist.h>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfigmanager.h>

diff --git a/tests/auto/qudpsocket/udpServer/main.cpp b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
similarity index 100%
rename from tests/auto/qudpsocket/udpServer/main.cpp
rename to tests/auto/network/socket/qudpsocket/udpServer/main.cpp

diff --git a/tests/auto/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
similarity index 100%
rename from tests/auto/qudpsocket/udpServer/udpServer.pro
rename to tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro

diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro
new file mode 100644 (file)
index 0000000..49fb52d
--- /dev/null
+++ b/tests/auto/network/socket/socket.pro
@@ -0,0 +1,17 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qhttpsocketengine \
+   qudpsocket \
+   qtcpsocket \
+   #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
+   qtcpserver \
+   qsocks5socketengine \
+   qabstractsocket \
+   platformsocketengine \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          platformsocketengine \
+          qhttpsocketengine \
+          qsocks5socketengine \
+
+

diff --git a/tests/auto/qsslcertificate/.gitignore b/tests/auto/network/ssl/qsslcertificate/.gitignore
similarity index 100%
rename from tests/auto/qsslcertificate/.gitignore
rename to tests/auto/network/ssl/qsslcertificate/.gitignore

diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/ca-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem

diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-md5
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-md5
rename to tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-md5

diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-sha1
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-sha1
rename to tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-sha1

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem.san
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem.san

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss-san.pem
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem.san b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem.san
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss-san.pem.san
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem.san

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.der b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.der
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.der.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der.pubkey
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.der.pubkey
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der.pubkey

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.pem
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-md5
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-md5
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-md5

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-sha1
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-sha1
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-sha1

diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.pubkey
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert-ss.pem.pubkey
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.pubkey

diff --git a/tests/auto/qsslcertificate/certificates/cert.der b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.der
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.der

diff --git a/tests/auto/qsslcertificate/certificates/cert.der.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der.pubkey
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.der.pubkey
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.der.pubkey

diff --git a/tests/auto/qsslcertificate/certificates/cert.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.pem
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.pem

diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-md5
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.pem.digest-md5
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-md5

diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-sha1
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.pem.digest-sha1
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-sha1

diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.pubkey
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/cert.pem.pubkey
rename to tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.pubkey

diff --git a/tests/auto/qsslcertificate/certificates/gencertificates.sh b/tests/auto/network/ssl/qsslcertificate/certificates/gencertificates.sh
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/gencertificates.sh
rename to tests/auto/network/ssl/qsslcertificate/certificates/gencertificates.sh

diff --git a/tests/auto/qsslcertificate/certificates/san.cnf b/tests/auto/network/ssl/qsslcertificate/certificates/san.cnf
similarity index 100%
rename from tests/auto/qsslcertificate/certificates/san.cnf
rename to tests/auto/network/ssl/qsslcertificate/certificates/san.cnf

diff --git a/tests/auto/qsslcertificate/more-certificates/badguy-nul-cn.crt b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-cn.crt
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/badguy-nul-cn.crt
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-cn.crt

diff --git a/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-san.crt
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-san.crt

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted1.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted1.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted2.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted2.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted3.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted3.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted4.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted4.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted5.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted5.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted6.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted6.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted7.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted7.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted8.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted8.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted9.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted9.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8 b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8

diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0 b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0

diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-serial-number.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-serial-number.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/cert-large-serial-number.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-serial-number.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/malformed-just-begin.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/natwest-banking.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/natwest-banking.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/natwest-banking.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/natwest-banking.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/no-ending-newline.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/no-ending-newline.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/no-ending-newline.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/no-ending-newline.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem

diff --git a/tests/auto/qsslcertificate/more-certificates/trailing-whitespace.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/trailing-whitespace.pem
similarity index 100%
rename from tests/auto/qsslcertificate/more-certificates/trailing-whitespace.pem
rename to tests/auto/network/ssl/qsslcertificate/more-certificates/trailing-whitespace.pem

diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
similarity index 100%
rename from tests/auto/qsslcertificate/qsslcertificate.pro
rename to tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro

diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
similarity index 100%
rename from tests/auto/qsslcertificate/tst_qsslcertificate.cpp
rename to tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp

diff --git a/tests/auto/qsslcertificate/verify-certs/README b/tests/auto/network/ssl/qsslcertificate/verify-certs/README
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/README
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/README

diff --git a/tests/auto/qsslcertificate/verify-certs/cacert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/cacert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/cacert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/cacert.pem

diff --git a/tests/auto/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem

diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem

diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem

diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem

diff --git a/tests/auto/qsslcertificate/verify-certs/test-ocsp-good-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-ocsp-good-cert.pem
similarity index 100%
rename from tests/auto/qsslcertificate/verify-certs/test-ocsp-good-cert.pem
rename to tests/auto/network/ssl/qsslcertificate/verify-certs/test-ocsp-good-cert.pem

diff --git a/tests/auto/qsslcipher/.gitignore b/tests/auto/network/ssl/qsslcipher/.gitignore
similarity index 100%
rename from tests/auto/qsslcipher/.gitignore
rename to tests/auto/network/ssl/qsslcipher/.gitignore

diff --git a/tests/auto/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
similarity index 100%
rename from tests/auto/qsslcipher/qsslcipher.pro
rename to tests/auto/network/ssl/qsslcipher/qsslcipher.pro

diff --git a/tests/auto/qsslcipher/tst_qsslcipher.cpp b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
similarity index 100%
rename from tests/auto/qsslcipher/tst_qsslcipher.cpp
rename to tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp

diff --git a/tests/auto/qsslerror/.gitignore b/tests/auto/network/ssl/qsslerror/.gitignore
similarity index 100%
rename from tests/auto/qsslerror/.gitignore
rename to tests/auto/network/ssl/qsslerror/.gitignore

diff --git a/tests/auto/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro
similarity index 100%
rename from tests/auto/qsslerror/qsslerror.pro
rename to tests/auto/network/ssl/qsslerror/qsslerror.pro

diff --git a/tests/auto/qsslerror/tst_qsslerror.cpp b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
similarity index 100%
rename from tests/auto/qsslerror/tst_qsslerror.cpp
rename to tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp

diff --git a/tests/auto/qsslkey/.gitignore b/tests/auto/network/ssl/qsslkey/.gitignore
similarity index 100%
rename from tests/auto/qsslkey/.gitignore
rename to tests/auto/network/ssl/qsslkey/.gitignore

diff --git a/tests/auto/qsslkey/keys/dsa-pri-1024.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-1024.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.der

diff --git a/tests/auto/qsslkey/keys/dsa-pri-1024.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-1024.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pri-512.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-512.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.der

diff --git a/tests/auto/qsslkey/keys/dsa-pri-512.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-512.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pri-576.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-576.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.der

diff --git a/tests/auto/qsslkey/keys/dsa-pri-576.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-576.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pri-960.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-960.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.der

diff --git a/tests/auto/qsslkey/keys/dsa-pri-960.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pri-960.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pub-1024.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-1024.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.der

diff --git a/tests/auto/qsslkey/keys/dsa-pub-1024.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-1024.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pub-512.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-512.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.der

diff --git a/tests/auto/qsslkey/keys/dsa-pub-512.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-512.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pub-576.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-576.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.der

diff --git a/tests/auto/qsslkey/keys/dsa-pub-576.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-576.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.pem

diff --git a/tests/auto/qsslkey/keys/dsa-pub-960.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.der
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-960.der
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.der

diff --git a/tests/auto/qsslkey/keys/dsa-pub-960.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/dsa-pub-960.pem
rename to tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.pem

diff --git a/tests/auto/qsslkey/keys/genkeys.sh b/tests/auto/network/ssl/qsslkey/keys/genkeys.sh
similarity index 100%
rename from tests/auto/qsslkey/keys/genkeys.sh
rename to tests/auto/network/ssl/qsslkey/keys/genkeys.sh

diff --git a/tests/auto/qsslkey/keys/rsa-pri-1023.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-1023.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-1023.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-1023.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-1024.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-1024.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-1024.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-1024.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-2048.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-2048.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-2048.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-2048.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-40.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-40.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-511.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-511.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-511.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-511.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-512.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-512.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-512.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-512.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pri-999.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-999.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.der

diff --git a/tests/auto/qsslkey/keys/rsa-pri-999.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pri-999.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-1023.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-1023.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-1023.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-1023.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-1024.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-1024.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-1024.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-1024.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-2048.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-2048.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-2048.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-2048.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-40.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-40.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-511.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-511.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-511.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-511.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-512.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-512.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-512.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-512.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.pem

diff --git a/tests/auto/qsslkey/keys/rsa-pub-999.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.der
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-999.der
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.der

diff --git a/tests/auto/qsslkey/keys/rsa-pub-999.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.pem
similarity index 100%
rename from tests/auto/qsslkey/keys/rsa-pub-999.pem
rename to tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.pem

diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro
similarity index 100%
rename from tests/auto/qsslkey/qsslkey.pro
rename to tests/auto/network/ssl/qsslkey/qsslkey.pro

diff --git a/tests/auto/qsslkey/rsa-with-passphrase.pem b/tests/auto/network/ssl/qsslkey/rsa-with-passphrase.pem
similarity index 100%
rename from tests/auto/qsslkey/rsa-with-passphrase.pem
rename to tests/auto/network/ssl/qsslkey/rsa-with-passphrase.pem

diff --git a/tests/auto/qsslkey/rsa-without-passphrase.pem b/tests/auto/network/ssl/qsslkey/rsa-without-passphrase.pem
similarity index 100%
rename from tests/auto/qsslkey/rsa-without-passphrase.pem
rename to tests/auto/network/ssl/qsslkey/rsa-without-passphrase.pem

diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
similarity index 100%
rename from tests/auto/qsslkey/tst_qsslkey.cpp
rename to tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp

diff --git a/tests/auto/qsslsocket/.gitignore b/tests/auto/network/ssl/qsslsocket/.gitignore
similarity index 100%
rename from tests/auto/qsslsocket/.gitignore
rename to tests/auto/network/ssl/qsslsocket/.gitignore

diff --git a/tests/auto/qnetworkreply/certs/aspiriniks.ca.crt b/tests/auto/network/ssl/qsslsocket/certs/aspiriniks.ca.crt
similarity index 100%
rename from tests/auto/qnetworkreply/certs/aspiriniks.ca.crt
rename to tests/auto/network/ssl/qsslsocket/certs/aspiriniks.ca.crt

diff --git a/tests/auto/qsslsocket/certs/fake-login.live.com.key b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.key
similarity index 100%
rename from tests/auto/qsslsocket/certs/fake-login.live.com.key
rename to tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.key

diff --git a/tests/auto/qsslsocket/certs/fake-login.live.com.pem b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.pem
similarity index 100%
rename from tests/auto/qsslsocket/certs/fake-login.live.com.pem
rename to tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.pem

diff --git a/tests/auto/qnetworkreply/certs/fluke.cert b/tests/auto/network/ssl/qsslsocket/certs/fluke.cert
similarity index 100%
rename from tests/auto/qnetworkreply/certs/fluke.cert
rename to tests/auto/network/ssl/qsslsocket/certs/fluke.cert

diff --git a/tests/auto/qnetworkreply/certs/fluke.key b/tests/auto/network/ssl/qsslsocket/certs/fluke.key
similarity index 100%
rename from tests/auto/qnetworkreply/certs/fluke.key
rename to tests/auto/network/ssl/qsslsocket/certs/fluke.key

diff --git a/tests/auto/qnetworkreply/certs/qt-test-server-cacert.pem b/tests/auto/network/ssl/qsslsocket/certs/qt-test-server-cacert.pem
similarity index 100%
rename from tests/auto/qnetworkreply/certs/qt-test-server-cacert.pem
rename to tests/auto/network/ssl/qsslsocket/certs/qt-test-server-cacert.pem

diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
similarity index 100%
rename from tests/auto/qsslsocket/qsslsocket.pro
rename to tests/auto/network/ssl/qsslsocket/qsslsocket.pro

diff --git a/tests/auto/qsslsocket/ssl.tar.gz b/tests/auto/network/ssl/qsslsocket/ssl.tar.gz
similarity index 100%
rename from tests/auto/qsslsocket/ssl.tar.gz
rename to tests/auto/network/ssl/qsslsocket/ssl.tar.gz

diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
similarity index 99%
rename from tests/auto/qsslsocket/tst_qsslsocket.cpp
rename to tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index ee2d15b..6b77203 100644 (file)
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -60,7 +60,7 @@
 #include "private/qsslsocket_openssl_symbols_p.h"
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
 Q_DECLARE_METATYPE(QAbstractSocket::SocketError)

diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
new file mode 100644 (file)
index 0000000..fd57a17
--- /dev/null
+++ b/tests/auto/network/ssl/ssl.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qsslcertificate \
+   qsslcipher \
+   qsslerror \
+   qsslsocket \
+   qsslkey \
+