Merge lp:~jonas-drange/ubuntu-system-settings/fix-1240875 into lp:ubuntu-system-settings

[Jonas G. Drange]

[language] explain to the user that a reboot is necessary for the change to take effect

Hi,

This branch changes the UI for changing the display language. After you've confirmed a language change, a dialog will appear, prompting you to reboot the device or revert the change you made.

To be able to reboot the device, I have written a new library for USS. It's called sessionservice and currently offers functionality to reboot the device. It is modelled after accountservice and can be included by any USS plugin.

Thanks

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
No
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
No
 * Has your component "TestPlan” been executed successfully on emulator, N4?
No – waiting for debs
 * Has a 5 minute exploratory testing run been executed on N4?
No
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
I'll notify @mpt
 * What components might get impacted by your changes?
The language panel
 * Have you requested review by the teams of these owning components?
Yes

[Sebastien Bacher (seb128)]

Thanks, that looks fine but it's not very useful to tell the user they need to reboot if we don't expose a reboot command in the UI anywhere...

[Ken VanDine (ken-vandine)]

Looks fine, the lack of an obvious way to reboot is an unrelated issue.

review: Approve

[Ken VanDine (ken-vandine)]

Perhaps this dialog should include a "Reboot now" button?

[Ken VanDine (ken-vandine)]

I talked to @mpt, lets make the dialog reboot on confirmation or revert.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5585
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3539/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1360/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:983
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4340/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/554/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5592/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3545/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1362/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:988
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1373/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4403
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/565
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5655
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5655/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12572
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3587
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3587/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1373/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/fix-1240875]

989. By Jonas G. Drange on 2014-09-03

making cleanup more robust, using helper to find element lazily loaded in listview

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5666
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5666/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3599
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3599/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1374/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, tested on mako image 220

review: Approve

[Adolfo Jayme Barrientos (fitojb)]

Hi, just chiming in to remind you guys that the POT file needs to be updated when introducing new strings, preferably in the same MP, so that translators can do their work with a bigger time window. Thanks!

[Jonas G. Drange (jonas-drange)]

@fitojb Hi, I don't know what that means.

[Sebastien Bacher (seb128)]

@Jonas, it means somebody needs to run "make pot" and commit an updated po/ubuntu-system-settings.pot so new strings are translatable

@Adolfo, we do that regularly, we just can't do it at every commit

=== modified file 'plugins/language/CMakeLists.txt'
--- plugins/language/CMakeLists.txt	2014-01-27 16:05:26 +0000
+++ plugins/language/CMakeLists.txt	2014-09-03 22:02:11 +0000
@@ -6,6 +6,7 @@
     KeyboardLayoutItem.qml
     KeyboardLayouts.qml
     PageComponent.qml
+    RebootNecessary.qml
     SpellChecking.qml
     SubsetView.qml
 )
@@ -15,7 +16,7 @@
  keyboard-layout.h language-plugin.h plugin.h subset-model.h
  ${QML_SOURCES})
 qt5_use_modules(UbuntuLanguagePlugin Qml Quick DBus)
-target_link_libraries(UbuntuLanguagePlugin ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${ACCOUNTSSERVICE_LDFLAGS} ${ICU_LDFLAGS})
+target_link_libraries(UbuntuLanguagePlugin uss-sessionservice ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${ACCOUNTSSERVICE_LDFLAGS} ${ICU_LDFLAGS})
 
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/LanguagePlugin)
 install(TARGETS UbuntuLanguagePlugin DESTINATION ${PLUG_DIR})

