git.iko.soy/unity8
on xenial help sign in
enabled tst_TabletStage and fixed some tests
903c84bLukáš Tinkl
qml/Stage/Stage.qml+2−1
compare with xenial
unifiedsplit
@@ -490,6 +490,7 @@ AbstractStage {
490
490
491 SideStage {
491 SideStage {
492 id: sideStage
492 id: sideStage
493+ objectName: "sideStage"
493 shown: false
494 shown: false
494 height: appContainer.height
495 height: appContainer.height
495 x: appContainer.width - width
496 x: appContainer.width - width
@@ -667,7 +668,7 @@ AbstractStage {
667 property int stage: ApplicationInfoInterface.MainStage
668 property int stage: ApplicationInfoInterface.MainStage
668 function saveStage(newStage) {
669 function saveStage(newStage) {
669 appDelegate.stage = newStage;
670 appDelegate.stage = newStage;
670− WindowStateStorage.saveStage(application.appId, newStage);
671+ WindowStateStorage.saveStage(appId, newStage);
671 priv.updateMainAndSideStageIndexes()
672 priv.updateMainAndSideStageIndexes()
672 }
673 }
673
674
tests/qmltests/CMakeLists.txt+1−1
@@ -91,7 +91,7 @@ add_unity8_qmltest(Stage DesktopStage)
91add_unity8_qmltest(Stage PhoneStage)
91add_unity8_qmltest(Stage PhoneStage)
92add_unity8_qmltest(Stages SpreadDelegate)
92add_unity8_qmltest(Stages SpreadDelegate)
93add_unity8_qmltest(Stage SurfaceContainer)
93add_unity8_qmltest(Stage SurfaceContainer)
94−add_unity8_qmltest(Stages TabletStage)
94+add_unity8_qmltest(Stage TabletStage)
95add_unity8_qmltest(Stage WindowResizeArea)
95add_unity8_qmltest(Stage WindowResizeArea)
96add_unity8_qmltest(Stage Splash)
96add_unity8_qmltest(Stage Splash)
97add_unity8_qmltest(Stage DecoratedWindow)
97add_unity8_qmltest(Stage DecoratedWindow)
tests/qmltests/Stage/tst_TabletStage.qml+53−83
@@ -24,53 +24,36 @@ import Utils 0.1
24import WindowManager 0.1
24import WindowManager 0.1
25
25
26import ".."
26import ".."
27−import "../../../qml/Stages"
27+import "../../../qml/Stage"
28import "../../../qml/Components"
28import "../../../qml/Components"
29
29
30Rectangle {
30Rectangle {
31 id: root
31 id: root
32 color: "grey"
32 color: "grey"
33− width: tabletStageLoader.width + controls.width
33+ width: units.gu(160*0.7)
34− height: tabletStageLoader.height
34+ height: units.gu(100*0.7)
35
35
36 property var greeter: { fullyShown: true }
36 property var greeter: { fullyShown: true }
37
37
38− TopLevelSurfaceList {
38+ Stage {
39− id: topSurfaceList
39+ id: tabletStage
40− applicationsModel: ApplicationManager
40+ anchors { fill: parent; rightMargin: units.gu(30) }
41− }
41+ dragAreaWidth: units.gu(2)
42−
42+ maximizedAppTopMargin: units.gu(3)
43− Loader {
43+ interactive: true
44− id: tabletStageLoader
44+ shellOrientation: Qt.LandscapeOrientation
45−
45+ nativeWidth: width
46− x: ((root.width - controls.width) - width) / 2
46+ nativeHeight: height
47− y: (root.height - height) / 2
47+ orientations: Orientations {
48− width: units.gu(160*0.7)
48+ native_: Qt.LandscapeOrientation
49− height: units.gu(100*0.7)
49+ primary: Qt.LandscapeOrientation
50−
50+ }
51 focus: true
51 focus: true
52−
52+ mode: "stagedWithSideStage"
53− property bool itemDestroyed: false
54− sourceComponent: Component {
55− TabletStage {
56− anchors.fill: parent
57− Component.onDestruction: {
58− tabletStageLoader.itemDestroyed = true;
59− }
60− dragAreaWidth: units.gu(2)
61− maximizedAppTopMargin: units.gu(3)
62− interactive: true
63− shellOrientation: Qt.LandscapeOrientation
64− nativeWidth: width
65− nativeHeight: height
66− orientations: Orientations {
67− native_: Qt.LandscapeOrientation
68− primary: Qt.LandscapeOrientation
69− }
70− focus: true
71− applicationManager: ApplicationManager
53+ applicationManager: ApplicationManager
72− topLevelSurfaceList: topSurfaceList
54+ topLevelSurfaceList: TopLevelSurfaceList {
73− }
55+ id: topLevelSurfaceList
56+ applicationsModel: ApplicationManager
74 }
57 }
75 }
58 }
76
59
@@ -95,9 +78,9 @@ Rectangle {
95 id: edgeBarrierControls
78 id: edgeBarrierControls
96 text: "Drag here to pull out spread"
79 text: "Drag here to pull out spread"
97 backgroundColor: "blue"
80 backgroundColor: "blue"
98− onDragged: { tabletStageLoader.item.pushRightEdge(amount); }
81+ onDragged: { tabletStage.pushRightEdge(amount); }
99 Component.onCompleted: {
82 Component.onCompleted: {
100− edgeBarrierControls.target = testCase.findChild(tabletStageLoader, "edgeBarrierController");
83+ edgeBarrierControls.target = testCase.findChild(tabletStage, "edgeBarrierController");
101 }
84 }
102 }
85 }
103
86
@@ -140,13 +123,11 @@ Rectangle {
140 name: "TabletStage"
123 name: "TabletStage"
141 when: windowShown
124 when: windowShown
142
125
143− property Item tabletStage: tabletStageLoader.status === Loader.Ready ? tabletStageLoader.item : null
126+ readonly property alias topSurfaceList: tabletStage.topLevelSurfaceList
144 property Item sideStage: tabletStage ? findChild(tabletStage, "sideStage") : null
127 property Item sideStage: tabletStage ? findChild(tabletStage, "sideStage") : null
145
128
146 function init() {
129 function init() {
147 stageSaver.clear();
130 stageSaver.clear();
148− tabletStageLoader.active = true;
149− tryCompare(tabletStageLoader, "status", Loader.Ready);
150
131
151 tryCompare(topSurfaceList, "count", 1);
132 tryCompare(topSurfaceList, "count", 1);
152 compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
133 compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
@@ -167,17 +148,6 @@ Rectangle {
167 }
148 }
168
149
169 function cleanup() {
150 function cleanup() {
170− tabletStageLoader.itemDestroyed = false;
171− tabletStageLoader.active = false;
172−
173− tryCompare(tabletStageLoader, "status", Loader.Null);
174− tryCompare(tabletStageLoader, "item", null);
175− // Loader.status might be Loader.Null and Loader.item might be null but the Loader
176− // actually took place. Likely because Loader waits until the next event loop
177− // iteration to do its work. So to ensure the reload, we will wait until the
178− // Shell instance gets destroyed.
179− tryCompare(tabletStageLoader, "itemDestroyed", true);
180−
181 killApps();
151 killApps();
182 WindowStateStorage.clear();
152 WindowStateStorage.clear();
183 }
153 }
@@ -191,7 +161,7 @@ Rectangle {
191 }
161 }
192
162
193 function findAppWindowForSurfaceId(surfaceId) {
163 function findAppWindowForSurfaceId(surfaceId) {
194− var spreadDelegate = findChild(tabletStage, "spreadDelegate_" + surfaceId);
164+ var spreadDelegate = findChild(tabletStage, "appDelegate_" + surfaceId);
195 if (!spreadDelegate) {
165 if (!spreadDelegate) {
196 return null;
166 return null;
197 }
167 }
@@ -210,7 +180,7 @@ Rectangle {
210
180
211 function waitUntilAppDelegateStopsMoving(targetSurfaceId)
181 function waitUntilAppDelegateStopsMoving(targetSurfaceId)
212 {
182 {
213− var targetAppDelegate = findChild(tabletStage, "spreadDelegate_" + targetSurfaceId);
183+ var targetAppDelegate = findChild(tabletStage, "appDelegate_" + targetSurfaceId);
214 verify(targetAppDelegate);
184 verify(targetAppDelegate);
215 var lastValue = undefined;
185 var lastValue = undefined;
216 do {
186 do {
@@ -244,7 +214,7 @@ Rectangle {
244
214
245 function dragToSideStage(surfaceId) {
215 function dragToSideStage(surfaceId) {
246 sideStage.showNow();
216 sideStage.showNow();
247− var targetAppDelegate = findChild(tabletStage, "spreadDelegate_" + surfaceId);
217+ var targetAppDelegate = findChild(tabletStage, "appDelegate_" + surfaceId);
248
218
249 var pos = tabletStage.width - sideStage.width - (tabletStage.width - sideStage.width) / 2;
219 var pos = tabletStage.width - sideStage.width - (tabletStage.width - sideStage.width) / 2;
250 var end_pos = tabletStage.width - sideStage.width / 2;
220 var end_pos = tabletStage.width - sideStage.width / 2;
@@ -265,7 +235,7 @@ Rectangle {
265
235
266 function dragToMainStage(surfaceId) {
236 function dragToMainStage(surfaceId) {
267 sideStage.showNow();
237 sideStage.showNow();
268− var targetAppDelegate = findChild(tabletStage, "spreadDelegate_" + surfaceId);
238+ var targetAppDelegate = findChild(tabletStage, "appDelegate_" + surfaceId);
269 verify(targetAppDelegate);
239 verify(targetAppDelegate);
270
240
271 var pos = tabletStage.width - sideStage.width / 2;
241 var pos = tabletStage.width - sideStage.width / 2;
@@ -290,7 +260,7 @@ Rectangle {
290 var webbrowserSurfaceId = topSurfaceList.nextId;
260 var webbrowserSurfaceId = topSurfaceList.nextId;
291 webbrowserCheckBox.checked = true;
261 webbrowserCheckBox.checked = true;
292 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
262 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
293− var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
263+ var webbrowserDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
294 verify(webbrowserDelegate);
264 verify(webbrowserDelegate);
295 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
265 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
296 var webbrowserWindow = findAppWindowForSurfaceId(webbrowserSurfaceId);
266 var webbrowserWindow = findAppWindowForSurfaceId(webbrowserSurfaceId);
@@ -303,7 +273,7 @@ Rectangle {
303 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
273 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
304
274
305 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
275 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
306− var dialerDelegate = findChild(tabletStage, "spreadDelegate_" + dialerSurfaceId);
276+ var dialerDelegate = findChild(tabletStage, "appDelegate_" + dialerSurfaceId);
307 verify(dialerDelegate);
277 verify(dialerDelegate);
308 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
278 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
309
279
@@ -336,7 +306,7 @@ Rectangle {
336
306
337 performEdgeSwipeToShowAppSpread();
307 performEdgeSwipeToShowAppSpread();
338
308
339− var appDelegate = findChild(tabletStage, "spreadDelegate_" + dialerSurfaceId);
309+ var appDelegate = findChild(tabletStage, "appDelegate_" + dialerSurfaceId);
340 verify(appDelegate);
310 verify(appDelegate);
341 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
311 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
342 tryCompare(appDelegate, "swipeToCloseEnabled", true);
312 tryCompare(appDelegate, "swipeToCloseEnabled", true);
@@ -359,7 +329,7 @@ Rectangle {
359 webbrowserCheckBox.checked = true;
329 webbrowserCheckBox.checked = true;
360 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
330 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
361 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
331 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
362− var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
332+ var webbrowserDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
363 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
333 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
364
334
365 tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Running);
335 tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Running);
@@ -368,7 +338,7 @@ Rectangle {
368 galleryCheckBox.checked = true;
338 galleryCheckBox.checked = true;
369 waitUntilAppSurfaceShowsUp(gallerySurfaceId);
339 waitUntilAppSurfaceShowsUp(gallerySurfaceId);
370 var galleryApp = ApplicationManager.findApplication(galleryCheckBox.appId);
340 var galleryApp = ApplicationManager.findApplication(galleryCheckBox.appId);
371− var galleryDelegate = findChild(tabletStage, "spreadDelegate_" + gallerySurfaceId);
341+ var galleryDelegate = findChild(tabletStage, "appDelegate_" + gallerySurfaceId);
372 compare(galleryDelegate.stage, ApplicationInfoInterface.MainStage);
342 compare(galleryDelegate.stage, ApplicationInfoInterface.MainStage);
373
343
374 tryCompare(galleryApp, "state", ApplicationInfoInterface.Running);
344 tryCompare(galleryApp, "state", ApplicationInfoInterface.Running);
@@ -389,7 +359,7 @@ Rectangle {
389 WindowStateStorage.saveStage(facebookCheckBox.appId, ApplicationInfoInterface.SideStage)
359 WindowStateStorage.saveStage(facebookCheckBox.appId, ApplicationInfoInterface.SideStage)
390 WindowStateStorage.saveStage(dialerCheckBox.appId, ApplicationInfoInterface.SideStage)
360 WindowStateStorage.saveStage(dialerCheckBox.appId, ApplicationInfoInterface.SideStage)
391
361
392− var stagesPriv = findInvisibleChild(tabletStage, "stagesPriv");
362+ var stagesPriv = findInvisibleChild(tabletStage, "DesktopStagePrivate");
393 verify(stagesPriv);
363 verify(stagesPriv);
394
364
395 // launch two main stage apps
365 // launch two main stage apps
@@ -398,7 +368,7 @@ Rectangle {
398 var webbrowserSurfaceId = topSurfaceList.nextId;
368 var webbrowserSurfaceId = topSurfaceList.nextId;
399 webbrowserCheckBox.checked = true;
369 webbrowserCheckBox.checked = true;
400 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
370 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
401− var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
371+ var webbrowserDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
402 verify(webbrowserDelegate);
372 verify(webbrowserDelegate);
403 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
373 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
404 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
374 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
@@ -407,7 +377,7 @@ Rectangle {
407 galleryCheckBox.checked = true;
377 galleryCheckBox.checked = true;
408 waitUntilAppSurfaceShowsUp(gallerySurfaceId);
378 waitUntilAppSurfaceShowsUp(gallerySurfaceId);
409 var galleryApp = ApplicationManager.findApplication(galleryCheckBox.appId);
379 var galleryApp = ApplicationManager.findApplication(galleryCheckBox.appId);
410− var galleryDelegate = findChild(tabletStage, "spreadDelegate_" + gallerySurfaceId);
380+ var galleryDelegate = findChild(tabletStage, "appDelegate_" + gallerySurfaceId);
411 compare(galleryDelegate.stage, ApplicationInfoInterface.MainStage);
381 compare(galleryDelegate.stage, ApplicationInfoInterface.MainStage);
412
382
413 compare(stagesPriv.mainStageAppId, galleryCheckBox.appId);
383 compare(stagesPriv.mainStageAppId, galleryCheckBox.appId);
@@ -419,14 +389,14 @@ Rectangle {
419 dialerCheckBox.checked = true;
389 dialerCheckBox.checked = true;
420 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
390 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
421 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
391 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
422− var dialerDelegate = findChild(tabletStage, "spreadDelegate_" + dialerSurfaceId);
392+ var dialerDelegate = findChild(tabletStage, "appDelegate_" + dialerSurfaceId);
423 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
393 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
424
394
425 var facebookSurfaceId = topSurfaceList.nextId;
395 var facebookSurfaceId = topSurfaceList.nextId;
426 facebookCheckBox.checked = true;
396 facebookCheckBox.checked = true;
427 waitUntilAppSurfaceShowsUp(facebookSurfaceId);
397 waitUntilAppSurfaceShowsUp(facebookSurfaceId);
428 var facebookApp = ApplicationManager.findApplication(facebookCheckBox.appId);
398 var facebookApp = ApplicationManager.findApplication(facebookCheckBox.appId);
429− var facebookDelegate = findChild(tabletStage, "spreadDelegate_" + facebookSurfaceId);
399+ var facebookDelegate = findChild(tabletStage, "appDelegate_" + facebookSurfaceId);
430 compare(facebookDelegate.stage, ApplicationInfoInterface.SideStage);
400 compare(facebookDelegate.stage, ApplicationInfoInterface.SideStage);
431
401
432 compare(stagesPriv.sideStageAppId, facebookCheckBox.appId);
402 compare(stagesPriv.sideStageAppId, facebookCheckBox.appId);
@@ -461,14 +431,14 @@ Rectangle {
461 webbrowserCheckBox.checked = true;
431 webbrowserCheckBox.checked = true;
462 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
432 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
463 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
433 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
464− var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
434+ var webbrowserDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
465 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
435 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
466
436
467 var dialerSurfaceId = topSurfaceList.nextId;
437 var dialerSurfaceId = topSurfaceList.nextId;
468 dialerCheckBox.checked = true;
438 dialerCheckBox.checked = true;
469 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
439 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
470 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
440 var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
471− var dialerDelegate = findChild(tabletStage, "spreadDelegate_" + dialerSurfaceId);
441+ var dialerDelegate = findChild(tabletStage, "appDelegate_" + dialerSurfaceId);
472 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
442 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
473
443
474
444
@@ -546,7 +516,7 @@ Rectangle {
546 }
516 }
547
517
548 function test_applicationLoadsInDefaultStage(data) {
518 function test_applicationLoadsInDefaultStage(data) {
549− var stagesPriv = findInvisibleChild(tabletStage, "stagesPriv");
519+ var stagesPriv = findInvisibleChild(tabletStage, "DesktopStagePrivate");
550 verify(stagesPriv);
520 verify(stagesPriv);
551
521
552 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
522 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
@@ -570,7 +540,7 @@ Rectangle {
570 function test_applicationLoadsInSavedStage(data) {
540 function test_applicationLoadsInSavedStage(data) {
571 WindowStateStorage.saveStage(webbrowserCheckBox.appId, data.stage)
541 WindowStateStorage.saveStage(webbrowserCheckBox.appId, data.stage)
572
542
573− var stagesPriv = findInvisibleChild(tabletStage, "stagesPriv");
543+ var stagesPriv = findInvisibleChild(tabletStage, "DesktopStagePrivate");
574 verify(stagesPriv);
544 verify(stagesPriv);
575
545
576 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
546 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
@@ -595,7 +565,7 @@ Rectangle {
595 WindowStateStorage.saveStage(webbrowserCheckBox.appId, data.fromStage);
565 WindowStateStorage.saveStage(webbrowserCheckBox.appId, data.fromStage);
596 stageSaver.clear();
566 stageSaver.clear();
597
567
598− var stagesPriv = findInvisibleChild(tabletStage, "stagesPriv");
568+ var stagesPriv = findInvisibleChild(tabletStage, "DesktopStagePrivate");
599 verify(stagesPriv);
569 verify(stagesPriv);
600
570
601 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
571 tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
@@ -622,7 +592,7 @@ Rectangle {
622 webbrowserCheckBox.checked = true;
592 webbrowserCheckBox.checked = true;
623 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
593 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
624
594
625− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
595+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
626 verify(appDelegate);
596 verify(appDelegate);
627 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
597 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
628
598
@@ -640,7 +610,7 @@ Rectangle {
640 webbrowserCheckBox.checked = true;
610 webbrowserCheckBox.checked = true;
641 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
611 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
642
612
643− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
613+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
644 verify(appDelegate);
614 verify(appDelegate);
645 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
615 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
646
616
@@ -664,7 +634,7 @@ Rectangle {
664
634
665 performEdgeSwipeToShowAppSpread();
635 performEdgeSwipeToShowAppSpread();
666
636
667− var appDelegate = findChild(tabletStage, "spreadDelegate_" + surface1Id);
637+ var appDelegate = findChild(tabletStage, "appDelegate_" + surface1Id);
668 verify(appDelegate);
638 verify(appDelegate);
669 tryCompare(appDelegate, "swipeToCloseEnabled", true);
639 tryCompare(appDelegate, "swipeToCloseEnabled", true);
670
640
@@ -759,7 +729,7 @@ Rectangle {
759 performEdgeSwipeToShowAppSpread();
729 performEdgeSwipeToShowAppSpread();
760
730
761 {
731 {
762− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
732+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
763 verify(appDelegate);
733 verify(appDelegate);
764 tryCompare(appDelegate, "swipeToCloseEnabled", true);
734 tryCompare(appDelegate, "swipeToCloseEnabled", true);
765 }
735 }
@@ -781,7 +751,7 @@ Rectangle {
781 webbrowserCheckBox.checked = true;
751 webbrowserCheckBox.checked = true;
782 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
752 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
783
753
784− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
754+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
785 verify(appDelegate);
755 verify(appDelegate);
786 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
756 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
787
757
@@ -799,7 +769,7 @@ Rectangle {
799 compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
769 compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
800 var dashSurfaceId = topSurfaceList.idAt(0);
770 var dashSurfaceId = topSurfaceList.idAt(0);
801
771
802− var appDelegate = findChild(tabletStage, "spreadDelegate_" + dashSurfaceId);
772+ var appDelegate = findChild(tabletStage, "appDelegate_" + dashSurfaceId);
803 verify(appDelegate);
773 verify(appDelegate);
804 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
774 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
805
775
@@ -829,7 +799,7 @@ Rectangle {
829 webbrowserCheckBox.checked = true;
799 webbrowserCheckBox.checked = true;
830 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
800 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
831
801
832− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
802+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
833 verify(appDelegate);
803 verify(appDelegate);
834 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
804 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
835
805
@@ -842,7 +812,7 @@ Rectangle {
842 webbrowserCheckBox.checked = true;
812 webbrowserCheckBox.checked = true;
843 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
813 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
844
814
845− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
815+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
846 verify(appDelegate);
816 verify(appDelegate);
847
817
848 dragToSideStage(webbrowserSurfaceId);
818 dragToSideStage(webbrowserSurfaceId);
@@ -860,7 +830,7 @@ Rectangle {
860 webbrowserCheckBox.checked = true;
830 webbrowserCheckBox.checked = true;
861 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
831 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
862
832
863− var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
833+ var appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
864 verify(appDelegate);
834 verify(appDelegate);
865
835
866 dragToSideStage(webbrowserSurfaceId);
836 dragToSideStage(webbrowserSurfaceId);
@@ -878,7 +848,7 @@ Rectangle {
878 webbrowserCheckBox.checked = true;
848 webbrowserCheckBox.checked = true;
879 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
849 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
880
850
881− appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
851+ appDelegate = findChild(tabletStage, "appDelegate_" + webbrowserSurfaceId);
882 verify(appDelegate);
852 verify(appDelegate);
883 tryCompare(appDelegate, "stage", ApplicationInfoInterface.SideStage);
853 tryCompare(appDelegate, "stage", ApplicationInfoInterface.SideStage);
884 }
854 }