Merge lp:~canonical-platform-qa/webbrowser-app/webbrowser-app-private_browsing-refactor_tests-qml into lp:~canonical-platform-qa/webbrowser-app/webbrowser-app-private_browsing-refactor_tests

[Leo Arias]

Experimental branch.
Tests are throwing too many warnings, and the last test doesn't work yet. Also I had to import way to many things to get the file under test. Simple tests like this should be easy to write, so maybe the big Browser.qml file needs to be split.

[lp:~canonical-platform-qa/webbrowser-app/webbrowser-app-private_browsing-refactor_tests-qml]

1026. By Leo Arias on 2015-05-13

Added extra tests.

1027. By Leo Arias on 2015-05-13

Reverted the po.

[Olivier Tilloy (osomon)]

QML tests are intended to test standalone QML components. Browser.qml is not a standalone component by any means, it’s the entire app itself. As such, I don’t think it makes sense to try and test in in a QML test.

I do agree that it would be good if we could reduce its size though, by splitting it into more standalone, reusable components (and add QML tests for those). It has been on my backlog for quite a while, but I’ve never quite gotten around to doing it, although I try not to increase its size with new code submissions, at the very least.

Suggestions on how to do that, and contributions very welcome!

[Leo Arias (elopio)]

Sorry for the late reply. I think that the first thing to do is to be able to replace all the models by simple list models during the tests.
I have an idea of how to do this based on some of the fakes I have used while writing simple QML tests, but it would take me a lot of time. So don't expect any contributions soon :)
What I think that would be really good is to get a video training session or a page in developer.ubuntu.com about how to put QML files under test. I'll talk to balloons.

Unmerged revisions

1027. By Leo Arias on 2015-05-13

Reverted the po.

1026. By Leo Arias on 2015-05-13

Added extra tests.

1025. By Leo Arias on 2015-05-13

