Moved tests to the relevant component

4 files changed, 2 insertions, 126 deletions

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")
diff --git a/tests/tst_applicationstart.qml b/tests/tst_applicationstart.qml
deleted file mode 100644
index 16107ec0..00000000
--- a/tests/tst_applicationstart.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *   Copyright 2017 Christian Mollekopf <mollekopf@kolabsys.com>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library General Public License as
- *   published by the Free Software Foundation; either version 2, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Library General Public License for more details
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-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
-
-
-TestCase {
-    id: testCase
-    width: 400
-    height: 400
-    name: "ApplicationStart"
-
-    Kube.Kube {
-        id: kube
-    }
-
-    function test_startToWizard() {
-        var accountWizard = findChild(kube, "accountWizard");
-        verify(accountWizard.visible)
-    }
-}
diff --git a/tests/tst_logview.qml b/tests/tst_logview.qml
deleted file mode 100644
index 86668d72..00000000
--- a/tests/tst_logview.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *   Copyright 2017 Christian Mollekopf <mollekopf@kolabsys.com>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library General Public License as
- *   published by the Free Software Foundation; either version 2, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Library General Public License for more details
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-import QtQuick 2.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
-
-
-TestCase {
-    id: logviewTestcase
-    width: 400
-    height: 400
-    name: "LogView"
-
-    Components.LogView {
-        id: logView
-    }
-
-    function test_logview() {
-        var listModel = findChild(logView, "logModel");
-        verify(listModel)
-        compare(listModel.count, 0)
-        //ignore progress
-        Kube.Fabric.postMessage(Kube.Messages.progressNotification, {})
-        compare(listModel.count, 0)
-
-        Kube.Fabric.postMessage(Kube.Messages.notification, {type: Kube.Notifications.info, message: "foobar", resource: "resource"})
-        compare(listModel.count, 1)
-        compare(logView.pendingError, false)
-
-        Kube.Fabric.postMessage(Kube.Messages.notification, {"type": Kube.Notifications.error, message: "foobar", resource: "resource"})
-        compare(listModel.count, 2)
-        compare(logView.pendingError, true)
-        compare(listModel.get(0).type, Kube.Notifications.error)
-        compare(listModel.get(0).errors.count, 1)
-        compare(listModel.get(0).errors.get(0).message, "foobar")
-        compare(listModel.get(0).errors.get(0).resource, "resource")
-
-        Kube.Fabric.postMessage(Kube.Messages.notification, {"type": Kube.Notifications.error, "subtype": "merge", message: "merge1", resource: "resource1"})
-        compare(listModel.count, 3)
-        Kube.Fabric.postMessage(Kube.Messages.notification, {"type": Kube.Notifications.error, "subtype": "merge", message: "merge2", resource: "resource2"})
-        compare(listModel.count, 3)
-        compare(listModel.get(0).errors.count, 2)
-        compare(listModel.get(0).errors.get(0).message, "merge2")
-        compare(listModel.get(0).errors.get(0).resource, "resource2")
-    }
-}