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>

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 \

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 \
-

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 \
+
+

tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp

@@ -42,8 +42,8 @@
 
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfigmanager.h>

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=

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=

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
 {

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

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*)

tests/auto/network/bearer/bearer.pro

@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qnetworkconfiguration \
+   qnetworkconfigurationmanager \
+   qnetworksession \
+

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 \
+

tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp

@@ -94,8 +94,8 @@
 # endif
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=