Update unit tests

Private unittests get now build with:

$qmake -config private_tests

Change-Id: I5fb234e9c6f86cf2d740a604923eb8a501699d44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/src/websockets/qwebsocketdataprocessor_p.h b/src/websockets/qwebsocketdataprocessor_p.h
index 30757b3..4ad4fa6 100644 (file)
--- a/src/websockets/qwebsocketdataprocessor_p.h
+++ b/src/websockets/qwebsocketdataprocessor_p.h
@@ -46,7 +46,7 @@ class QWebSocketFrame;
     \internal
     The DataProcessor class reads and interprets incoming websocket messages, and emits appropriate signals.
  */
-class QWebSocketDataProcessor : public QObject
+class Q_AUTOTEST_EXPORT QWebSocketDataProcessor : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(QWebSocketDataProcessor)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index ad6937d..d8239a2 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    dataprocessor
-
 
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    dataprocessor

diff --git a/tests/auto/dataprocessor/dataprocessor.pro b/tests/auto/dataprocessor/dataprocessor.pro
index 1e55129..7db9f47 100644 (file)
--- a/tests/auto/dataprocessor/dataprocessor.pro
+++ b/tests/auto/dataprocessor/dataprocessor.pro
@@ -11,4 +11,5 @@ QT = core testlib websockets websockets-private
 
 SOURCES += tst_dataprocessor.cpp
 
+requires(contains(QT_CONFIG, private_tests))
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/dataprocessor/tst_dataprocessor.cpp b/tests/auto/dataprocessor/tst_dataprocessor.cpp
index 60ec456..656f46a 100644 (file)
--- a/tests/auto/dataprocessor/tst_dataprocessor.cpp
+++ b/tests/auto/dataprocessor/tst_dataprocessor.cpp
@@ -46,6 +46,8 @@ const quint8 RSV2 = 0x30;
 const quint8 RSV3 = 0x10;
 const quint8 MASK = 0x80;
 
+QT_USE_NAMESPACE
+
 class tst_DataProcessor : public QObject
 {
     Q_OBJECT

diff --git a/tests/tests.pro b/tests/tests.pro
index 1a9ad66..8f8198e 100644 (file)
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
+
+CONFIG += no_docs_target
+
 SUBDIRS += auto autobahn