Simplify tests directory structure

cmake/QtPromiseAddTest.cmake

@@ -17,6 +17,7 @@ function(qtpromise_add_test NAME)
     endif()
 
     target_link_libraries(${_TARGET}
+        Qt5::Concurrent
         Qt5::Test
         qtpromise
         qtpromise.tests.utils
@@ -28,3 +29,16 @@ function(qtpromise_add_test NAME)
         WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
     )
 endfunction()
+
+function(qtpromise_add_tests GROUP)
+    cmake_parse_arguments(_ARG "" "" "SOURCES" ${ARGN})
+
+    foreach(_FILE ${_ARG_SOURCES})
+        get_filename_component(_FILE_NAME ${_FILE} NAME)
+        if (_FILE_NAME MATCHES "^tst_(.+)\.cpp$")
+            string(REGEX REPLACE "^tst_(.+)\.cpp$" "\\1" _TEST_NAME ${_FILE_NAME})
+            qtpromise_add_test(${GROUP}.${_TEST_NAME} SOURCES ${_FILE} ${_ARG_UNPARSED_ARGUMENTS})
+        endif()
+    endforeach()
+endfunction()
+

tests/auto/qtpromise/deprecations/CMakeLists.txt

@@ -5,5 +5,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     add_compile_options(/wd4996)
 endif()
 
-add_subdirectory(helpers)
+qtpromise_add_tests(deprecation
-add_subdirectory(qpromise)
+    SOURCES
+        tst_helpers_qpromise.cpp
+        tst_helpers_qpromiseall.cpp
+        tst_qpromise_all.cpp
+)

tests/auto/qtpromise/deprecations/helpers/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_subdirectory(qpromise)
-add_subdirectory(qpromiseall)

tests/auto/qtpromise/deprecations/helpers/qpromise/CMakeLists.txt

@@ -1,6 +0,0 @@
-qtpromise_add_test(deprecations.helpers.qpromise
-    SOURCES
-        tst_qpromise.cpp
-    LIBRARIES
-        Qt5::Concurrent
-)

tests/auto/qtpromise/deprecations/helpers/qpromiseall/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(deprecations.helpers.qpromiseall
-    SOURCES
-        tst_qpromiseall.cpp
-)

tests/auto/qtpromise/deprecations/qpromise/CMakeLists.txt

@@ -1 +0,0 @@
-add_subdirectory(all)

tests/auto/qtpromise/deprecations/qpromise/all/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(deprecations.qpromise.all
-    SOURCES
-        tst_all.cpp
-)

tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../../shared/data.h"
+#include "../shared/data.h"
-#include "../../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>
@@ -38,7 +38,7 @@ private Q_SLOTS:
 };
 
 QTEST_MAIN(tst_deprecations_helpers_qpromise)
-#include "tst_qpromise.moc"
+#include "tst_helpers_qpromise.moc"
 
 void tst_deprecations_helpers_qpromise::value()
 {

tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>
@@ -32,7 +32,7 @@ private Q_SLOTS:
 };
 
 QTEST_MAIN(tst_deprecations_helpers_qpromiseall)
-#include "tst_qpromiseall.moc"
+#include "tst_helpers_qpromiseall.moc"
 
 namespace {
 

tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>
@@ -32,7 +32,7 @@ private Q_SLOTS:
 };
 
 QTEST_MAIN(tst_deprecations_qpromise_all)
-#include "tst_all.moc"
+#include "tst_qpromise_all.moc"
 
 namespace {
 

tests/auto/qtpromise/exceptions/CMakeLists.txt

@@ -1,6 +1,4 @@
 qtpromise_add_test(exceptions
     SOURCES
         tst_exceptions.cpp
-    LIBRARIES
-        Qt5::Concurrent
 )

tests/auto/qtpromise/future/CMakeLists.txt

@@ -1,6 +1,4 @@
 qtpromise_add_test(future
     SOURCES
         tst_future.cpp
-    LIBRARIES
-        Qt5::Concurrent
 )

tests/auto/qtpromise/helpers/CMakeLists.txt

@@ -1,9 +1,12 @@
-add_subdirectory(all)
+qtpromise_add_tests(helpers
-add_subdirectory(attempt)
+    SOURCES
-add_subdirectory(connect)
+        tst_all.cpp
-add_subdirectory(each)
+        tst_attempt.cpp
-add_subdirectory(filter)
+        tst_connect.cpp
-add_subdirectory(map)
+        tst_each.cpp
-add_subdirectory(reduce)
+        tst_filter.cpp
-add_subdirectory(reject)
+        tst_map.cpp
-add_subdirectory(resolve)
+        tst_reduce.cpp
+        tst_reject.cpp
+        tst_resolve.cpp
+)

tests/auto/qtpromise/helpers/all/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.all
-    SOURCES
-        tst_all.cpp
-)

tests/auto/qtpromise/helpers/attempt/CMakeLists.txt

@@ -1,6 +0,0 @@
-qtpromise_add_test(helpers.attempt
-    SOURCES
-        tst_attempt.cpp
-    LIBRARIES
-        Qt5::Concurrent
-)

tests/auto/qtpromise/helpers/connect/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.connect
-    SOURCES
-        tst_connect.cpp
-)

tests/auto/qtpromise/helpers/each/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.each
-    SOURCES
-        tst_each.cpp
-)

tests/auto/qtpromise/helpers/filter/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.filter
-    SOURCES
-        tst_filter.cpp
-)

tests/auto/qtpromise/helpers/map/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.map
-    SOURCES
-        tst_map.cpp
-)

