Merge lp:~mterry/unity8/wizard-tests into lp:unity8

[Michael Terry]

Add tests for welcome wizard.

Add tests for welcome wizard.

There a are a couple minor changes besides just adding tests:
 - Made PageList an instantiable object rather than a singleton so that when tests tear down and recreate new Wizard objects, each gets its own PageList
 - Rejiggered the skipping logic on the location page to better handle the mock situation (and simplify it in the process).

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes, the prerequisite lp:~mterry/unity8/wizard-plugin

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1449
http://jenkins.qa.ubuntu.com/job/unity8-ci/4954/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/315/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4954/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1450. By Michael Terry on 2014-11-24

Merge from wizard-plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/unity8-ci/4966/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/336/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4966/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1451. By Michael Terry on 2014-11-24

add some copyright notices

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4968/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/338/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4968/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1452. By Michael Terry on 2014-11-24

Remove extra whitespace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/4969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/340
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16197

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4969/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1453. By Michael Terry on 2014-11-28

Merge from wizard-plugin

1454. By Michael Terry on 2014-11-28

Merge from wizard-plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1454
http://jenkins.qa.ubuntu.com/job/unity8-ci/4991/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/409
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/168/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16326

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4991/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1455. By Michael Terry on 2014-12-02

Re-enable tests, whoops

1456. By Michael Terry on 2014-12-02

Remove debug line

1457. By Michael Terry on 2014-12-02

review nits

[Michael Terry (mterry)]

Re: your comments:

- Removed the "////" separator, though I still disagree that it's an eyesore
- I left the unconditional "Q_EMIT availableChanged()" in place because it's just a mock and we don't care about making it perfect. I'd rather have the code be as simple as possible than efficient.
- Removed the debug line.
- And for the wait(100)... I added a much more verbose comment, but left it in. It does not affect jenkins runs, it's just for local runs. Not sure why the problem exists, and have never been able to track it down (despite spending some time on it). But whatever weird little ListView delegate race is happening, it doesn't happen when run under xfvb.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1456
http://jenkins.qa.ubuntu.com/job/unity8-ci/5007/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/463
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16420

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5007/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1458. By Michael Terry on 2014-12-02

Merge from wizard-plugin

1459. By Michael Terry on 2014-12-02

Add folderlistmodel to build-depends (and depends)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1457
http://jenkins.qa.ubuntu.com/job/unity8-ci/5008/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/173
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/466
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16424

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5008/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1459
http://jenkins.qa.ubuntu.com/job/unity8-ci/5010/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/175
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/470/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16428

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5010/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-tests]

1460. By Michael Terry on 2014-12-03

Add missing dep and fix AS mock to allow setting null license path

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1460
http://jenkins.qa.ubuntu.com/job/unity8-ci/5017/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/491/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/182
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/433/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/491
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/491/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16474

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5017/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
AP
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-12-03 17:23:07 +0000
+++ debian/control	2014-12-03 17:23:08 +0000
@@ -33,6 +33,7 @@
                python3-all:any,
                python3-setuptools,
                python:any (>= 2.7),
+               qml-module-qt-labs-folderlistmodel,
                qml-module-qtquick-layouts,
                qml-module-qtquick-xmllistmodel,
                qml-module-qtquick2,
@@ -47,6 +48,7 @@
                qtdeclarative5-qtmultimedia-plugin,
                qtdeclarative5-ubuntu-settings-components (>= 0.4),
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
+               qtdeclarative5-ubuntu-web-plugin,
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/unity
@@ -84,10 +86,12 @@
          libcap2-bin,
          libglib2.0-bin,
          qmenumodel-qml (>= 0.2.8),
+         qml-module-qt-labs-folderlistmodel,
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-qtmir-plugin (>= 0.4.4),
          qtdeclarative5-ubuntu-telephony0.1,
+         qtdeclarative5-ubuntu-web-plugin,
          ubuntu-system-settings,
          unity-launcher-impl-4,
          unity8-common (= ${source:Version}),

=== modified file 'plugins/Wizard/plugin.cpp'
--- plugins/Wizard/plugin.cpp	2014-12-03 17:23:07 +0000
+++ plugins/Wizard/plugin.cpp	2014-12-03 17:23:08 +0000
@@ -20,13 +20,6 @@
 
 #include <QtQml/qqml.h>
 
-static QObject *pagelist_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new PageList();
-}
-
 static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -37,6 +30,6 @@
 void WizardPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Wizard"));
-    qmlRegisterSingletonType<PageList>(uri, 0, 1, "PageList", pagelist_provider);
+    qmlRegisterType<PageList>(uri, 0, 1, "PageList");
     qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
 }

