git.iko.soy/unity8
on xenial help sign in
more test fixes
03ae81fNick Dedekind
qml/OrientedShell.qml+1−1
compare with xenial
unifiedsplit
@@ -262,7 +262,7 @@ Item {
262
262
263 Shell {
263 Shell {
264 id: shell
264 id: shell
265− objectName: "shell-"+screenWindow.objectName
265+ objectName: "shell"
266 width: root.width
266 width: root.width
267 height: root.height
267 height: root.height
268 orientation: root.angleToOrientation(orientationAngle)
268 orientation: root.angleToOrientation(orientationAngle)
tests/qmltests/Tutorial/tst_Tutorial.qml+9−17
@@ -37,20 +37,10 @@ Rectangle {
37 height: units.gu(71)
37 height: units.gu(71)
38
38
39 QtObject {
39 QtObject {
40− id: applicationArguments
40+ id: _screenWindow
41−
41+ property bool primary: true
42− function hasGeometry() {
43− return false;
44− }
45−
46− function width() {
47− return 0;
48− }
49−
50− function height() {
51− return 0;
52− }
53 }
42 }
43+ property alias screenWindow: _screenWindow
54
44
55 Telephony.CallEntry {
45 Telephony.CallEntry {
56 id: phoneCall
46 id: phoneCall
@@ -154,6 +144,10 @@ Rectangle {
154 Component.onDestruction: {
144 Component.onDestruction: {
155 shellLoader.itemDestroyed = true;
145 shellLoader.itemDestroyed = true;
156 }
146 }
147+ SurfaceManager {
148+ id: surfaceMan
149+ }
150+ surfaceManager: surfaceMan
157 }
151 }
158 }
152 }
159 }
153 }
@@ -238,7 +232,7 @@ Rectangle {
238 }
232 }
239
233
240 ItemSelector {
234 ItemSelector {
241− id: modeSelector
235+ id: modeSelector
242 anchors { left: parent.left; right: parent.right }
236 anchors { left: parent.left; right: parent.right }
243 activeFocusOnPress: false
237 activeFocusOnPress: false
244 text: "Mode"
238 text: "Mode"
@@ -327,9 +321,7 @@ Rectangle {
327 }
321 }
328
322
329 function ensureInputMethodSurface() {
323 function ensureInputMethodSurface() {
330− var surfaceManager = findInvisibleChild(shell, "surfaceManager");
331− verify(surfaceManager);
332− surfaceManager.createInputMethodSurface();
324+ shell.surfaceManager.createInputMethodSurface();
333
325
334 tryCompareFunction(function() { return topLevelSurfaceList.inputMethodSurface !== null }, true);
326 tryCompareFunction(function() { return topLevelSurfaceList.inputMethodSurface !== null }, true);
335 }
327 }
tests/qmltests/tst_OrientedShell.qml+1
@@ -1482,6 +1482,7 @@ Rectangle {
1482 removeTimeConstraintsFromSwipeAreas(orientedShellLoader.item);
1482 removeTimeConstraintsFromSwipeAreas(orientedShellLoader.item);
1483
1483
1484 shell = findChild(orientedShell, "shell");
1484 shell = findChild(orientedShell, "shell");
1485+ verify(shell);
1485
1486
1486 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
1487 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
1487 verify(topLevelSurfaceList);
1488 verify(topLevelSurfaceList);