Merge lp:~jonas-drange/ubuntu-system-settings/qml-unit-tests into lp:ubuntu-system-settings

[Jonas G. Drange]

[lp:~jonas-drange/ubuntu-system-settings/qml-unit-tests]

1477. By Jonas G. Drange on 2015-07-22

copyright and move dbusmock links

Unmerged revisions

1477. By Jonas G. Drange on 2015-07-22

copyright and move dbusmock links

1476. By Jonas G. Drange on 2015-07-22

working test example

1475. By Jonas G. Drange on 2015-07-22

cleanup

1474. By Jonas G. Drange on 2015-07-22

add test files and current progress

1473. By Jonas G. Drange on 2015-07-21

style

1472. By Jonas G. Drange on 2015-07-20

add cell unit tests

1471. By Launchpad Translations on behalf of system-settings-touch on 2015-07-20

Launchpad automatic translations update.

1470. By Launchpad Translations on behalf of system-settings-touch on 2015-07-19

Launchpad automatic translations update.

1469. By Launchpad Translations on behalf of system-settings-touch on 2015-07-17

Launchpad automatic translations update.

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2014-08-11 11:05:58 +0000
+++ tests/plugins/CMakeLists.txt	2015-07-22 13:47:47 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(bluetooth)
+add_subdirectory(cellular)
 add_subdirectory(security-privacy)
 add_subdirectory(system-update)
-add_subdirectory(bluetooth)
 
=== added directory 'tests/plugins/cellular'
=== added file 'tests/plugins/cellular/CMakeLists.txt'
--- tests/plugins/cellular/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/plugins/cellular/CMakeLists.txt	2015-07-22 13:47:47 +0000
@@ -0,0 +1,31 @@
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickTest REQUIRED)
+add_definitions(-DTESTS)
+
+set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
+
+set(QML_SOURCES tst_cellular.qml)
+
+add_executable(tst-cellular tst_cellular.cpp)
+
+target_link_libraries(tst-cellular
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Network
+    Qt5::Qml
+    Qt5::Quick
+    Qt5::QuickTest
+#    ${QTDBUSMOCK_LIBRARIES}
+#    ${QTDBUSTEST_LIBRARIES}
+)
+
+add_test(NAME tst-cellular COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-cellular
+    -input ${CMAKE_SOURCE_DIR}/tests/plugins/cellular/
+    -import ${PLUGIN_QML_DIR}
+    -import ${PLUGIN_PRIVATE_MODULE_DIR}
+    -import ${CMAKE_SOURCE_DIR}/tests/plugins/cellular
+)
 
=== added directory 'tests/plugins/cellular/Source'
=== added file 'tests/plugins/cellular/Source/qmldir'
--- tests/plugins/cellular/Source/qmldir	1970-01-01 00:00:00 +0000
+++ tests/plugins/cellular/Source/qmldir	2015-07-22 13:47:47 +0000
@@ -0,0 +1,4 @@
+module Source
+CellularPageComponent 1.0 ../../../../plugins/cellular/PageComponent.qml
+CellularPageChooseCarrier 1.0 ../../../../plugins/cellular/PageChooseCarrier.qml
+CellularSim 1.0 ../../../../plugins/cellular/Components/Sim.qml
 
=== added file 'tests/plugins/cellular/tst_cellular.cpp'
--- tests/plugins/cellular/tst_cellular.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/cellular/tst_cellular.cpp	2015-07-22 13:47:47 +0000
@@ -0,0 +1,22 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <QtQuickTest/QtQuickTest>
+
+QUICK_TEST_MAIN(tst-cellular)
 
=== added file 'tests/plugins/cellular/tst_cellular.qml'
--- tests/plugins/cellular/tst_cellular.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/cellular/tst_cellular.qml	2015-07-22 13:47:47 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.3
+import QtTest 1.0
+import Ubuntu.SystemSettings.Cellular 1.0
+
+import Source 1.0
+
+CellularPageChooseCarrier {
+
+    CellularSim {
+        id: phonesim
+        path: '/phonesim'
+    }
+
+    sim: phonesim
+
+    TestCase {
+        name: "ItemTests"
+        id: test1
+
+        function test_bar() {
+            verify(parent.sim)
+        }
+    }
+
+}