Merge lp:~mzanetti/unity/phablet-greeter-tests into lp:unity/phablet

[Michael Zanetti]

add tests for the greeter

add tests for the greeter

[Albert Astals Cid (aacid)]

Looks good besides the typeString thing, but we will improve Qt to remove it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/78/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/77/console
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner/77/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/77/rebuild

review: Approve (continuous-integration)

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-03-13 18:54:11 +0000
+++ Greeter/Greeter.qml	2013-03-19 12:02:23 +0000
@@ -24,14 +24,18 @@
     enabled: shown
     created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
 
+    property alias model: userList
     property bool locked: shown && multiUser && !greeterContentLoader.guestAccount
 
     readonly property bool narrowMode: width <= units.gu(60)
     readonly property bool multiUser: !narrowMode // TODO: populate with real value
     
+    signal selected(int uid)
+    signal unlocked(int uid)
+    
     ListModel {
         id: userList
-        ListElement { name: "Guest"; background: "../graphics/tablet_background.jpg" }
+        ListElement { name: "Guest"; background: "graphics/tablet_background.jpg" }
     }
 
     // TODO: Replace with a ModelAggregator once we have one.
@@ -57,7 +61,7 @@
                 for (var i = 0; i < xmlReader.count; i++) {
                     userList.append(xmlReader.get(i));
                 }
-                userList.append({ "name": "Guest", background: "../graphics/tablet_background.jpg" });
+                userList.append({ "name": "Guest", background: "graphics/tablet_background.jpg" });
 
                 greeterContentLoader.model = userList;
                 greeterContentLoader.currentIndex = 0;
@@ -74,5 +78,13 @@
         property bool guestAccount: item ? item.guestAccount : false
 
         source: required ? "GreeterContent.qml" : ""
