@@ -46,8 +46,8 @@ Item {
4646 WindowStateStorage.geometry = {
4747 'unity8-dash': Qt.rect(0, units.gu(3), units.gu(50), units.gu(40)),
4848 'dialer-app': Qt.rect(units.gu(51), units.gu(3), units.gu(50), units.gu(40)),
49− 'camera-app': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
50− 'gallery-app': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
49+ 'gmail-webapp': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
50+ 'twitter-webapp': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
5151 }
5252 }
5353
@@ -166,8 +166,8 @@ Item {
166166
167167 function test_tappingOnWindowChangesFocusedApp_data() {
168168 return [
169− {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app"], focusfrom: 0, focusTo: 1 },
170− {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app"], focusfrom: 1, focusTo: 0 }
169+ {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 0, focusTo: 1 },
170+ {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 1, focusTo: 0 }
171171 ]
172172 }
173173
@@ -213,8 +213,8 @@ Item {
213213
214214 function test_tappingOnDecorationFocusesApplication_data() {
215215 return [
216− {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app"], focusfrom: 0, focusTo: 1 },
217− {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app"], focusfrom: 1, focusTo: 0 }
216+ {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 0, focusTo: 1 },
217+ {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 1, focusTo: 0 }
218218 ]
219219 }
220220
@@ -383,7 +383,10 @@ Item {
383383 var dialerApp = startApplication("dialer-app");
384384 var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
385385 verify(dialerDelegate);
386− findChild(dialerDelegate, "decoratedWindow").maximize();
386+
387+ var dialerMaximizeButton = findChild(dialerDelegate, "maximizeWindowButton");
388+ verify(dialerMaximizeButton);
389+ mouseClick(dialerMaximizeButton);
387390
388391 var mapApp = startApplication("map");
389392 var mapDelegate = findChild(desktopStage, "appDelegate_map");
@@ -392,7 +395,10 @@ Item {
392395 var galleryApp = startApplication("gallery-app");
393396 var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
394397 verify(galleryDelegate);
395− findChild(galleryDelegate, "decoratedWindow").maximize();
398+
399+ var galleryMaximizeButton = findChild(galleryDelegate, "maximizeWindowButton");
400+ verify(galleryMaximizeButton);
401+ mouseClick(galleryMaximizeButton);
396402
397403 tryCompare(dialerDelegate, "visuallyMaximized", true);
398404 tryCompare(galleryDelegate, "visuallyMaximized", true);
@@ -413,7 +419,9 @@ Item {
413419 var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
414420 verify(dashDelegate);
415421 // maximize
416− findChild(dashDelegate, "decoratedWindow").maximize();
422+ var dashMaximizeButton = findChild(dashDelegate, "maximizeWindowButton");
423+ verify(dashMaximizeButton);
424+ mouseClick(dashMaximizeButton);
417425 tryCompare(dashDelegate, "visuallyMaximized", true);
418426
419427 var dialerApp = startApplication("dialer-app");