@@ -70,35 +70,21 @@ TestCase {
7070 screenshotSpy.clear();
7171 }
7272
73− function test_powerKeyLongPressed() {
74− physicalKeysMapper.powerKeyLongPressTime = 500;
75−
76− physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false });
77−
78− for (var i = 0; i < 3; ++i) {
79− wait(10);
80− physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});
81− }
82−
83− // powerKeyLongPressed should not have been emitted yet.
84− compare(powerSpy.count, 0);
85−
86− for (var i = 0; i < 10; ++i) {
87− wait(50);
88− physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});
89− }
90−
91− compare(powerSpy.count, 1);
73+ function test_powerKeyLongPressed_data() {
74+ return [
75+ { tag: "screenOn", status: Powerd.On },
76+ { tag: "screenOff", status: Powerd.Off },
77+ ];
9278 }
9379
94− function test_powerKeyLongPressed_screen_off() {
95− // The screen is off
96− Powerd.status = Powerd.Off;
80+ function test_powerKeyLongPressed(data) {
81+ Powerd.status = data.status;
9782 physicalKeysMapper.powerKeyLongPressTime = 500;
9883
9984 physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false });
10085
101− // After the first key press it'll be on and the rest of keypresses are auto repeat
86+ // After the first key press the screen is always on
87+ // and the rest of keypresses are auto repeat
10288 Powerd.status = Powerd.On;
10389
10490 for (var i = 0; i < 3; ++i) {