on xenial help sign in
fix tests for fullscreen apps
commit1e73abd053c773c403557ad4ef117233c597daa5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateSat 7 Nov 2015, 01:32 (11 years ago) parentdb7effd
1 file changed+8−8
tests/qmltests/Stages/tst_DesktopStage.qml+8−8
tests/qmltests/Stages/tst_DesktopStage.qml+8−8
@@ -363,15 +363,15 @@ Item {
363363 verify(cameraDelegate);
364364
365365 // maximize
366− findChild(dialerDelegate, "decoratedWindow").maximize();
366+ dialerDelegate.maximize();
367367 tryCompare(dialerDelegate, "visuallyMaximized", true);
368368
369369 tryCompare(dashApp.session.surface, "visible", false);
370370 compare(cameraApp.session.surface.visible, true);
371371
372372 // restore
373− findChild(dialerDelegate, "decoratedWindow").maximize();
374− compare(dashApp.session.surface.visible, true);
373+ dialerDelegate.restore();
374+ compare(dashApp.session.surface.visible, false); // dash is occluded by the fullscreen camera ;)
375375 compare(cameraApp.session.surface.visible, true);
376376 }
377377
@@ -385,9 +385,9 @@ Item {
385385 verify(dialerDelegate);
386386 findChild(dialerDelegate, "decoratedWindow").maximize();
387387
388− var cameraApp = startApplication("camera-app");
389− var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
390− verify(cameraDelegate);
388+ var mapApp = startApplication("map");
389+ var mapDelegate = findChild(desktopStage, "appDelegate_map");
390+ verify(mapDelegate);
391391
392392 var galleryApp = startApplication("gallery-app");
393393 var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
@@ -399,11 +399,11 @@ Item {
399399
400400 tryCompare(dashApp.session.surface, "visible", false);
401401 tryCompare(dialerApp.session.surface, "visible", false);
402− tryCompare(cameraApp.session.surface, "visible", false);
402+ tryCompare(mapApp.session.surface, "visible", false);
403403
404404 ApplicationManager.stopApplication("gallery-app");
405405
406− compare(cameraApp.session.surface.visible, true);
406+ compare(mapApp.session.surface.visible, true);
407407 tryCompare(dialerApp.session.surface, "visible", true);
408408 tryCompare(dashApp.session.surface, "visible", false); // still occluded by maximised dialer
409409 }