+        
+
+        Connections {
+            target: greeterContentLoader.item
+
+            onSelected: greeter.selected(uid);
+            onUnlocked: greeter.unlocked(uid);
+        }
     }
 }

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-02-28 15:56:55 +0000
+++ Greeter/GreeterContent.qml	2013-03-19 12:02:23 +0000
@@ -19,10 +19,14 @@
 import "../Components"
 
 MouseArea {
+    id: root
     anchors.fill: parent
 
     property bool guestAccount: loginLoader.status == Loader.Ready && loginLoader.item.guestAccount
     property bool ready: wallpaper.status == Image.Ready
+    
+    signal selected(int uid)
+    signal unlocked(int uid)
 
     CrossFadeImage {
         id: wallpaper
@@ -77,11 +81,11 @@
             target: loginLoader.item
 
             onSelected: {
-                shell.background = userList.get(uid).background;
+                root.selected(uid);
             }
 
             onUnlocked: {
-                greeter.hide();
+                root.unlocked(uid);
             }
 
             onCurrentIndexChanged: {

=== modified file 'Greeter/LoginList.qml'
--- Greeter/LoginList.qml	2013-03-18 21:10:01 +0000
+++ Greeter/LoginList.qml	2013-03-19 12:02:23 +0000
@@ -140,6 +140,7 @@
         }
 
         delegate: Item {
+            objectName: "username" + index
             width: parent.width
             // Adding 2 gus in height to close gaps in draggable area between items
             height: (index == userList.currentIndex ? root.highlightedHeight : root.cellHeight) + units.gu(2)

=== modified file 'Shell.qml'
--- Shell.qml	2013-03-12 12:26:25 +0000
+++ Shell.qml	2013-03-19 12:02:23 +0000
@@ -408,6 +408,10 @@
         height: parent.height - panel.panelHeight
 
         onShownChanged: if (shown) greeter.forceActiveFocus()
+        
+        onUnlocked: greeter.hide()
+        onSelected: shell.background = greeter.model.get(uid).background;
+
     }
 
     Revealer {

=== modified file 'tests/qmluitests/CMakeLists.txt'
--- tests/qmluitests/CMakeLists.txt	2013-03-15 19:01:53 +0000
+++ tests/qmluitests/CMakeLists.txt	2013-03-19 12:02:23 +0000
@@ -23,3 +23,4 @@
 add_qml_test(DraggingArea)
 add_qml_test(FilterGrid ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Hud ${CMAKE_CURRENT_BINARY_DIR}/qml)
+add_qml_test(Greeter)

=== modified file 'tests/qmluitests/UnityTestCase.qml'
--- tests/qmluitests/UnityTestCase.qml	2013-03-19 09:34:54 +0000
+++ tests/qmluitests/UnityTestCase.qml	2013-03-19 12:02:23 +0000
@@ -33,4 +33,93 @@
         if (releaseMouse)
             mouseRelease(item, toX, toY)
     }
+
+
+    // Find an object with the given name recursively, starting
+    // at the given object "obj"
+    function findChild(obj,objectName) {
+        for (var i in obj.children) {
+            var child = obj.children[i];
+            if (child.objectName === objectName) return child;
+                var subChild = findChild(child,objectName);
+            if (subChild !== undefined) return subChild;
+        }
+        return undefined;
+    }
+
+    // Type a full string instead of keyClick letter by letter
+    // TODO: this is not ugly, this is uber-ugly and does not support
+    // any special character. Remove the keyMap once keyClick(obj, char)
+    // has landed in upstream Qt.
+    function typeString(str) {
+        var keyMap = {
+            "a": Qt.Key_A,
+            "b": Qt.Key_B,
+            "c": Qt.Key_C,
+            "d": Qt.Key_D,
+            "e": Qt.Key_E,
+            "f": Qt.Key_F,
+            "g": Qt.Key_G,
+            "h": Qt.Key_H,
+            "i": Qt.Key_I,
+            "j": Qt.Key_J,
+            "k": Qt.Key_K,
+            "l": Qt.Key_L,
+            "m": Qt.Key_M,
+            "n": Qt.Key_N,
+            "o": Qt.Key_O,
+            "p": Qt.Key_P,
+            "q": Qt.Key_Q,
+            "r": Qt.Key_R,
+            "s": Qt.Key_S,
+            "t": Qt.Key_T,
+            "u": Qt.Key_U,
+            "v": Qt.Key_V,
+            "w": Qt.Key_W,
+            "x": Qt.Key_X,
+            "y": Qt.Key_Y,
+            "z": Qt.Key_Z,
+            "A": Qt.Key_A,
+            "B": Qt.Key_B,
+            "C": Qt.Key_C,
+            "D": Qt.Key_D,
+            "E": Qt.Key_E,
+            "F": Qt.Key_F,
+            "G": Qt.Key_G,
+            "H": Qt.Key_H,
+            "I": Qt.Key_I,
+            "J": Qt.Key_J,
+            "K": Qt.Key_K,
+            "L": Qt.Key_L,
+            "M": Qt.Key_M,
+            "N": Qt.Key_N,
+            "O": Qt.Key_O,
+            "P": Qt.Key_P,
+            "Q": Qt.Key_Q,
+            "R": Qt.Key_R,
+            "S": Qt.Key_S,
+            "T": Qt.Key_T,
+            "U": Qt.Key_U,
+            "V": Qt.Key_V,
+            "W": Qt.Key_W,
+            "X": Qt.Key_X,
+            "Y": Qt.Key_Y,
+            "Z": Qt.Key_Z,
+            "0": Qt.Key_0,
+            "1": Qt.Key_1,
+            "2": Qt.Key_2,
+            "3": Qt.Key_3,
+            "4": Qt.Key_4,
+            "5": Qt.Key_5,
+            "6": Qt.Key_6,
+            "7": Qt.Key_7,
+            "8": Qt.Key_8,
+            "9": Qt.Key_9,
+            " ": Qt.Key_Space,
+        }
+        for (var i = 0; i < str.length; i++) {
+            keyClick(keyMap[str[i]])
+        }
+    }
+
 }

=== added file 'tests/qmluitests/tst_Greeter.qml'
--- tests/qmluitests/tst_Greeter.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/tst_Greeter.qml	2013-03-19 12:02:23 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2013 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.0
+import QtTest 1.0
+import "../../Greeter"
+import Ubuntu.Components 0.1
+
+Item {
+    width: units.gu(120)
+    height: units.gu(80)
+    UnityTestCase {
+        name: "GreeterTest"
+        when: windowShown
+        
+        function test_cycle_data() {
+            var data = new Array()
+            for (var i = 1; i < greeter.model.count; i++) {
+                data[i] = {tag: greeter.model.get(i).name, username: "username"+i, uid: i }
+            }
+            data[greeter.model.count] = {tag: greeter.model.get(0).name, username: "username0", uid: 0 }
+            return data
+        }
+        
+        function test_cycle(data) {
+            selectionSpy.clear();
+            var user = findChild(greeter, data.username)
+            mouseClick(user, user.width / 2, user.height / 2)
+            var pathview = findChild(greeter, "userList")
+            tryCompare(pathview, "currentIndex", data.uid)
+            tryCompare(greeter, "locked", greeter.model.get(data.uid).password !== undefined)
+            selectionSpy.wait()
+            compare(selectionSpy.count, 1)
+        }
+        
+        function test_unlock_password() {
+            unlockSpy.clear()
+            // First one is Lolas account right now. Replace with password protected user from lightdm
+            var account = findChild(greeter, "username1")
+            mouseClick(account, 1, 1)
+            account = findChild(greeter, "username0")
+            mouseClick(account, 1, 1)
+            var passwordInput = findChild(greeter, "passwordInput")
+            tryCompare(passwordInput, "opacity", 0)
+            tryCompare(passwordInput, "opacity", 1)
+            mouseClick(passwordInput, 1, 1)
+            compare(unlockSpy.count, 0)
+            typeString(greeter.model.get(0).password)
+            keyClick(Qt.Key_Enter)
+            unlockSpy.wait()
+        }
+
+        function test_unlock_wrong_password() {
+            unlockSpy.clear()
+            // First one is Lolas account right now. Replace with password protected user from lightdm
+            var account = findChild(greeter, "username1")
+            mouseClick(account, 1, 1)
+            account = findChild(greeter, "username0")
+            mouseClick(account, 1, 1)
+            var passwordInput = findChild(greeter, "passwordInput")
+            tryCompare(passwordInput, "opacity", 0)
+            tryCompare(passwordInput, "opacity", 1)
+            mouseClick(passwordInput, 1, 1)
+            compare(unlockSpy.count, 0)
+            typeString("wr0ng p4ssw0rd")
+            keyClick(Qt.Key_Enter)
+            compare(unlockSpy.count, 0)
+        }
+
+        function test_unlock_no_password() {
+            unlockSpy.clear()
+            // Last one is the guest account for now. Replace with passwordless user from lightdm
+            var guestAccount = findChild(greeter, "username" + (greeter.model.count - 1))
+            mouseClick(guestAccount, guestAccount.width / 2, guestAccount.height / 2)
+            var passwordInput = findChild(greeter, "passwordInput")
+            tryCompare(passwordInput, "opacity", 1)
+            mouseClick(passwordInput, 1, 1)
+            unlockSpy.wait()
+            compare(unlockSpy.count, 1)
+        }
+    }
+    
+    Greeter {
+        id: greeter
+        anchors.fill: parent
+    }
+
+    SignalSpy {
+        id: unlockSpy
+        target: greeter
+        signalName: "unlocked"
+    }
+
+    SignalSpy {
+        id: selectionSpy
+        target: greeter
+        signalName: "selected"
+    }
+}