=== modified file 'plugins/language/DisplayLanguage.qml'
--- plugins/language/DisplayLanguage.qml	2014-02-27 21:17:09 +0000
+++ plugins/language/DisplayLanguage.qml	2014-09-03 22:02:11 +0000
@@ -26,9 +26,12 @@
 
 SheetBase {
     id: root
+    objectName: "displayLanguageDialog"
 
     property string initialLanguage
 
+    signal languageChanged (int newLanguage, int oldLanguage)
+
     modal: true
     title: i18n.tr("Display language")
 
@@ -41,7 +44,7 @@
 
     ListView {
         id: languageList
-
+        objectName: "languagesList"
         clip: true
 
         anchors.top: parent.top
@@ -59,6 +62,7 @@
 
         model: plugin.languageNames
         delegate: ListItem.Standard {
+            objectName: "languageName" + index
             text: modelData
             selected: index == languageList.currentIndex
 
@@ -90,7 +94,7 @@
 
         Button {
             id: cancelButton
-
+            objectName: "cancelChangeLanguage"
             text: i18n.tr("Cancel")
 
             anchors.left: parent.left
@@ -110,7 +114,7 @@
 
         Button {
             id: confirmButton
-
+            objectName: "confirmChangeLanguage"
             text: i18n.tr("Confirm")
             enabled: languageList.currentIndex != plugin.currentLanguage
 
@@ -123,8 +127,11 @@
             anchors.bottomMargin: units.gu(1)
 
             onClicked: {
-                plugin.currentLanguage = languageList.currentIndex
-                PopupUtils.close(root)
+                var oldLang = plugin.currentLanguage;
+                var newLang = languageList.currentIndex;
+                languageChanged(newLang, oldLang);
+                plugin.currentLanguage = newLang;
+                PopupUtils.close(root);
             }
         }
     }

=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2014-08-11 16:11:20 +0000
+++ plugins/language/PageComponent.qml	2014-09-03 22:02:11 +0000
@@ -29,6 +29,7 @@
 
 ItemPage {
     id: root
+    objectName: "languagePage"
 
     title: i18n.tr("Language & Text")
 
@@ -39,7 +40,13 @@
     Component {
         id: displayLanguage
 
-        DisplayLanguage {}
+        DisplayLanguage {
+            onLanguageChanged: {
+                PopupUtils.open(rebootNecessaryNotification, root, {
+                    revertTo: oldLanguage
+                })
+            }
+        }
     }
 
     Component {
@@ -54,6 +61,20 @@
         SpellChecking {}
     }
 
+    Component {
+        id: rebootNecessaryNotification
+
+        RebootNecessary {
+
+            onReboot: {
+                plugin.reboot();
+            }
+            onRevert: {
+                plugin.currentLanguage = to;
+            }
+        }
+    }
+
     GSettings {
         id: settings
 
@@ -77,7 +98,10 @@
             Menus.StandardMenu {
                 iconSource: "image://theme/language-chooser"
                 text: i18n.tr("Display language…")
+                objectName: "displayLanguage"
                 component: Label {
+                    property int currentLanguage: plugin.currentLanguage
+                    objectName: "currentLanguage"
                     text: plugin.languageNames[plugin.currentLanguage]
                     elide: Text.ElideRight
                     opacity: enabled ? 1.0 : 0.5

=== added file 'plugins/language/RebootNecessary.qml'
--- plugins/language/RebootNecessary.qml	1970-01-01 00:00:00 +0000
+++ plugins/language/RebootNecessary.qml	2014-09-03 22:02:11 +0000
@@ -0,0 +1,53 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 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.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: dialog
+    objectName: "rebootNecessaryDialog"
+
+    property int revertTo
+
+    signal reboot()
+    signal revert(int to)
+
+    text: i18n.tr("The phone needs to restart for changes to take effect.")
+    Button {
+        id: reboot
+        objectName: "reboot"
+        text: i18n.tr("Restart Now")
+        onClicked: {
+            dialog.reboot();
+            PopupUtils.close(dialog)
+        }
+    }
+    Button {
+        id: revert
+        objectName: "revert"
+        text: i18n.tr("Cancel")
+        onClicked: {
+            dialog.revert(revertTo);
+            PopupUtils.close(dialog)
+        }
+    }
+}

=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2014-08-28 07:22:28 +0000
+++ plugins/language/language-plugin.cpp	2014-09-03 22:02:11 +0000
@@ -594,3 +594,8 @@
     LanguagePlugin *plugin(static_cast<LanguagePlugin *>(user_data));
     plugin->enabledLayoutsChanged();
 }
+
+void LanguagePlugin::reboot()
+{
+    m_sessionService.reboot();
+}

=== modified file 'plugins/language/language-plugin.h'
--- plugins/language/language-plugin.h	2014-08-28 07:22:28 +0000
+++ plugins/language/language-plugin.h	2014-09-03 22:02:11 +0000
@@ -23,6 +23,7 @@
 
 #include <QtCore>
 #include "subset-model.h"
+#include "sessionservice.h"
 
 typedef struct _ActUser ActUser;
 typedef struct _ActUserManager ActUserManager;
@@ -63,6 +64,8 @@
                READ spellCheckingModel
                CONSTANT)
 
+    Q_INVOKABLE void reboot();
+
     explicit LanguagePlugin(QObject *parent = nullptr);
 
     virtual ~LanguagePlugin();
@@ -122,6 +125,7 @@
     QList<KeyboardLayout *> m_keyboardLayouts;
     SubsetModel m_keyboardLayoutsModel;
     SubsetModel m_spellCheckingModel;
+    SessionService m_sessionService;
 };
 
 #endif // LANGUAGE_PLUGIN_H

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-02-13 15:27:47 +0000
+++ src/CMakeLists.txt	2014-09-03 22:02:11 +0000
@@ -33,6 +33,10 @@
 install(TARGETS system-settings RUNTIME DESTINATION bin)
 
 add_library(uss-accountsservice SHARED accountsservice.h accountsservice.cpp)
+add_library(uss-sessionservice SHARED sessionservice.h sessionservice.cpp)
 qt5_use_modules(uss-accountsservice Core Qml DBus)
+qt5_use_modules(uss-sessionservice Core Qml DBus)
 set_target_properties(uss-accountsservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
+set_target_properties(uss-sessionservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
 install(TARGETS uss-accountsservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
+install(TARGETS uss-sessionservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)

=== added file 'src/sessionservice.cpp'
--- src/sessionservice.cpp	1970-01-01 00:00:00 +0000
+++ src/sessionservice.cpp	2014-09-03 22:02:11 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 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 "sessionservice.h"
+
+#include <QDebug>
+
+#define LM_SERVICE "org.freedesktop.login1"
+#define LM_PATH "/org/freedesktop/login1"
+#define LM_IFACE "org.freedesktop.login1.Manager"
+
+SessionService::SessionService(QObject *parent)
+    : QObject(parent),
+      m_systemBusConnection(QDBusConnection::systemBus()),
+      m_loginManager(LM_SERVICE,
+                     LM_PATH,
+                     LM_IFACE,
+                     m_systemBusConnection)
+{
+}
+
+void SessionService::reboot()
+{
+    m_loginManager.call("Reboot", false);
+}

=== added file 'src/sessionservice.h'
--- src/sessionservice.h	1970-01-01 00:00:00 +0000
+++ src/sessionservice.h	2014-09-03 22:02:11 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 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/>.
+ */
+
+#ifndef SESSIONSERVICE_H
+#define SESSIONSERVICE_H
+
+#include <QtDBus/QDBusInterface>
+
+class SessionService : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit SessionService (QObject *parent = 0);
+    void reboot();
+
+private:
+    QDBusConnection m_systemBusConnection;
+    QDBusInterface m_loginManager;
+
+};
+
+#endif // SESSIONSERVICE_H

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-08-26 01:12:17 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-03 22:02:11 +0000
@@ -110,6 +110,10 @@
     def go_to_reset_phone(self):
         return self._go_to_page('entryComponent-reset', 'resetPage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_language_page(self):
+        return self._go_to_page('entryComponent-language', 'languagePage')
+
     def _go_to_page(self, item_object_name, page_object_name):
         self.click_item(item_object_name)
         page = self.wait_select_single(objectName=page_object_name)
@@ -553,3 +557,100 @@
     def confirm_reset(self):
         button = self.select_single('Button', objectName='factoryResetAction')
         self.pointing_device.click_object(button)
+
+
+class LanguagePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Language page."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'ItemPage':
+            if state['objectName'][1] == 'languagePage':
+                return True
+        return False
+
+    def get_current_language(self):
+        return self.select_single(
+            'Label', objectName='currentLanguage').currentLanguage
+
+    def _click_change_display_language(self):
+        item = self.select_single(objectName='displayLanguage')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().select_single(
+            objectName='displayLanguageDialog')
+
+    @autopilot.logging.log_action(logger.info)
+    def change_display_language(self, langIndex, reboot=True):
+        """Changes display language.
+
+        :param langIndex: The language index to change to.
+
+        :param reboot: Whether to reboot or not
+
+        :returns: The language page
+
+        """
+        dialog = self._click_change_display_language()
+        dialog.set_language(langIndex, reboot)
+        return self.get_root_instance()
+
+
+class DisplayLanguage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Display Language dialog."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_language(self, index, reboot):
+        self._click_language_item(index)
+        reboot_dialog = self._click_confirm()
+
+        if reboot:
+            reboot_dialog.reboot()
+        else:
+            reboot_dialog.revert()
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_language_item(self, index):
+        languages_list = self.select_single('QQuickListView',
+                                            objectName='languagesList')
+        languages_list.click_element('languageName%d' % index)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_confirm(self):
+        button = self.select_single('Button',
+                                    objectName='confirmChangeLanguage')
+        self.pointing_device.click_object(button)
+        return self.get_root_instance().select_single(
+            objectName='rebootNecessaryDialog')
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_cancel(self):
+        button = self.select_single('Button',
+                                    objectName='cancelChangeLanguage')
+        self.pointing_device.click_object(button)
+
+
+class RebootNecessary(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Reboot Necessary dialog."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def reboot(self):
+        self._click_reboot()
+
+    @autopilot.logging.log_action(logger.debug)
+    def revert(self):
+        self._click_revert()
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_reboot(self):
+        button = self.select_single('Button', objectName='reboot')
+        self.pointing_device.click_object(button)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_revert(self):
+        button = self.select_single('Button', objectName='revert')
+        self.pointing_device.click_object(button)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-28 17:33:40 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-09-03 22:02:11 +0000
@@ -38,6 +38,9 @@
 CALL_SETTINGS_IFACE = 'org.ofono.CallSettings'
 SYSTEM_IFACE = 'com.canonical.SystemImage'
 SYSTEM_SERVICE_OBJ = '/Service'
+LM_SERVICE = 'org.freedesktop.login1'
+LM_PATH = '/org/freedesktop/login1'
+LM_IFACE = 'org.freedesktop.login1.Manager'
 
 
 class UbuntuSystemSettingsTestCase(
@@ -696,3 +699,37 @@
 
     def tearDown(self):
         super(PhoneSoundBaseTestCase, self).tearDown()
+
+
+class LanguageBaseTestCase(UbuntuSystemSettingsTestCase,
+                           dbusmock.DBusTestCase):
+    """ Base class for language settings tests"""
+
+    def mock_loginmanager(self):
+        self.mock_server = self.spawn_server(LM_SERVICE, LM_PATH,
+                                             LM_IFACE, system_bus=True,
+                                             stdout=subprocess.PIPE)
+        # spawn_server does not wait properly
+        # Reported as bug here: http://pad.lv/1350833
+        sleep(2)
+        self.session_mock = dbus.Interface(self.dbus_con.get_object(
+            LM_SERVICE, LM_PATH), dbusmock.MOCK_IFACE)
+
+        self.session_mock.AddMethod(LM_IFACE, 'Reboot', 'b', '', '')
+
+    @classmethod
+    def setUpClass(klass):
+        klass.start_system_bus()
+        klass.dbus_con = klass.get_dbus(True)
+
+    def setUp(self):
+        self.mock_loginmanager()
+
+        super(LanguageBaseTestCase, self).setUp()
+        self.language_page = self.system_settings.\
+            main_view.go_to_language_page()
+
+    def tearDown(self):
+        self.mock_server.terminate()
+        self.mock_server.wait()
+        super(LanguageBaseTestCase, self).tearDown()

=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_language.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_language.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_language.py	2014-09-03 22:02:11 +0000
@@ -0,0 +1,40 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# 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.
+
+from __future__ import absolute_import
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Contains, Equals
+from ubuntu_system_settings.tests import LanguageBaseTestCase
+from ubuntu_system_settings.utils.i18n import ugettext as _
+
+
+class LanguageTestCase(LanguageBaseTestCase):
+    """Tests for Language Page"""
+
+    def test_language_page_title_is_correct(self):
+        """Checks whether Language page is available"""
+        self.assertThat(
+            self.language_page.title,
+            Equals(_('Language & Text')))
+
+    def test_change_language(self):
+        current_language = self.language_page.get_current_language()
+        target_language = current_language + 1
+        self.language_page.change_display_language(target_language)
+
+        self.assertThat(
+            lambda:
+                self.language_page.get_current_language(),
+            Eventually(Equals(target_language)))
+
+        self.addCleanup(
+            self.language_page.change_display_language, current_language)
+
+        self.assertThat(
+            lambda: str(self.session_mock.GetCalls()),
+            Eventually(Contains('Reboot')))