tests/auto/qtpromise/helpers/reduce/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.reduce
-    SOURCES
-        tst_reduce.cpp
-)

tests/auto/qtpromise/helpers/reject/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(helpers.reject
-    SOURCES
-        tst_reject.cpp
-)

tests/auto/qtpromise/helpers/resolve/CMakeLists.txt

@@ -1,6 +0,0 @@
-qtpromise_add_test(helpers.resolve
-    SOURCES
-        tst_resolve.cpp
-    LIBRARIES
-        Qt5::Concurrent
-)

tests/auto/qtpromise/helpers/tst_all.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_attempt.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_connect.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/object.h"
+#include "../shared/object.h"
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_each.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_filter.cpp

@@ -5,12 +5,13 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>
 
 // Qt
+#include <QtConcurrent>
 #include <QtTest>
 
 using namespace QtPromise;
@@ -52,8 +53,6 @@ struct SequenceTester
 
 } // anonymous namespace
 
-#include <QtConcurrent/QtConcurrent>
-
 void tst_helpers_filter::emptySequence()
 {
     auto p = QtPromise::filter(QVector<int>{}, [](int v, ...) {

tests/auto/qtpromise/helpers/tst_map.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_reduce.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/data.h"
+#include "../shared/data.h"
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_reject.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/helpers/tst_resolve.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/data.h"
+#include "../shared/data.h"
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/CMakeLists.txt

@@ -1,14 +1,17 @@
-add_subdirectory(construct)
+qtpromise_add_tests(qpromise
-add_subdirectory(delay)
+    SOURCES
-add_subdirectory(each)
+        tst_construct.cpp
-add_subdirectory(fail)
+        tst_delay.cpp
-add_subdirectory(filter)
+        tst_each.cpp
-add_subdirectory(finally)
+        tst_fail.cpp
-add_subdirectory(map)
+        tst_filter.cpp
-add_subdirectory(operators)
+        tst_finally.cpp
-add_subdirectory(reduce)
+        tst_map.cpp
-add_subdirectory(resolve)
+        tst_operators.cpp
-add_subdirectory(tap)
+        tst_reduce.cpp
-add_subdirectory(tapfail)
+        tst_resolve.cpp
-add_subdirectory(then)
+        tst_tap.cpp
-add_subdirectory(timeout)
+        tst_tapfail.cpp
+        tst_then.cpp
+        tst_timeout.cpp
+)

tests/auto/qtpromise/qpromise/construct/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.construct
-    SOURCES
-        tst_construct.cpp
-)

tests/auto/qtpromise/qpromise/delay/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.delay
-    SOURCES
-        tst_delay.cpp
-)

tests/auto/qtpromise/qpromise/each/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.each
-    SOURCES
-        tst_each.cpp
-)

tests/auto/qtpromise/qpromise/fail/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.fail
-    SOURCES
-        tst_fail.cpp
-)

tests/auto/qtpromise/qpromise/filter/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.filter
-    SOURCES
-        tst_filter.cpp
-)

tests/auto/qtpromise/qpromise/finally/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.finally
-    SOURCES
-        tst_finally.cpp
-)

tests/auto/qtpromise/qpromise/map/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.map
-    SOURCES
-        tst_map.cpp
-)

tests/auto/qtpromise/qpromise/operators/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.operators
-    SOURCES
-        tst_operators.cpp
-)

tests/auto/qtpromise/qpromise/reduce/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.reduce
-    SOURCES
-        tst_reduce.cpp
-)

tests/auto/qtpromise/qpromise/resolve/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.resolve
-    SOURCES
-        tst_resolve.cpp
-)

tests/auto/qtpromise/qpromise/tap/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.tap
-    SOURCES
-        tst_tap.cpp
-)

tests/auto/qtpromise/qpromise/tapfail/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.tapfail
-    SOURCES
-        tst_tapfail.cpp
-)

tests/auto/qtpromise/qpromise/then/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.then
-    SOURCES
-        tst_then.cpp
-)

tests/auto/qtpromise/qpromise/timeout/CMakeLists.txt

@@ -1,4 +0,0 @@
-qtpromise_add_test(qpromise.timeout
-    SOURCES
-        tst_timeout.cpp
-)

tests/auto/qtpromise/qpromise/tst_construct.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_delay.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_each.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_fail.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_filter.cpp

@@ -5,12 +5,13 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>
 
 // Qt
+#include <QtConcurrent>
 #include <QtTest>
 
 using namespace QtPromise;
@@ -57,8 +58,6 @@ struct SequenceTester
 
 } // anonymous namespace
 
-#include <QtConcurrent/QtConcurrent>
-
 void tst_qpromise_filter::emptySequence()
 {
     auto p = QPromise<QVector<int>>::resolve({}).filter([](int v, ...) {

tests/auto/qtpromise/qpromise/tst_finally.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_map.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_operators.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_reduce.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/data.h"
+#include "../shared/data.h"
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_resolve.cpp

@@ -5,8 +5,8 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/data.h"
+#include "../shared/data.h"
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_tap.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_tapfail.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/qpromise/tst_then.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 #include <functional>
 

tests/auto/qtpromise/qpromise/tst_timeout.cpp

@@ -5,7 +5,7 @@
  * the LICENSE file in the root directory of this source tree.
  */
 
-#include "../../shared/utils.h"
+#include "../shared/utils.h"
 
 // QtPromise
 #include <QtPromise>

tests/auto/qtpromise/thread/CMakeLists.txt

@@ -1,6 +1,4 @@
 qtpromise_add_test(thread
     SOURCES
         tst_thread.cpp
-    LIBRARIES
-        Qt5::Concurrent
 )