Merge into trunk : generic-lockscreen : Code : Unity 8

Status:	Merged
Approved by:	Michał Sawicz on 2013-11-21
Approved revision:	480
Merged at revision:	547
Proposed branch:	lp:~mzanetti/unity8/generic-lockscreen
Merge into:	lp:unity8
Diff against target:	225 lines (+66/-37) 5 files modified Greeter/Lockscreen.qml (+6/-18) Greeter/PassphraseLockscreen.qml (+1/-0) Greeter/PinLockscreen.qml (+1/-0) Shell.qml (+12/-1) tests/qmltests/Greeter/tst_Lockscreen.qml (+46/-18)
To merge this branch:	bzr merge lp:~mzanetti/unity8/generic-lockscreen
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-21
Mirco Müller (community)		2013-10-21	Approve on 2013-11-18
Review via email: mp+191951@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-21:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1455/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mirco Müller (macslow) wrote on 2013-11-18:

#

There are three merge-conflicts in tests/qmltests/Greeter/tst_Lockscreen.qml...

1.)
<<<<<<< TREE
                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234"},
                {tag: "alphanumeric", alphanumeric: true, username: "has-password", password: "password"},
                {tag: "numeric (wrong)", alphanumeric: false, username: "has-pin", password: "4321"},
                {tag: "alphanumeric (wrong)", alphanumeric: true, username: "has-password", password: "drowssap"},
=======
                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: 4},
                {tag: "alphanumeric", alphanumeric: true, username: "has-password", password: "password", unlockedSignal: true, pinLength: -1},
                {tag: "numeric (wrong)", alphanumeric: false, username: "has-pin", password: "4321", unlockedSignal: false, pinLength: 4},
                {tag: "alphanumeric (wrong)", alphanumeric: true, username: "has-password", password: "drowssap", unlockedSignal: false, pinLength: -1},
                {tag: "flexible length", alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: -1},
>>>>>>> MERGE-SOURCE

2.)
<<<<<<< TREE
            enteredLabel.text = ""
=======
            unlockedCheckBox.checked = false
            pinLengthTextField.text = data.pinLength
>>>>>>> MERGE-SOURCE

3.)
<<<<<<< TREE
tryCompare(enteredLabel, "text", data.password)
}

        function test_clear_data() {
            return [
                {tag: "animated PIN", animation: true, alphanumeric: false},
                {tag: "not animated PIN", animation: false, alphanumeric: false},
                {tag: "animated passphrase", animation: true, alphanumeric: true},
                {tag: "not animated passphrase", animation: false, alphanumeric: true}
            ];
        }

        function test_clear(data) {
            pinPadCheckBox.checked = data.alphanumeric
            waitForRendering(lockscreen)

            var inputField = findChild(lockscreen, "pinentryField")
            if (data.alphanumeric) {
                mouseClick(inputField, units.gu(1), units.gu(1))
                typeString("1")
=======

            tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
            if (!data.unlockedSignal) {
                // make sure the input is cleared on wrong input
                tryCompareFunction(function() {return inputField.text.length == 0}, true)
>>>>>>> MERGE-SOURCE

There are three merge-conflicts in tests/qmltests/Greeter/tst_Lockscreen.qml...

1.)
<<<<<<< TREE
                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234"},
                {tag: "alphanumeric",  alphanumeric: true, username: "has-password", password: "password"},
                {tag: "numeric (wrong)",  alphanumeric: false, username: "has-pin", password: "4321"},
                {tag: "alphanumeric (wrong)",  alphanumeric: true, username: "has-password", password: "drowssap"},
=======
                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: 4},
                {tag: "alphanumeric",  alphanumeric: true, username: "has-password", password: "password", unlockedSignal: true, pinLength: -1},
                {tag: "numeric (wrong)",  alphanumeric: false, username: "has-pin", password: "4321", unlockedSignal: false, pinLength: 4},
                {tag: "alphanumeric (wrong)",  alphanumeric: true, username: "has-password", password: "drowssap", unlockedSignal: false, pinLength: -1},
                {tag: "flexible length",  alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: -1},
>>>>>>> MERGE-SOURCE

2.)
<<<<<<< TREE
            enteredLabel.text = ""
=======
            unlockedCheckBox.checked = false
            pinLengthTextField.text = data.pinLength
>>>>>>> MERGE-SOURCE

3.)
<<<<<<< TREE
            tryCompare(enteredLabel, "text", data.password)
        }

