Moved tests to the relevant component

6 files changed, 9 insertions, 24 deletions

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ed28b5f4..9ae2824d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -8,5 +8,6 @@ macro(install_qml_component name)
 endmacro(install_qml_component)
 
 install_qml_component(kube)
+add_subdirectory(kube/tests)
 install_qml_component(accounts)
 install_qml_component(mailviewer)
diff --git a/components/kube/tests/CMakeLists.txt b/components/kube/tests/CMakeLists.txt
new file mode 100644
index 00000000..0c786cfe
--- /dev/null
+++ b/components/kube/tests/CMakeLists.txt
@@ -0,0 +1 @@
+add_test(NAME kubecomponenttests COMMAND kubetestrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/tests/tst_applicationstart.qml b/components/kube/tests/tst_applicationstart.qml
index 16107ec0..fdfc2634 100644
--- a/tests/tst_applicationstart.qml
+++ b/components/kube/tests/tst_applicationstart.qml
@@ -21,7 +21,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Window 2.1
 import QtTest 1.0
-import org.kube.components.kube 1.0 as Kube
+import "../qml"
 
 
 TestCase {
@@ -30,12 +30,13 @@ TestCase {
     height: 400
     name: "ApplicationStart"
 
-    Kube.Kube {
+    Kube {
         id: kube
     }
 
     function test_startToWizard() {
         var accountWizard = findChild(kube, "accountWizard");
+        verify(accountWizard)
         verify(accountWizard.visible)
     }
 }
diff --git a/tests/tst_logview.qml b/components/kube/tests/tst_logview.qml
index 86668d72..d3326db1 100644
--- a/tests/tst_logview.qml
+++ b/components/kube/tests/tst_logview.qml
@@ -22,8 +22,7 @@ import QtQuick.Controls 2.0
 import QtQuick.Window 2.1
 import QtTest 1.0
 import org.kube.framework 1.0 as Kube
-import "../components/kube/contents/ui/" as Components
-
+import "../qml"
 
 TestCase {
     id: logviewTestcase
@@ -31,7 +30,7 @@ TestCase {
     height: 400
     name: "LogView"
 
-    Components.LogView {
+    LogView {
         id: logView
     }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0515c052..70e21481 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,17 +1,6 @@
-project(tests)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS QuickTest)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine QuickTest)
-
-# build testrunner
 add_executable(kubetestrunner kubetestrunner.cpp)
 target_link_libraries(kubetestrunner
-    Qt5::Gui
-    Qt5::Quick
-    Qt5::Widgets
-    Qt5::WebEngine
     Qt5::QuickTest
 )
-
-# tests
-add_test(NAME qmltests COMMAND kubetestrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
diff --git a/tests/kubetestrunner.cpp b/tests/kubetestrunner.cpp
index 4a8d447a..c114c5fd 100644
--- a/tests/kubetestrunner.cpp
+++ b/tests/kubetestrunner.cpp
@@ -1,8 +1,2 @@
 #include <QtQuickTest/quicktest.h>
-
-int main(int argc, char **argv)
-{
-    QTEST_ADD_GPU_BLACKLIST_SUPPORT
-    QTEST_SET_MAIN_SOURCE_PATH
-    return quick_test_main(argc, argv, "kubetest", 0);
-}
+QUICK_TEST_MAIN("kube")