Added an initial qml test for the incognito mode.

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-05-12 03:43:11 +0000
+++ src/app/webbrowser/Browser.qml	2015-05-13 02:22:38 +0000
@@ -195,6 +195,7 @@
 
         Chrome {
             id: chrome
+            objectName: "chrome"
 
             visible: !recentView.visible
 
@@ -1069,7 +1070,7 @@
 
     Component {
         id: leavePrivateModeDialog
-        
+
         LeavePrivateModeDialog {
             id: dialogue
             objectName: "leavePrivateModeDialog"
 
=== modified file 'tests/unittests/qml/CMakeLists.txt'
--- tests/unittests/qml/CMakeLists.txt	2015-02-26 17:49:24 +0000
+++ tests/unittests/qml/CMakeLists.txt	2015-05-13 02:22:38 +0000
@@ -7,13 +7,31 @@
 endif()
 
 set(TEST tst_QmlTests)
+
 set(SOURCES
     ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
+    ${webbrowser-common_SOURCE_DIR}/session-storage.cpp
+    ${webbrowser-app_SOURCE_DIR}/bookmarks-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/cache-deleter.cpp
     ${webbrowser-app_SOURCE_DIR}/file-operations.cpp
+    ${webbrowser-app_SOURCE_DIR}/history-domain-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/history-domainlist-chronological-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/history-domainlist-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/history-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
+    ${webbrowser-app_SOURCE_DIR}/suggestions-filter-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
+    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
     tst_QmlTests.cpp
 )
 add_executable(${TEST} ${SOURCES})
-qt5_use_modules(${TEST} Core Gui Network Qml Quick QuickTest)
+qt5_use_modules(${TEST} Core Gui Network Qml Quick QuickTest Sql)
+include_directories(${unity8_SOURCE_DIR}/libs/UbuntuGestures
+                    ${unity8_SOURCE_DIR}/plugins)
+target_link_libraries(${TEST} UbuntuGesturesQml)
+
 include_directories(
     ${webbrowser-common_SOURCE_DIR}
     ${webbrowser-app_SOURCE_DIR}
 
=== added file 'tests/unittests/qml/tst_Browser.qml'
--- tests/unittests/qml/tst_Browser.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/qml/tst_Browser.qml	2015-05-13 02:22:38 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app 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 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.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../../src/app/webbrowser"
+
+Item {
+    id: root
+
+    Browser {
+        id: browser
+    }
+
+    UbuntuTestCase {
+        name: "Browser"
+        when: windowShown
+
+        function cleanup() {
+            browser.incognito = false;
+        }
+
+        function test_browserMustStartInPlainMode() {
+            verify(!browser.incognito);
+        }
+
+        function test_incognitoBrowserMustUseDarkTheme() {
+            browser.incognito = true;
+            var chrome = findChild(browser, "chrome");
+            verify(chrome.useDarkTheme);
+        }
+
+        function test_plainBrowserMustNotUseDarkTheme() {
+            var chrome = findChild(browser, "chrome");
+            verify(!chrome.useDarkTheme);
+        }
+
+        function test_incognitoBrowserMustShowLeaveButton() {
+            browser.incognito = true;
+            var privateModeButton = findChild(browser, "privatemode");
+            compare(privateModeButton.text, i18n.tr("Leave Private"));
+        }
+
+        function test_plainBrowserMustShowEnterButton() {
+            var privateModeButton = findChild(browser, "privatemode");
+            compare(privateModeButton.text, i18n.tr("Private Mode"));
+        }
+
+        function test_triggerPrivateActionMustEnableIncognito() {
+            var privateModeButton = findChild(browser, "privatemode");
+            privateModeButton.trigger();
+            verify(browser.incognito);
+        }
+
+        function test_leavePrivateModeMustDisableIncognito() {
+            browser.incognito = true;
+            var privateModeButton = findChild(browser, "privatemode");
+            privateModeButton.trigger();
+
+            var leavePrivateModeDialog = findChild(
+                browser, "leavePrivateModeDialog");
+            var okButton = findChild(
+                leavePrivateModeDialog, "leavePrivateModeDialog.okButton");
+
+            mouseClick(okButton, centerOf(okButton));
+
+            verify(browser.incognito);
+        }
+
+    }
+}
 
=== modified file 'tests/unittests/qml/tst_QmlTests.cpp'
--- tests/unittests/qml/tst_QmlTests.cpp	2015-02-18 19:32:11 +0000
+++ tests/unittests/qml/tst_QmlTests.cpp	2015-05-13 02:22:38 +0000
@@ -21,8 +21,37 @@
 #include <QtQuickTest/QtQuickTest>
 
 // local
+#include "bookmarks-model.h"
+#include "cache-deleter.h"
 #include "favicon-fetcher.h"
 #include "file-operations.h"
+#include "history-domainlist-chronological-model.h"
+#include "history-domainlist-model.h"
+#include "history-model.h"
+#include "history-timeframe-model.h"
+#include "limit-proxy-model.h"
+#include "searchengine.h"
+#include "session-storage.h"
+#include "suggestions-filter-model.h"
+#include "tabs-model.h"
+#include "top-sites-model.h"
+#include "Ubuntu/Gestures/Direction.h"
+#include "Ubuntu/Gestures/DirectionalDragArea.h"
+
+
+static QObject* CacheDeleter_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new CacheDeleter();
+}
+
+static QObject* Direction_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new Direction();
+}
 
 static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
 {
@@ -35,9 +64,32 @@
 {
     const char* commonUri = "webbrowsercommon.private";
     qmlRegisterType<FaviconFetcher>(commonUri, 0, 1, "FaviconFetcher");
+    qmlRegisterType<SessionStorage>(commonUri, 0, 1, "SessionStorage");
 
     const char* browserUri = "webbrowserapp.private";
     qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
+    qmlRegisterType<HistoryDomainListChronologicalModel>(browserUri, 0, 1, "HistoryDomainListChronologicalModel");
+    qmlRegisterType<LimitProxyModel>(browserUri, 0, 1, "LimitProxyModel");
+    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
+    qmlRegisterType<SuggestionsFilterModel>(browserUri, 0, 1, "SuggestionsFilterModel");
+    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
+
+    qmlRegisterType<HistoryModel>(browserUri, 0, 1, "HistoryModel");
+    qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel");
+    qmlRegisterType<TopSitesModel>(browserUri, 0 , 1, "TopSitesModel");
+    qmlRegisterType<HistoryDomainListModel>(browserUri, 0, 1, "HistoryDomainListModel");
+    qmlRegisterType<HistoryDomainListChronologicalModel>(browserUri, 0, 1, "HistoryDomainListChronologicalModel");
+    qmlRegisterType<LimitProxyModel>(browserUri, 0 , 1, "LimitProxyModel");
+    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
+    qmlRegisterType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel");
+    qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
+    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
+    qmlRegisterSingletonType<CacheDeleter>(browserUri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory);
+    qmlRegisterType<SuggestionsFilterModel>(browserUri, 0, 1, "SuggestionsFilterModel");
+
+    const char* gesturesUri = "Ubuntu.Gestures";
+    qmlRegisterSingletonType<Direction>(gesturesUri, 0, 1, "Direction", Direction_singleton_factory);
+    qmlRegisterType<DirectionalDragArea>(gesturesUri, 0, 1, "DirectionalDragArea");
 
     return quick_test_main(argc, argv, "QmlTests", 0);
 }