function test_clear_data() {
            return [
                {tag: "animated PIN", animation: true, alphanumeric: false},
                {tag: "not animated PIN", animation: false, alphanumeric: false},
                {tag: "animated passphrase", animation: true, alphanumeric: true},
                {tag: "not animated passphrase", animation: false, alphanumeric: true}
            ];
        }

function test_clear(data) {
            pinPadCheckBox.checked = data.alphanumeric
            waitForRendering(lockscreen)

var inputField = findChild(lockscreen, "pinentryField")
            if (data.alphanumeric) {
                mouseClick(inputField, units.gu(1), units.gu(1))
                typeString("1")
=======

tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
            if (!data.unlockedSignal) {
                // make sure the input is cleared on wrong input
                tryCompareFunction(function() {return inputField.text.length == 0}, true)
>>>>>>> MERGE-SOURCE

review: Needs Fixing

Revision history for this message

Mirco Müller (macslow) wrote on 2013-11-18:

#

Looking good now.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-18:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-20:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-20:

#

Had to abort, qmluitests failed due to hash sum mismatches :/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-21:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-11-21:

#

review: Approve (continuous-integration)

Unity 8

Merge lp:~mzanetti/unity8/generic-lockscreen into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'Greeter/Lockscreen.qml'
 --- Greeter/Lockscreen.qml	2013-10-25 12:59:01 +0000
 +++ Greeter/Lockscreen.qml	2013-11-18 15:21:12 +0000
@@ -17,7 +17,6 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
  import "../Components"
--import LightDM 0.1 as LightDM
  Showable {
      id: root
@@ -37,7 +36,7 @@
      property url background: ""
--    signal unlocked()
++    signal entered(string passphrase)
      signal cancel()
      signal emergencyCall()
@@ -53,6 +52,10 @@
          pinPadLoader.resetting = false;
+     }
++    function clear(showAnimation) {
++        pinPadLoader.item.clear(showAnimation);
++    }
++
      Rectangle {
          // In case background fails to load or is undefined
          id: backgroundBackup
@@ -92,7 +95,7 @@
              target: pinPadLoader.item
              onEntered: {
--                LightDM.Greeter.respond(passphrase);
++                root.entered(passphrase);
+             }
              onCancel: {
@@ -150,19 +153,4 @@
              anchors.horizontalCenter: parent.horizontalCenter
+         }
+     }
--
--    Connections {
--        target: LightDM.Greeter
--
--        onAuthenticationComplete: {
--            if (LightDM.Greeter.promptless) {
--                return;
--            }
--            if (LightDM.Greeter.authenticated) {
--                root.unlocked();
--            } else {
--                pinPadLoader.item.clear(true);
--            }
--        }
--    }
+ }
 === modified file 'Greeter/PassphraseLockscreen.qml'
 --- Greeter/PassphraseLockscreen.qml	2013-06-06 12:18:34 +0000
 +++ Greeter/PassphraseLockscreen.qml	2013-11-18 15:21:12 +0000
@@ -82,6 +82,7 @@
      WrongPasswordAnimation {
          id: wrongPasswordAnimation
++        objectName: "wrongPasswordAnimation"
          target: pinentryField
+     }
+ }
 === modified file 'Greeter/PinLockscreen.qml'
 --- Greeter/PinLockscreen.qml	2013-10-17 13:08:36 +0000
 +++ Greeter/PinLockscreen.qml	2013-11-18 15:21:12 +0000
@@ -210,6 +210,7 @@
      WrongPasswordAnimation {
          id: wrongPasswordAnimation
++        objectName: "wrongPasswordAnimation"
          target: pinentryField
+     }
+ }
 === modified file 'Shell.qml'
 --- Shell.qml	2013-11-08 08:48:11 +0000
 +++ Shell.qml	2013-11-18 15:21:12 +0000
@@ -416,7 +416,7 @@
          height: parent.height - panel.panelHeight
          background: shell.background
