summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-10-29 15:46:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-31 07:16:03 +0100
commit03b9b423b07a21916b8204047dbc34bf74f914fe (patch)
tree093b850fae8648ce2973bc7e9052a54cf17ed929 /tests/auto
parent21d74702d18b2aa745ea847b5aa0fb1c970df817 (diff)
Generate instances of types in the CMake tests.
All modules currently have a test_modules CMake test. The new module_includes test has very similar requirements, and can obsolete the hand-maintained test_modules tests in all modules. After all test_modules have been removed in other repos, the module_includes test can be renamed to that name. The types chosen need to have a constructor which can be invoked with no arguments. QtConcurrent has no public classes which fit that description so it is still tested separately Change-Id: Id7929cd32b3112c293cbf5e6964cc894a697f9b1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/cmake/CMakeLists.txt9
-rw-r--r--tests/auto/cmake/test_concurrent_module/CMakeLists.txt22
-rw-r--r--tests/auto/cmake/test_concurrent_module/main.cpp (renamed from tests/auto/cmake/test_modules/main.cpp)41
-rw-r--r--tests/auto/cmake/test_modules/CMakeLists.txt44
4 files changed, 32 insertions, 84 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 367832efb6..46dcdcca2b 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -74,7 +74,6 @@ if (NOT WIN32)
expect_pass(test_add_resources_delayed_file)
endif()
expect_pass(test_private_includes)
-expect_pass(test_modules)
expect_pass(test_testlib_definitions)
expect_pass(test_json_plugin_includes)
@@ -92,23 +91,23 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy
set(qt_module_includes
Core QObject
- Concurrent QtConcurrentRun
Gui QImage
Widgets QWidget
Network QHostInfo
- OpenGL QGLContext
+ OpenGL QGLBuffer
Sql QSqlError
- Test QSignalSpy
+ Test QTestEventList
Xml QDomDocument
PrintSupport QPrintDialog
)
if (UNIX AND NOT APPLE AND NOT QNXNTO)
list(APPEND qt_module_includes
- DBus QDBusConnection
+ DBus QDBusMessage
)
endif()
test_module_includes(
${qt_module_includes}
)
+expect_pass(test_concurrent_module)
diff --git a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt
new file mode 100644
index 0000000000..efd7b725ea
--- /dev/null
+++ b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(test_concurrent_module)
+
+find_package(Qt5Concurrent REQUIRED)
+
+include_directories(
+ ${Qt5Concurrent_INCLUDE_DIRS}
+)
+
+add_definitions(
+ ${Qt5Concurrent_DEFINITIONS}
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+
+add_executable(mainapp main.cpp)
+
+target_link_libraries(mainapp
+ ${Qt5Concurrent_LIBRARIES}
+)
diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_concurrent_module/main.cpp
index 2bb885dd5c..e5693be9bf 100644
--- a/tests/auto/cmake/test_modules/main.cpp
+++ b/tests/auto/cmake/test_concurrent_module/main.cpp
@@ -39,44 +39,15 @@
**
****************************************************************************/
-#include <QString>
-#include <qtconcurrentiteratekernel.h>
-#include <QImage>
-#include <QHostAddress>
-#include <QGLBuffer>
-#include <QSqlQuery>
-#include <QtTest>
-#include <QWidget>
-#include <QDomDocument>
-#include <QPrintDialog>
-
-#ifdef EXPECT_DBUS_AVAILABLE
-#include <QDBusMessage>
-#endif
+#include <QtConcurrent>
+#include <QtConcurrent/QtConcurrent>
+#include <QtConcurrent/QtConcurrentRun>
+#include <QtConcurrentRun>
int main(int argc, char **argv)
{
- QObject object;
-
- QtConcurrent::BlockSizeManager blockSizeManager(42);
-
- QHostAddress hostAddress;
-
- QGLBuffer glBuffer;
-
- QSqlQuery sqlQuery;
-
- QSignalSpy signalSpy(&object, SIGNAL(destroyed()));
-
- QWidget widget;
-
- QDomDocument domDocument;
-
- QPrintDialog printDialog;
-
-#ifdef EXPECT_DBUS_AVAILABLE
- QDBusMessage dBusMessage;
-#endif
+ QByteArray bytearray = "hello world";
+ QtConcurrent::run(bytearray, &QByteArray::split, ',');
return 0;
}
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt
deleted file mode 100644
index 30a726b10f..0000000000
--- a/tests/auto/cmake/test_modules/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(test_modules)
-
-set(qtbase_modules
- Core
- Concurrent
- Gui
- Widgets
- Network
- OpenGL
- Sql
- Test
- Xml
- PrintSupport
-)
-
-if (UNIX AND NOT APPLE AND NOT QNXNTO)
- add_definitions(-DEXPECT_DBUS_AVAILABLE)
- list(APPEND qtbase_modules DBus)
-endif()
-
-foreach(_module ${qtbase_modules})
- find_package(Qt5${_module} REQUIRED)
-
- include_directories(
- ${Qt5${_module}_INCLUDE_DIRS}
- )
-
- add_definitions(
- ${Qt5${_module}_DEFINITIONS}
- )
-endforeach()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
-
-add_executable(mainapp main.cpp)
-
-foreach(_module ${qtbase_modules})
- target_link_libraries(mainapp
- ${Qt5${_module}_LIBRARIES}
- )
-endforeach()