=== modified file 'qml/Wizard/Page.qml'
--- qml/Wizard/Page.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Page.qml	2014-12-03 17:23:08 +0000
@@ -77,6 +77,7 @@
 
     StackButton {
         id: backButton
+        objectName: "backButton"
         width: buttonWidth
         anchors {
             left: parent.left
@@ -94,6 +95,7 @@
 
     Loader {
         id: forwardButton
+        objectName: "forwardButton"
         width: buttonWidth
         anchors {
             right: parent.right

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages.qml	2014-12-03 17:23:08 +0000
@@ -22,6 +22,7 @@
 
 Item {
     id: root
+    objectName: "wizardPages"
     focus: true
 
     // The background wallpaper to use
@@ -36,6 +37,7 @@
 
     UbuntuSecurityPrivacyPanel {
         id: securityPrivacy
+        objectName: "securityPrivacy"
     }
 
     function quitWizard() {
@@ -69,21 +71,26 @@
         visible: status === Image.Ready
     }
 
+    PageList {
+        id: pageList
+    }
+
     PageStack {
         id: pageStack
+        objectName: "pageStack"
         anchors.fill: parent
 
         function next() {
             // If we've opened any extra (non-main) pages, pop them before
             // continuing so back button returns to the previous main page.
-            while (PageList.index < pageStack.depth - 1)
+            while (pageList.index < pageStack.depth - 1)
                 pop()
-            load(PageList.next())
+            load(pageList.next())
         }
 
         function prev() {
-            if (PageList.index >= pageStack.depth - 1)
-                PageList.prev() // update PageList.index, but not for extra pages
+            if (pageList.index >= pageStack.depth - 1)
+                pageList.prev() // update pageList.index, but not for extra pages
             pop()
             if (!currentPage || currentPage.opacity === 0) { // undo skipped pages
                 prev()

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2014-12-03 17:23:08 +0000
@@ -22,6 +22,8 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "languagePage"
+
     title: i18n.tr("Hi!")
     forwardButtonSourceComponent: forwardButton
 
@@ -57,6 +59,7 @@
 
         ComboButton {
             id: combo
+            objectName: "languageCombo"
             anchors.left: parent.left
             anchors.right: parent.right
             text: listview.currentItem.text
@@ -67,6 +70,7 @@
                 model: plugin.languageNames
                 currentIndex: plugin.currentLanguage
                 delegate: Standard {
+                    objectName: "languageDelegate" + index
                     text: modelData
                     onClicked: {
                         listview.currentIndex = index

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- qml/Wizard/Pages/20-sim.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/20-sim.qml	2014-12-03 17:23:08 +0000
@@ -20,6 +20,8 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "simPage"
+
     title: i18n.tr("Add a SIM card and restart your device")
     forwardButtonSourceComponent: forwardButton
 

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2014-12-03 17:23:08 +0000
@@ -34,6 +34,8 @@
 
 LocalComponents.Page {
     id: passwdPage
+    objectName: "passwdPage"
+
     title: i18n.tr("Lock security")
     forwardButtonSourceComponent: forwardButton
 
@@ -84,6 +86,8 @@
             selectedIndex: methodToIndex(root.passwordMethod)
 
             delegate: OptionSelectorDelegate {
+                objectName: "passwdDelegate" + index
+
                 // use subText because we want the text to be small, and we have no other way to control it
                 subText: {
                     var method = indexToMethod(index)

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- qml/Wizard/Pages/40-wifi.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2014-12-03 17:23:08 +0000
@@ -23,6 +23,8 @@
 
 LocalComponents.Page {
     id: wifiPage
+    objectName: "wifiPage"
+
     title: i18n.tr("Connect to Wi‑Fi")
     forwardButtonSourceComponent: forwardButton
 

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- qml/Wizard/Pages/50-location.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/50-location.qml	2014-12-03 17:23:08 +0000
@@ -22,29 +22,26 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "locationPage"
+
     title: i18n.tr("Location")
     forwardButtonSourceComponent: forwardButton
 
     property bool pathSet: AccountsService.hereLicensePathValid
-    property bool countSet: false
-    skipValid: pathSet && (AccountsService.hereLicensePath === "" || countSet)
-    skip: skipValid && (AccountsService.hereLicensePath === "" || termsModel.count === 0)
-
-    Connections {
-        target: termsModel
-        onCountChanged: if (pathSet) countSet = true
-    }
+    skipValid: pathSet && (AccountsService.hereLicensePath === "" || termsModel.count > 0)
+    skip: skipValid && (AccountsService.hereLicensePath === "" || termsModel.count === 2) // no files but . and ..
 
     FolderListModel {
         id: termsModel
         folder: AccountsService.hereLicensePath
         nameFilters: ["*.html"]
-        showDirs: false
         showOnlyReadable: true
+        showDotAndDotDot: true // so that count == 0 means we're not done scanning yet
     }
 
     QMenuModel.QDBusActionGroup {
         id: locationActionGroup
+        objectName: "locationActionGroup"
         busType: QMenuModel.DBus.SessionBus
         busName: "com.canonical.indicator.location"
         objectPath: "/com/canonical/indicator/location"
@@ -67,6 +64,7 @@
 
         LocalComponents.CheckableSetting {
             id: gpsCheck
+            objectName: "gpsCheck"
             showDivider: false
             text: i18n.tr("Using GPS only (less accurate)")
             onTriggered: {
@@ -83,6 +81,7 @@
 
             LocalComponents.CheckableSetting {
                 id: hereCheck
+                objectName: "hereCheck"
                 showDivider: false
                 text: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info (recommended)")
                 checked: true
@@ -94,6 +93,7 @@
             }
 
             Label {
+                objectName: "hereTermsLink"
                 anchors.left: parent.left
                 anchors.leftMargin: hereCheck.labelOffset
                 anchors.right: parent.right
@@ -107,6 +107,7 @@
 
         LocalComponents.CheckableSetting {
             id: nopeCheck
+            objectName: "nopeCheck"
             showDivider: false
             text: i18n.tr("Not at all")
             onTriggered: {

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- qml/Wizard/Pages/60-reporting.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2014-12-03 17:23:08 +0000
@@ -19,6 +19,8 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "reportingPage"
+
     title: i18n.tr("Improving your experience")
     forwardButtonSourceComponent: forwardButton
 

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/80-finished.qml	2014-12-03 17:23:08 +0000
@@ -19,6 +19,8 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "finishedPage"
+
     title: i18n.tr("All done")
     forwardButtonSourceComponent: forwardButton
     hasBackButton: false

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- qml/Wizard/Pages/here-terms.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/here-terms.qml	2014-12-03 17:23:08 +0000
@@ -22,6 +22,8 @@
 import ".." as LocalComponents
 
 LocalComponents.Page {
+    objectName: "hereTermsPage"
+
     title: i18n.tr("Terms & Conditions")
     customBack: true
 
@@ -96,6 +98,7 @@
 
         Label {
             id: termsLabel
+            objectName: "termsLabel"
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
@@ -108,6 +111,7 @@
 
         WebView {
             id: webview
+            objectName: "webview"
             anchors.left: parent.left
             anchors.right: parent.right
             height: parent.height

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- qml/Wizard/Pages/passwd-confirm.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2014-12-03 17:23:08 +0000
@@ -26,7 +26,8 @@
  */
 
 LocalComponents.Page {
-    id: passwdSetPage
+    id: passwdConfirmPage
+    objectName: "passwdConfirmPage"
     forwardButtonSourceComponent: forwardButton
 
     skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- qml/Wizard/Pages/passwd-set.qml	2014-12-03 17:23:07 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2014-12-03 17:23:08 +0000
@@ -27,6 +27,7 @@
 
 LocalComponents.Page {
     id: passwdSetPage
+    objectName: "passwdSetPage"
     forwardButtonSourceComponent: forwardButton
 
     skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2014-12-03 17:23:07 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2014-12-03 17:23:08 +0000
@@ -138,7 +138,13 @@
 void AccountsService::setHereLicensePath(const QString &path)
 {
     // Path should always be valid (this code is all synchronous)
-    m_hereLicensePath = path.isNull() ? "" : path;
+    if (path == " ") {
+        m_hereLicensePath = QString::null;
+    } else if (path.isNull()) { // because qml collapses null and empty
+        m_hereLicensePath = "";
+    } else {
+        m_hereLicensePath = path;
+    }
     hereLicensePathChanged();
 }
 

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2014-12-03 17:23:07 +0000
+++ tests/mocks/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -32,6 +32,7 @@
 add_subdirectory(GSettings.1.0)
 add_subdirectory(libusermetrics)
 add_subdirectory(LightDM)
+add_subdirectory(MeeGo)
 add_subdirectory(Powerd)
 add_subdirectory(QMenuModel)
 add_subdirectory(Ubuntu)

=== added directory 'tests/mocks/MeeGo'
=== added file 'tests/mocks/MeeGo/CMakeLists.txt'
--- tests/mocks/MeeGo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(QOfono)

=== added directory 'tests/mocks/MeeGo/QOfono'
=== added file 'tests/mocks/MeeGo/QOfono/CMakeLists.txt'
--- tests/mocks/MeeGo/QOfono/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -0,0 +1,10 @@
+set(MOCK_QOFONO_SOURCES
+    plugin.cpp
+    MockQOfono.cpp
+)
+
+add_library(MockQOfono MODULE ${MOCK_QOFONO_SOURCES})
+
+qt5_use_modules(MockQOfono Qml Quick Core)
+
+add_unity8_mock(MeeGo.QOfono 0.2 MeeGo/QOfono TARGETS MockQOfono)

=== added file 'tests/mocks/MeeGo/QOfono/MockOfonoManager.qml'
--- tests/mocks/MeeGo/QOfono/MockOfonoManager.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/MockOfonoManager.qml	2014-12-03 17:23:08 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 MeeGo.QOfono 0.2
+
+Item {
+    readonly property var modems: MockQOfono.modems
+    readonly property bool available: MockQOfono.available
+}

=== added file 'tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml'
--- tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml	2014-12-03 17:23:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 MeeGo.QOfono 0.2
+
+Item {
+    id: simManager
+
+    property string modemPath
+    readonly property alias present: d.present
+
+    QtObject {
+        id: d
+
+        property bool present: false
+
+        function updatePresence() {
+            d.present = MockQOfono.isModemPresent(simManager.modemPath)
+        }
+    }
+
+    onModemPathChanged: d.updatePresence()
+
+    Connections {
+        target: MockQOfono
+        onModemsChanged: d.updatePresence()
+    }
+}

=== added file 'tests/mocks/MeeGo/QOfono/MockQOfono.cpp'
--- tests/mocks/MeeGo/QOfono/MockQOfono.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/MockQOfono.cpp	2014-12-03 17:23:08 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 "MockQOfono.h"
+
+MockQOfono::MockQOfono(QObject *parent)
+    : QObject(parent),
+      m_available(false),
+      m_modems()
+{
+}
+
+bool MockQOfono::available() const
+{
+    return m_available;
+}
+
+void MockQOfono::setAvailable(bool available)
+{
+    m_available = available;
+    Q_EMIT availableChanged();
+}
+
+QStringList MockQOfono::modems() const
+{
+    return m_modems.keys();
+}
+
+void MockQOfono::setModems(const QStringList &modems, const QList<bool> &present)
+{
+    m_modems.clear();
+    for (int i = 0; i < modems.length(); i++) {
+        m_modems[modems[i]] = present[i];
+    }
+    Q_EMIT modemsChanged();
+}
+
+bool MockQOfono::isModemPresent(const QString &modem)
+{
+    return m_modems.value(modem, false);
+}

=== added file 'tests/mocks/MeeGo/QOfono/MockQOfono.h'
--- tests/mocks/MeeGo/QOfono/MockQOfono.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/MockQOfono.h	2014-12-03 17:23:08 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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/>.
+ */
+
+// This class just exists as a backend for the instantiable Qml objects to pull
+// from.  It exists only for this mock plugin.
+
+#ifndef MOCK_QOFONO_H
+#define MOCK_QOFONO_H
+
+#include <QObject>
+#include <QMap>
+#include <QStringList>
+
+class MockQOfono : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool available READ available WRITE setAvailable NOTIFY availableChanged)
+    Q_PROPERTY(QStringList modems READ modems NOTIFY modemsChanged)
+
+public:
+    explicit MockQOfono(QObject *parent = 0);
+
+    bool available() const;
+    void setAvailable(bool available);
+    QStringList modems() const;
+
+    Q_INVOKABLE void setModems(const QStringList &modems, const QList<bool> &present);
+    Q_INVOKABLE bool isModemPresent(const QString &modem);
+
+Q_SIGNALS:
+    void availableChanged();
+    void modemsChanged();
+
+private:
+    bool m_available;
+    QMap<QString, bool> m_modems;
+};
+
+#endif // MOCK_QOFONO_H

=== added file 'tests/mocks/MeeGo/QOfono/plugin.cpp'
--- tests/mocks/MeeGo/QOfono/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/plugin.cpp	2014-12-03 17:23:08 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 "plugin.h"
+#include "MockQOfono.h"
+
+#include <QtQml>
+
+static QObject *mock_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockQOfono();
+}
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("MeeGo.QOfono"));
+    qmlRegisterSingletonType<MockQOfono>(uri, 0, 2, "MockQOfono", mock_provider); // just for mock
+}

=== added file 'tests/mocks/MeeGo/QOfono/plugin.h'
--- tests/mocks/MeeGo/QOfono/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/plugin.h	2014-12-03 17:23:08 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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/>.
+ */
+
+#ifndef MOCK_QOFONO_PLUGIN_H
+#define MOCK_QOFONO_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // MOCK_QOFONO_PLUGIN_H

=== added file 'tests/mocks/MeeGo/QOfono/qmldir'
--- tests/mocks/MeeGo/QOfono/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/qmldir	2014-12-03 17:23:08 +0000
@@ -0,0 +1,4 @@
+module MeeGo.QOfono
+plugin MockQOfono
+OfonoManager 0.2 MockOfonoManager.qml
+OfonoSimManager 0.2 MockOfonoSimManager.qml

=== modified file 'tests/mocks/QMenuModel/QDBusActionGroup.qml'
--- tests/mocks/QMenuModel/QDBusActionGroup.qml	2014-07-04 17:53:52 +0000
+++ tests/mocks/QMenuModel/QDBusActionGroup.qml	2014-12-03 17:23:08 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Settings.Menus 0.1 as Menus
 
 QtObject {
+    id: actionGroup
     property int busType
     property string busName
     property string objectPath
@@ -78,6 +79,17 @@
                         'percent': 0.0
                     }
             }
+            case "gps-detection-enabled":
+            case "location-detection-enabled":
+                return Qt.createQmlObject("
+import QtQuick 2.3
+QtObject {
+    property bool valid: true
+    property bool state: false
+    function activate() {
+        state = !state;
+    }
+}", actionGroup);
             default:
                 break;
         }

=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt	2014-09-01 09:13:08 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -2,5 +2,6 @@
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)
 add_subdirectory(SystemImage)
+add_subdirectory(SystemSettings)
 add_subdirectory(Telephony)
 add_subdirectory(Thumbnailer)

=== added directory 'tests/mocks/Ubuntu/SystemSettings'
=== added file 'tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt'
--- tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(LanguagePlugin)
+add_subdirectory(SecurityPrivacy)

=== added directory 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin'
=== added file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -0,0 +1,1 @@
+add_unity8_mock(Ubuntu.SystemSettings.LanguagePlugin 1.0 Ubuntu/SystemSettings/LanguagePlugin)

=== added file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	2014-12-03 17:23:08 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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
+
+Item {
+    property var languageNames: ["English", "French", "Spanish"]
+    property var languageCodes: ["en", "fr", "es"]
+    property int currentLanguage: 0
+}

=== added file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir	2014-12-03 17:23:08 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.SystemSettings.LanguagePlugin
+UbuntuLanguagePlugin 1.0 MockLanguagePlugin.qml

=== added directory 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy'
=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -0,0 +1,10 @@
+set(MOCK_SECURITYPRIVACY_SOURCES
+    plugin.cpp
+    MockSecurityPrivacy.cpp
+)
+
+add_library(MockSecurityPrivacy MODULE ${MOCK_SECURITYPRIVACY_SOURCES})
+
+qt5_use_modules(MockSecurityPrivacy Qml Quick Core)
+
+add_unity8_mock(Ubuntu.SystemSettings.SecurityPrivacy 1.0 Ubuntu/SystemSettings/SecurityPrivacy TARGETS MockSecurityPrivacy)

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp	2014-12-03 17:23:08 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 "MockSecurityPrivacy.h"
+
+MockSecurityPrivacy::MockSecurityPrivacy(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString MockSecurityPrivacy::setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType)
+{
+    Q_EMIT setSecurityCalled(oldPasswd, newPasswd, newType);
+    return "";
+}

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	2014-12-03 17:23:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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/>.
+ */
+
+#ifndef MOCK_SECURITYPRIVACY_H
+#define MOCK_SECURITYPRIVACY_H
+
+#include <QObject>
+
+class MockSecurityPrivacy : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(SecurityType)
+
+public:
+    enum SecurityType {
+         Swipe,
+         Passcode,
+         Passphrase,
+    };
+
+    MockSecurityPrivacy(QObject *parent = 0);
+
+    Q_INVOKABLE QString setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType);
+
+Q_SIGNALS:
+    void setSecurityCalled(const QString &oldPasswd, const QString &newPasswd, SecurityType newType); // only in mock
+};
+
+#endif // MOCK_SECURITYPRIVACY_H

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp	2014-12-03 17:23:08 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 "plugin.h"
+#include "MockSecurityPrivacy.h"
+
+#include <QtQml>
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.SecurityPrivacy"));
+    qmlRegisterType<MockSecurityPrivacy>(uri, 1, 0, "UbuntuSecurityPrivacyPanel");
+}

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h	2014-12-03 17:23:08 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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/>.
+ */
+
+#ifndef MOCK_SECURITYPRIVACY_PLUGIN_H
+#define MOCK_SECURITYPRIVACY_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // MOCK_SECURITYPRIVACY_PLUGIN_H

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir	2014-12-03 17:23:08 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.SystemSettings.SecurityPrivacy
+plugin MockSecurityPrivacy

=== modified file 'tests/mocks/Wizard/MockSystem.cpp'
--- tests/mocks/Wizard/MockSystem.cpp	2014-12-03 17:23:07 +0000
+++ tests/mocks/Wizard/MockSystem.cpp	2014-12-03 17:23:08 +0000
@@ -33,6 +33,7 @@
     Q_EMIT wizardEnabledChanged();
 }
 
-void MockSystem::updateSessionLanguage(const QString &)
+void MockSystem::updateSessionLanguage(const QString &locale)
 {
+    Q_EMIT updateSessionLanguageCalled(locale);
 }

=== modified file 'tests/mocks/Wizard/MockSystem.h'
--- tests/mocks/Wizard/MockSystem.h	2014-12-03 17:23:07 +0000
+++ tests/mocks/Wizard/MockSystem.h	2014-12-03 17:23:08 +0000
@@ -36,6 +36,7 @@
 
 Q_SIGNALS:
     void wizardEnabledChanged();
+    void updateSessionLanguageCalled(const QString &locale); // only in mock
 
 private:
     Q_DISABLE_COPY(MockSystem)

=== modified file 'tests/mocks/Wizard/mockplugin.cpp'
--- tests/mocks/Wizard/mockplugin.cpp	2014-12-03 17:23:07 +0000
+++ tests/mocks/Wizard/mockplugin.cpp	2014-12-03 17:23:08 +0000
@@ -20,13 +20,6 @@
 
 #include <QtQml/qqml.h>
 
-static QObject *pagelist_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new PageList();
-}
-
 static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -37,6 +30,6 @@
 void MockWizardPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Wizard"));
-    qmlRegisterSingletonType<PageList>(uri, 0, 1, "PageList", pagelist_provider);
+    qmlRegisterType<PageList>(uri, 0, 1, "PageList");
     qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", system_provider);
 }

=== modified file 'tests/plugins/Wizard/CMakeLists.txt'
--- tests/plugins/Wizard/CMakeLists.txt	2014-12-03 17:23:07 +0000
+++ tests/plugins/Wizard/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -3,10 +3,16 @@
     ${CMAKE_SOURCE_DIR}/plugins/Wizard
 )
 
-add_executable(tst-pagelist
+add_executable(tst-wizard-pagelist
     tst_pagelist.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
 )
-qt5_use_modules(tst-pagelist Core Qml Test)
+qt5_use_modules(tst-wizard-pagelist Core Qml Test)
+add_test(NAME wizardpagelisttest COMMAND env UNITY_TEST_ENV=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-wizard-pagelist)
 
-add_test(NAME pagelisttest COMMAND env UNITY_TEST_ENV=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-pagelist)
+add_executable(tst-wizard-system
+    tst_system.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Wizard/System.cpp
+)
+qt5_use_modules(tst-wizard-system Core DBus Qml Test)
+add_test(NAME wizardsystemtest COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tst-wizard-system)

=== added file 'tests/plugins/Wizard/tst_system.cpp'
--- tests/plugins/Wizard/tst_system.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Wizard/tst_system.cpp	2014-12-03 17:23:08 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * 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 "System.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+
+class SystemTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    SystemTest();
+
+private Q_SLOTS:
+    void testEnable();
+    void testDisable();
+    void testNoticeChanges();
+
+private:
+    void enable();
+    void disable();
+    bool isEnabled();
+
+    QTemporaryDir dir;
+    QDir enableDir;
+    QFile enableFile;
+};
+
+SystemTest::SystemTest()
+{
+    qputenv("HOME", dir.path().toUtf8());
+    enableDir.setPath(dir.path() + "/.config/ubuntu-system-settings");
+    enableFile.setFileName(enableDir.filePath("wizard-has-run"));
+}
+
+void SystemTest::enable()
+{
+    enableFile.remove();
+    QCOMPARE(isEnabled(), true);
+}
+
+void SystemTest::disable()
+{
+    enableDir.mkpath(".");
+    enableFile.open(QIODevice::WriteOnly);
+    enableFile.close();
+    QCOMPARE(isEnabled(), false);
+}
+
+bool SystemTest::isEnabled()
+{
+    return !enableFile.exists();
+}
+
+void SystemTest::testEnable()
+{
+    disable();
+
+    System system;
+    QVERIFY(!system.wizardEnabled());
+
+    system.setWizardEnabled(true);
+    QVERIFY(system.wizardEnabled());
+    QVERIFY(isEnabled());
+}
+
+void SystemTest::testDisable()
+{
+    enable();
+
+    System system;
+    QVERIFY(system.wizardEnabled());
+
+    system.setWizardEnabled(false);
+    QVERIFY(!system.wizardEnabled());
+    QVERIFY(!isEnabled());
+}
+
+void SystemTest::testNoticeChanges()
+{
+    enable();
+
+    System system;
+    QSignalSpy spy(&system, SIGNAL(wizardEnabledChanged()));
+
+    // System only guarantees its signals work correcty when using its own set
+    // methods (i.e. it won't necessarily notice if we modify the file behind
+    // the scenes).  This is because watching all parent directories of the
+    // wizard-has-run file with QFileSystemWatcher is a nightmare and waste of
+    // resources for the corner case it is.  So we'll just test the set method.
+
+    system.setWizardEnabled(false);
+    QTRY_COMPARE(spy.count(), 1);
+
+    system.setWizardEnabled(true);
+    QTRY_COMPARE(spy.count(), 2);
+
+    system.setWizardEnabled(false);
+    QTRY_COMPARE(spy.count(), 3);
+
+    system.setWizardEnabled(true);
+    QTRY_COMPARE(spy.count(), 4);
+}
+
+QTEST_MAIN(SystemTest)
+#include "tst_system.moc"

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-11-10 08:40:37 +0000
+++ tests/qmltests/CMakeLists.txt	2014-12-03 17:23:08 +0000
@@ -87,3 +87,4 @@
 add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_qml_test(Stages Splash)
+add_qml_test(Wizard Wizard)

=== added directory 'tests/qmltests/Wizard'
=== added directory 'tests/qmltests/Wizard/licenses'
=== added file 'tests/qmltests/Wizard/licenses/en_US.html'
--- tests/qmltests/Wizard/licenses/en_US.html	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Wizard/licenses/en_US.html	2014-12-03 17:23:08 +0000
@@ -0,0 +1,1 @@
+en_US

=== added file 'tests/qmltests/Wizard/licenses/fr_CA.html'
--- tests/qmltests/Wizard/licenses/fr_CA.html	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Wizard/licenses/fr_CA.html	2014-12-03 17:23:08 +0000
@@ -0,0 +1,1 @@
+fr_CA

=== added file 'tests/qmltests/Wizard/licenses/fr_FR.html'
--- tests/qmltests/Wizard/licenses/fr_FR.html	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Wizard/licenses/fr_FR.html	2014-12-03 17:23:08 +0000
@@ -0,0 +1,1 @@
+fr_FR

=== added directory 'tests/qmltests/Wizard/nolicenses'
=== added file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2014-12-03 17:23:08 +0000
@@ -0,0 +1,479 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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 AccountsService 0.1
+import MeeGo.QOfono 0.2
+import Ubuntu.Components 1.1
+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import Unity.Test 0.1 as UT
+import Wizard 0.1
+import "../../../qml/Wizard"
+
+Item {
+    id: root
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Loader {
+        id: wizardLoader
+        anchors.fill: parent
+
+        property bool itemDestroyed: false
+        sourceComponent: Component {
+            Wizard {
+                id: wizard
+                anchors.fill: parent
+                background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
+
+                Component.onDestruction: {
+                    wizardLoader.itemDestroyed = true;
+                }
+            }
+        }
+    }
+
+    SignalSpy {
+        id: updateSessionLanguageSpy
+        target: System
+        signalName: "updateSessionLanguageCalled"
+    }
+
+    SignalSpy {
+        id: setSecuritySpy
+        signalName: "setSecurityCalled"
+    }
+
+    function setup() {
+        AccountsService.hereEnabled = false;
+        AccountsService.hereLicensePath = Qt.resolvedUrl("licenses");
+        i18n.language = "en";
+        MockQOfono.setModems(["sim1"], [false]);
+        MockQOfono.available = true;
+        System.wizardEnabled = true;
+
+        updateSessionLanguageSpy.clear();
+        setSecuritySpy.clear();
+    }
+
+    Component.onCompleted: {
+        Theme.name = "Ubuntu.Components.Themes.SuruGradient";
+        setup();
+    }
+
+    UT.UnityTestCase {
+        id: wizardTests
+        name: "Wizard"
+        when: windowShown
+
+        property Item wizard: wizardLoader.status === Loader.Ready ? wizardLoader.item : null
+
+        function cleanup() {
+            wizardLoader.itemDestroyed = false;
+
+            wizardLoader.active = false;
+
+            tryCompare(wizardLoader, "status", Loader.Null);
+            tryCompare(wizardLoader, "item", null);
+            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
+            // item might still be alive. So if we set Loader.active back to true
+            // again right now we will get the very same Shell instance back. So no reload
+            // actually took place. Likely because Loader waits until the next event loop
+            // iteration to do its work. So to ensure the reload, we will wait until the
+            // Shell instance gets destroyed.
+            tryCompare(wizardLoader, "itemDestroyed", true);
+
+            // reload our test subject to get it in a fresh state once again
+            wizardLoader.active = true;
+
+            tryCompare(wizardLoader, "status", Loader.Ready);
+
+            var pages = findChild(wizard, "wizardPages");
+            var security = findInvisibleChild(pages, "securityPrivacy");
+            setSecuritySpy.target = security;
+
+            setup();
+        }
+
+        function waitForPage(name) {
+            var pages = findChild(wizard, "wizardPages");
+            var stack = findChild(pages, "pageStack");
+            // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
+            tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
+            tryCompare(stack.currentPage, "opacity", 1.0);
+            tryCompare(stack.currentPage, "enabled", true);
+            waitForRendering(stack.currentPage);
+            return stack.currentPage;
+        }
+
+        function goToPage(name, skipSim, skipLocation) {
+            if (skipSim === undefined) {
+                skipSim = false;
+            }
+            if (skipLocation === undefined) {
+                skipLocation = false;
+            }
+
+            var page = waitForPage("languagePage");
+            if (name === page.objectName) return page;
+            tap(findChild(page, "forwardButton"));
+
+            if (!skipSim) {
+                page = waitForPage("simPage");
+                if (name === page.objectName) return page;
+                tap(findChild(page, "forwardButton"));
+            }
+
+            page = waitForPage("passwdPage");
+            if (name === page.objectName) return page;
+            tap(findChild(page, "passwdDelegate0"));
+            tap(findChild(page, "forwardButton"));
+
+            page = waitForPage("wifiPage");
+            if (name === page.objectName) return page;
+            tap(findChild(page, "forwardButton"));
+
+            if (!skipLocation) {
+                page = waitForPage("locationPage");
+                if (name === page.objectName) return page;
+                tap(findChild(page, "forwardButton"));
+            }
+
+            page = waitForPage("reportingPage");
+            if (name === page.objectName) return page;
+            tap(findChild(page, "forwardButton"));
+
+            page = waitForPage("finishedPage");
+            if (name === page.objectName) return page;
+            tap(findChild(page, "forwardButton"));
+
+            tryCompare(wizard, "shown", false);
+            compare(name, null);
+            return null;
+        }
+
+        function test_languageChange() {
+            var page = goToPage("languagePage");
+            tap(findChild(page, "languageCombo"));
+            waitForRendering(findChild(page, "languageDelegate1"));
+
+            // For some reason, the delegate *sometimes* (like 1 in 10 maybe)
+            // needs more time before it can process a tap() call.  I can't
+            // find a rhyme or reason, its properties all seem the same in
+            // cases where it works and does not.  This failure to receive a
+            // tap() call below does *not* happen when running in xvfb, so
+            // jenkins is unaffected (and we don't have to worry about 100 not
+            // being enough time in its slow environment).  This wait() call is
+            // just to help local runs not trip up.
+            wait(100);
+            tap(findChild(page, "languageDelegate1"));
+
+            tryCompare(i18n, "language", "fr");
+            tap(findChild(page, "forwardButton"));
+            tryCompare(updateSessionLanguageSpy, "count", 1);
+            compare(updateSessionLanguageSpy.signalArguments[0][0], "fr");
+        }
+
+        function test_languageNoChange() {
+            goToPage("simPage"); // one past language page
+            compare(updateSessionLanguageSpy.count, 0);
+        }
+
+        function test_simUnavailableSkip() {
+            MockQOfono.available = false;
+            goToPage("passwdPage", true);
+        }
+
+        function test_simNoModemsSkip() {
+            MockQOfono.setModems([], []);
+            goToPage("passwdPage", true);
+        }
+
+        function test_simFirstSkip() {
+            MockQOfono.setModems(["a", "b"], [true, false]);
+            goToPage("passwdPage", true);
+        }
+
+        function test_simSecondSkip() {
+            MockQOfono.setModems(["a", "b"], [false, true]);
+            goToPage("passwdPage", true);
+        }
+
+        function test_simBothSkip() {
+            MockQOfono.setModems(["a", "b"], [true, true]);
+            goToPage("passwdPage", true);
+        }
+
+        function enterPasscode(passcode) {
+            for (var i = 0; i < passcode.length; ++i) {
+                var character = passcode.charAt(i);
+                var button = findChild(wizard, "pinPadButton" + character);
+                tap(button);
+            }
+        }
+
+        function test_passwdPasscode() {
+            var page = goToPage("passwdPage");
+
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("passwdSetPage");
+
+            enterPasscode("1111");
+            page = waitForPage("passwdConfirmPage");
+
+            // make sure we go back to 'set' page not 'type' page
+            tap(findChild(page, "backButton"));
+            page = waitForPage("passwdSetPage");
+
+            enterPasscode("1111");
+            page = waitForPage("passwdConfirmPage");
+
+            enterPasscode("1112");
+            var error = findChild(page, "wrongNoticeLabel");
+            tryCompareFunction(function() { return error.text !== ""; }, true);
+
+            enterPasscode("1111");
+            page = waitForPage("wifiPage");
+
+            // now finish up
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("locationPage");
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("reportingPage");
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("finishedPage");
+            tap(findChild(page, "forwardButton"));
+
+            tryCompare(setSecuritySpy, "count", 1);
+            compare(setSecuritySpy.signalArguments[0][0], "");
+            compare(setSecuritySpy.signalArguments[0][1], "1111");
+            compare(setSecuritySpy.signalArguments[0][2], UbuntuSecurityPrivacyPanel.Passcode);
+        }
+
+        function test_passwdPassphrase() {
+            var page = goToPage("passwdPage");
+            tap(findChild(page, "passwdDelegate2"));
+
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("passwdSetPage");
+
+            typeString("aaa");
+            var continueButton = findChild(page, "forwardButton");
+            tryCompare(continueButton.item, "enabled", false);
+            keyClick(Qt.Key_Enter);
+            var error = findChild(page, "wrongNoticeLabel");
+            tryCompareFunction(function() { return error.text !== ""; }, true);
+
+            typeString("aaaa");
+            tap(continueButton);
+            page = waitForPage("passwdConfirmPage");
+
+            // make sure we go back to 'set' page not 'type' page
+            var back = findChild(page, "backButton");
+            tap(back);
+            page = waitForPage("passwdSetPage");
+
+            typeString("aaaa");
+            keyClick(Qt.Key_Enter);
+            page = waitForPage("passwdConfirmPage");
+
+            continueButton = findChild(page, "forwardButton");
+            typeString("aaab");
+            tryCompare(continueButton.item, "enabled", false);
+            keyClick(Qt.Key_Enter);
+            var error = findChild(page, "wrongNoticeLabel");
+            tryCompareFunction(function() { return error.text !== ""; }, true);
+
+            typeString("aaaa");
+            tap(continueButton);
+            page = waitForPage("wifiPage");
+
+            // now finish up
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("locationPage");
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("reportingPage");
+            tap(findChild(page, "forwardButton"));
+            page = waitForPage("finishedPage");
+            tap(findChild(page, "forwardButton"));
+
+            tryCompare(setSecuritySpy, "count", 1);
+            compare(setSecuritySpy.signalArguments[0][0], "");
+            compare(setSecuritySpy.signalArguments[0][1], "aaaa");
+            compare(setSecuritySpy.signalArguments[0][2], UbuntuSecurityPrivacyPanel.Passphrase);
+        }
+
+        function test_passwdSwipe() {
+            goToPage(null);
+
+            tryCompare(setSecuritySpy, "count", 1);
+            compare(setSecuritySpy.signalArguments[0][0], "");
+            compare(setSecuritySpy.signalArguments[0][1], "");
+            compare(setSecuritySpy.signalArguments[0][2], UbuntuSecurityPrivacyPanel.Swipe);
+        }
+
+        function test_locationSkipNoPath() {
+            AccountsService.hereLicensePath = "";
+            goToPage("reportingPage", false, true);
+        }
+
+        function test_locationSkipNoFiles() {
+            AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
+            goToPage("reportingPage", false, true);
+        }
+
+        function test_locationWaitOnPath() {
+            AccountsService.hereLicensePath = " "; // means we're still getting the path from dbus
+
+            var page = goToPage("wifiPage");
+
+            var pages = findChild(wizard, "wizardPages");
+            var stack = findChild(pages, "pageStack");
+            tap(findChild(page, "forwardButton"));
+            // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
+            tryCompareFunction(function() { return stack.currentPage.objectName; }, "locationPage");
+            compare(stack.currentPage.enabled, false);
+            compare(stack.currentPage.skipValid, false);
+
+            AccountsService.hereLicensePath = "";
+            waitForPage("reportingPage");
+        }
+
+        function test_locationGpsOnly() {
+            var page = goToPage("locationPage");
+            var gpsCheck = findChild(page, "gpsCheck");
+            var hereCheck = findChild(page, "hereCheck");
+            var nopeCheck = findChild(page, "nopeCheck");
+
+            var locationActionGroup = findInvisibleChild(page, "locationActionGroup");
+            tryCompare(locationActionGroup.location, "state", false);
+            tryCompare(locationActionGroup.gps, "state", false);
+
+            tap(gpsCheck);
+            tryCompare(gpsCheck, "checked", true);
+            tryCompare(hereCheck, "checked", false);
+            tryCompare(nopeCheck, "checked", false);
+
+            tap(findChild(page, "forwardButton"));
+            tryCompare(AccountsService, "hereEnabled", false);
+            tryCompare(locationActionGroup.location, "state", true);
+            tryCompare(locationActionGroup.gps, "state", true);
+        }
+
+        function test_locationNope() {
+            var page = goToPage("locationPage");
+            var gpsCheck = findChild(page, "gpsCheck");
+            var hereCheck = findChild(page, "hereCheck");
+            var nopeCheck = findChild(page, "nopeCheck");
+
+            var locationActionGroup = findInvisibleChild(page, "locationActionGroup");
+            tryCompare(locationActionGroup.location, "state", false);
+            tryCompare(locationActionGroup.gps, "state", false);
+
+            tap(nopeCheck);
+            tryCompare(gpsCheck, "checked", false);
+            tryCompare(hereCheck, "checked", false);
+            tryCompare(nopeCheck, "checked", true);
+
+            tap(findChild(page, "forwardButton"));
+            tryCompare(AccountsService, "hereEnabled", false);
+            tryCompare(locationActionGroup.location, "state", false);
+            tryCompare(locationActionGroup.gps, "state", false);
+        }
+
+        function test_locationHere() {
+            var page = goToPage("locationPage");
+            var gpsCheck = findChild(page, "gpsCheck");
+            var hereCheck = findChild(page, "hereCheck");
+            var nopeCheck = findChild(page, "nopeCheck");
+
+            var locationActionGroup = findInvisibleChild(page, "locationActionGroup");
+            tryCompare(locationActionGroup.location, "state", false);
+            tryCompare(locationActionGroup.gps, "state", false);
+
+            // no tap because HERE is the default
+            tryCompare(gpsCheck, "checked", false);
+            tryCompare(hereCheck, "checked", true);
+            tryCompare(nopeCheck, "checked", false);
+
+            tap(findChild(page, "forwardButton"));
+            tryCompare(AccountsService, "hereEnabled", true);
+            tryCompare(locationActionGroup.location, "state", true);
+            tryCompare(locationActionGroup.gps, "state", true);
+        }
+
+        function test_locationHereTerms() {
+            var page = goToPage("locationPage");
+
+            var link = findChild(page, "hereTermsLink");
+
+            // Test our language lookup code a bit
+
+            i18n.language = "fr_FR.UTF-8";
+            link.linkActivated("not-used");
+            page = waitForPage("hereTermsPage");
+            tryCompare(findChild(page, "termsLabel"), "text", "fr_FR\n");
+            tap(findChild(page, "backButton"));
+            waitForPage("locationPage");
+
+            i18n.language = "fr_CA";
+            link.linkActivated("not-used");
+            page = waitForPage("hereTermsPage");
+            tryCompare(findChild(page, "termsLabel"), "text", "fr_CA\n");
+            tap(findChild(page, "backButton"));
+            waitForPage("locationPage");
+
+            i18n.language = "fr_US";
+            link.linkActivated("not-used");
+            page = waitForPage("hereTermsPage");
+            tryCompare(findChild(page, "termsLabel"), "text", "fr_FR\n");
+            tap(findChild(page, "backButton"));
+            waitForPage("locationPage");
+
+            i18n.language = "fr.utf8";
+            link.linkActivated("not-used");
+            page = waitForPage("hereTermsPage");
+            tryCompare(findChild(page, "termsLabel"), "text", "fr_FR\n");
+            tap(findChild(page, "backButton"));
+            waitForPage("locationPage");
+
+            i18n.language = "es"; // will not be found
+            link.linkActivated("not-used");
+            page = waitForPage("hereTermsPage");
+            tryCompare(findChild(page, "termsLabel"), "text", "en_US\n");
+
+            // OK, done with languages, back to actual page
+
+            var label = findChild(page, "termsLabel");
+            label.linkActivated(Qt.resolvedUrl("licenses/en_US.html"));
+            tryCompare(label, "visible", false);
+
+            var webview = findChild(page, "webview");
+            tryCompare(webview, "visible", true);
+            tryCompare(webview, "url", Qt.resolvedUrl("licenses/en_US.html"));
+            tryCompare(webview, "loadProgress", 100);
+
+            tap(findChild(page, "backButton"));
+            waitForPage("hereTermsPage"); // confirm we're on same page
+            tryCompare(webview, "visible", false);
+            tryCompare(label, "visible", true);
+
+            tap(findChild(page, "backButton"));
+            waitForPage("locationPage");
+        }
+    }
+}