--        onUnlocked: lockscreen.hide()
++        onEntered: LightDM.Greeter.respond(passphrase);
          onCancel: greeter.show()
          Component.onCompleted: {
@@ -442,6 +442,17 @@
                  lockscreen.show();
+             }
+         }
++
++        onAuthenticationComplete: {
++            if (LightDM.Greeter.promptless) {
++                return;
++            }
++            if (LightDM.Greeter.authenticated) {
++                lockscreen.hide();
++            } else {
++                lockscreen.clear(true);
++            }
++        }
+     }
      Greeter {
 === modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
 --- tests/qmltests/Greeter/tst_Lockscreen.qml	2013-10-17 13:08:36 +0000
 +++ tests/qmltests/Greeter/tst_Lockscreen.qml	2013-11-18 15:21:12 +0000
@@ -41,7 +41,7 @@
          target: lockscreen
          onEmergencyCall: emergencyCheckBox.checked = true
--        onUnlocked: unlockedCheckBox.checked = true
++        onEntered: enteredLabel.text = passphrase
+     }
      Connections {
@@ -99,12 +99,11 @@
                  anchors.verticalCenter: parent.verticalCenter
+             }
              Row {
--                CheckBox {
--                    id: unlockedCheckBox
++                Label {
++                    text: "Entered:"
+                 }
                  Label {
--                    text: "Unlocked signal"
--                    anchors.verticalCenter: parent.verticalCenter
++                    id: enteredLabel
+                 }
+             }
              Button {
@@ -176,16 +175,16 @@
          function test_unlock_data() {
              return [
--                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: 4},
--                {tag: "alphanumeric",  alphanumeric: true, username: "has-password", password: "password", unlockedSignal: true, pinLength: -1},
--                {tag: "numeric (wrong)",  alphanumeric: false, username: "has-pin", password: "4321", unlockedSignal: false, pinLength: 4},
--                {tag: "alphanumeric (wrong)",  alphanumeric: true, username: "has-password", password: "drowssap", unlockedSignal: false, pinLength: -1},
--                {tag: "flexible length",  alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true, pinLength: -1},
++                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", pinLength: 4},
++                {tag: "alphanumeric",  alphanumeric: true, username: "has-password", password: "password", pinLength: -1},
++                {tag: "numeric (wrong)",  alphanumeric: false, username: "has-pin", password: "4321", pinLength: 4},
++                {tag: "alphanumeric (wrong)",  alphanumeric: true, username: "has-password", password: "drowssap", pinLength: -1},
++                {tag: "flexible length",  alphanumeric: false, username: "has-pin", password: "1234", pinLength: -1},
+             ]
+         }
          function test_unlock(data) {
--            unlockedCheckBox.checked = false
++            enteredLabel.text = ""
              pinLengthTextField.text = data.pinLength
              LightDM.Greeter.authenticate(data.username)
              waitForRendering(lockscreen)
@@ -206,14 +205,43 @@
                      mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
+                 }
+             }
--
--            tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
--            if (!data.unlockedSignal) {
--                // make sure the input is cleared on wrong input
--                tryCompareFunction(function() {return inputField.text.length == 0}, true)
++            tryCompare(enteredLabel, "text", data.password)
++        }
++
++        function test_clear_data() {
++            return [
++                {tag: "animated PIN", animation: true, alphanumeric: false},
++                {tag: "not animated PIN", animation: false, alphanumeric: false},
++                {tag: "animated passphrase", animation: true, alphanumeric: true},
++                {tag: "not animated passphrase", animation: false, alphanumeric: true}
++            ];
++        }
++
++        function test_clear(data) {
++            pinPadCheckBox.checked = data.alphanumeric
++            waitForRendering(lockscreen)
++
++            var inputField = findChild(lockscreen, "pinentryField")
++            if (data.alphanumeric) {
++                mouseClick(inputField, units.gu(1), units.gu(1))
++                typeString("1")
              } else {
--                tryCompareFunction(function() {return inputField.text.length > 0}, true)
++                var button = findChild(lockscreen, "pinPadButton1")
++                mouseClick(button, units.gu(1), units.gu(1))
+             }
++
++            var animation = findInvisibleChild(lockscreen, "wrongPasswordAnimation")
++
++            tryCompare(inputField, "text", "1")
++
++            lockscreen.clear(data.animation)
++            tryCompare(inputField, "text", "")
++
++            wait(0) // Trigger event loop to make sure the animation would start running
++            compare(animation.running, data.animation)
++
++            // wait for animation to finish to not disturb other tests
++            tryCompare(animation, "running", false)
+         }
          function test_backspace_data() {
@@ -224,7 +252,7 @@
+         }
          function test_backspace(data) {
--            LightDM.Greeter.authenticate("has-pin");
++            pinPadCheckBox.checked = false
              pinLengthTextField.text = data.pinLength
              waitForRendering(lockscreen);