Merge lp:~aacid/unity8/cleanupTypeString into lp:unity8

[Albert Astals Cid]

Remove hack, newer Qt already support keyClick(char)

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's test only and tests pass

 * 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?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5098/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/701
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/262
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/263/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/263
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/699/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16888

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Triggered CI rebuild

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16919

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

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

No. This only affects testing. As Jenkins passed I'm gonna trust it.

 * Did CI run pass? If not, please explain why.

yep

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

yes

review: Approve

[Michał Sawicz (saviq)]

Just a Q: what is "newer Qt"? Do our package debs ensure the newer Qt already?

[Albert Astals Cid (aacid)]

> Just a Q: what is "newer Qt"? Do our package debs ensure the newer Qt already?

"newer" is Qt 5.1 ^_^
We require 5.2.1 or newer so it's fine

[lp:~aacid/unity8/cleanupTypeString]

1525. By Albert Astals Cid on 2015-01-12

Merge lp:unity8

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-01-09 10:42:42 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-01-12 08:32:17 +0000
@@ -171,77 +171,9 @@
     }
 
     // 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]])
+            keyClick(str[i])
         }
     }