git.iko.soy/unity8
on xenial help sign in
fix tests for fullscreen apps
1e73abdLukáš Tinkl
tests/qmltests/Stages/tst_DesktopStage.qml+8−8
compare with xenial
unifiedsplit
@@ -363,15 +363,15 @@ Item {
363 verify(cameraDelegate);
363 verify(cameraDelegate);
364
364
365 // maximize
365 // maximize
366− findChild(dialerDelegate, "decoratedWindow").maximize();
366+ dialerDelegate.maximize();
367 tryCompare(dialerDelegate, "visuallyMaximized", true);
367 tryCompare(dialerDelegate, "visuallyMaximized", true);
368
368
369 tryCompare(dashApp.session.surface, "visible", false);
369 tryCompare(dashApp.session.surface, "visible", false);
370 compare(cameraApp.session.surface.visible, true);
370 compare(cameraApp.session.surface.visible, true);
371
371
372 // restore
372 // restore
373− findChild(dialerDelegate, "decoratedWindow").maximize();
373+ dialerDelegate.restore();
374− compare(dashApp.session.surface.visible, true);
374+ compare(dashApp.session.surface.visible, false); // dash is occluded by the fullscreen camera ;)
375 compare(cameraApp.session.surface.visible, true);
375 compare(cameraApp.session.surface.visible, true);
376 }
376 }
377
377
@@ -385,9 +385,9 @@ Item {
385 verify(dialerDelegate);
385 verify(dialerDelegate);
386 findChild(dialerDelegate, "decoratedWindow").maximize();
386 findChild(dialerDelegate, "decoratedWindow").maximize();
387
387
388− var cameraApp = startApplication("camera-app");
388+ var mapApp = startApplication("map");
389− var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
389+ var mapDelegate = findChild(desktopStage, "appDelegate_map");
390− verify(cameraDelegate);
390+ verify(mapDelegate);
391
391
392 var galleryApp = startApplication("gallery-app");
392 var galleryApp = startApplication("gallery-app");
393 var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
393 var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
@@ -399,11 +399,11 @@ Item {
399
399
400 tryCompare(dashApp.session.surface, "visible", false);
400 tryCompare(dashApp.session.surface, "visible", false);
401 tryCompare(dialerApp.session.surface, "visible", false);
401 tryCompare(dialerApp.session.surface, "visible", false);
402− tryCompare(cameraApp.session.surface, "visible", false);
402+ tryCompare(mapApp.session.surface, "visible", false);
403
403
404 ApplicationManager.stopApplication("gallery-app");
404 ApplicationManager.stopApplication("gallery-app");
405
405
406− compare(cameraApp.session.surface.visible, true);
406+ compare(mapApp.session.surface.visible, true);
407 tryCompare(dialerApp.session.surface, "visible", true);
407 tryCompare(dialerApp.session.surface, "visible", true);
408 tryCompare(dashApp.session.surface, "visible", false); // still occluded by maximised dialer
408 tryCompare(dashApp.session.surface, "visible", false); // still occluded by maximised dialer
409 }
409 }