[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksecrets] /: Moving tests in their usual directory
From:       Valentin Rusu <kde () rusu ! info>
Date:       2015-08-02 15:12:37
Message-ID: E1ZLuwH-0005ye-K7 () scm ! kde ! org
[Download RAW message or body]

Git commit c1e96f186a0415e7e0435bd57151ace68024cfd0 by Valentin Rusu.
Committed on 02/08/2015 at 08:02.
Pushed by vrusu into branch 'master'.

Moving tests in their usual directory

M  +5    -3    CMakeLists.txt
A  +2    -0    autotests/CMakeLists.txt
A  +19   -0    autotests/api/CMakeLists.txt
R  +3    -3    autotests/api/ksecretsservice-test.cpp [from: src/api/ksecre=
ts/tests/ksecretsservice-test.cpp - 094% similarity]
R  +1    -1    autotests/api/ksecretsservice-test.h [from: src/api/ksecrets=
/tests/ksecretsservice-test.h - 098% similarity]
M  +0    -3    src/api/ksecrets/CMakeLists.txt
D  +0    -18   src/api/ksecrets/tests/CMakeLists.txt

http://commits.kde.org/ksecrets/c1e96f186a0415e7e0435bd57151ace68024cfd0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25aa469..253e0d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ endif()
 =

 add_subdirectory(src)
 =

-#if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
-#endif()
+if(BUILD_TESTS)
+   add_subdirectory(autotests)
+endif()
+
+feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
new file mode 100644
index 0000000..50a3315
--- /dev/null
+++ b/autotests/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(api)
+
diff --git a/autotests/api/CMakeLists.txt b/autotests/api/CMakeLists.txt
new file mode 100644
index 0000000..b956669
--- /dev/null
+++ b/autotests/api/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+include(ECMMarkAsTest)
+
+include(ECMAddTests)
+
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
+
+if(NOT Qt5Test_FOUND)
+    message(STATUS "Qt5Test not found, autotests will not be built.")
+    return()
+endif()
+
+find_package(KF5 REQUIRED CoreAddons)
+
+ecm_add_test(
+    ksecretsservice-test.cpp
+    LINK_LIBRARIES KF5::Secrets Qt5::Test KF5::Secrets KF5::CoreAddons
+)
+
diff --git a/src/api/ksecrets/tests/ksecretsservice-test.cpp b/autotests/ap=
i/ksecretsservice-test.cpp
similarity index 94%
rename from src/api/ksecrets/tests/ksecretsservice-test.cpp
rename to autotests/api/ksecretsservice-test.cpp
index 818a622..53ebb33 100644
--- a/src/api/ksecrets/tests/ksecretsservice-test.cpp
+++ b/autotests/api/ksecretsservice-test.cpp
@@ -20,9 +20,9 @@
  */
 =

 #include "ksecretsservice-test.h"
-#include "../ksecretscollection.h"
-#include "../ksecretsvalue.h"
-#include "../ksecretsitem.h"
+#include <ksecretscollection.h>
+#include <ksecretsvalue.h>
+#include <ksecretsitem.h>
 =

 #include <QtTest/QTest>
 #include <QDebug>
diff --git a/src/api/ksecrets/tests/ksecretsservice-test.h b/autotests/api/=
ksecretsservice-test.h
similarity index 98%
rename from src/api/ksecrets/tests/ksecretsservice-test.h
rename to autotests/api/ksecretsservice-test.h
index 999093b..eee13f2 100644
--- a/src/api/ksecrets/tests/ksecretsservice-test.h
+++ b/autotests/api/ksecretsservice-test.h
@@ -22,7 +22,7 @@
 #ifndef KSECRETS_TEST_H
 #define KSECRETS_TEST_H
 =

-#include <QObject>
+#include <QtCore/QObject>
 =

 class KSecretServiceTest : public QObject {
     Q_OBJECT
diff --git a/src/api/ksecrets/CMakeLists.txt b/src/api/ksecrets/CMakeLists.=
txt
index c50bbff..c96e682 100644
--- a/src/api/ksecrets/CMakeLists.txt
+++ b/src/api/ksecrets/CMakeLists.txt
@@ -104,6 +104,3 @@ install(FILES
 #     DESTINATION ${INCLUDE_INSTALL_DIR}/ksecretsservice/private COMPONENT=
 Devel
 # )
 =

-if(BUILD_TESTS)
-add_subdirectory(tests)
-endif()
diff --git a/src/api/ksecrets/tests/CMakeLists.txt b/src/api/ksecrets/tests=
/CMakeLists.txt
deleted file mode 100644
index 11c23de..0000000
--- a/src/api/ksecrets/tests/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-include(ECMMarkAsTest)
-
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
-find_package(KF5 REQUIRED CoreAddons Service)
-
-macro(ksecrets_api_tests)
-  foreach(_testname ${ARGN})
-    add_executable(${_testname} ${_testname}.cpp)
-    ecm_mark_as_test(${_testname})
-    target_link_libraries(${_testname} Qt5::Test KF5::Secrets KF5::CoreAdd=
ons KF5::Service ${QCA2_LIBRARIES})
-  endforeach(_testname)
-endmacro()
-
-ksecrets_api_tests(
-    ksecretsservice-test
-)
-

[prev in list] [next in list] [prev in thread] [next in thread]