git.iko.soy/unity8
on xenial help sign in
fix some more tests
9a152f1Michael Zanetti
qml/Stage/Stage.qml−4
compare with xenial
unifiedsplit
@@ -330,7 +330,6 @@ AbstractStage {
330 when: !appRepeater.startingUp && root.parent
330 when: !appRepeater.startingUp && root.parent
331 }
331 }
332
332
333− onStateChanged: print("*** Main State changed to:", state)
334 states: [
333 states: [
335 State {
334 State {
336 name: "spread"; when: priv.goneToSpread
335 name: "spread"; when: priv.goneToSpread
@@ -662,9 +661,6 @@ AbstractStage {
662 return;
661 return;
663
662
664 if (focus) {
663 if (focus) {
665− print("app surface gained focus:", model.application.appId)
666− print("setting focusedAppDelegate to", appDelegate.application.appId)
667− print("raising surface in model", model.id)
668 topLevelSurfaceList.raiseId(model.id);
664 topLevelSurfaceList.raiseId(model.id);
669 priv.focusedAppDelegate = appDelegate;
665 priv.focusedAppDelegate = appDelegate;
670 topLevelSurfaceList.raiseId(model.id);
666 topLevelSurfaceList.raiseId(model.id);
tests/qmltests/tst_Shell.qml+8−8
@@ -2136,10 +2136,10 @@ Rectangle {
2136
2136
2137 // Sanity checking
2137 // Sanity checking
2138 if (data.usageScenario === "tablet") {
2138 if (data.usageScenario === "tablet") {
2139− var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
2139+ var app1Delegate = findChild(shell, "appDelegate_" + app1SurfaceId);
2140 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
2140 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
2141
2141
2142− var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
2142+ var app2Delegate = findChild(shell, "appDelegate_" + app2SurfaceId);
2143 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
2143 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
2144 }
2144 }
2145 verify(!app1.isTouchApp);
2145 verify(!app1.isTouchApp);
@@ -2177,10 +2177,10 @@ Rectangle {
2177
2177
2178 // Sanity checking
2178 // Sanity checking
2179 if (data.usageScenario === "tablet") {
2179 if (data.usageScenario === "tablet") {
2180− var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
2180+ var app1Delegate = findChild(shell, "appDelegate_" + app1SurfaceId);
2181 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
2181 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
2182
2182
2183− var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
2183+ var app2Delegate = findChild(shell, "appDelegate_" + app2SurfaceId);
2184 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
2184 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
2185 }
2185 }
2186
2186
@@ -2411,9 +2411,9 @@ Rectangle {
2411
2411
2412 function test_inputEventsOnEdgesEndUpInAppSurface_data() {
2412 function test_inputEventsOnEdgesEndUpInAppSurface_data() {
2413 return [
2413 return [
2414− { tag: "phone", repeaterName: "spreadRepeater" },
2414+ { tag: "phone" },
2415− { tag: "tablet", repeaterName: "spreadRepeater" },
2415+ { tag: "tablet" },
2416− { tag: "desktop", repeaterName: "appRepeater" },
2416+ { tag: "desktop" },
2417 ]
2417 ]
2418 }
2418 }
2419
2419
@@ -2428,7 +2428,7 @@ Rectangle {
2428 var app = ApplicationManager.startApplication("camera-app");
2428 var app = ApplicationManager.startApplication("camera-app");
2429 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
2429 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
2430
2430
2431− var appRepeater = findChild(shell, data.repeaterName);
2431+ var appRepeater = findChild(shell, "appRepeater");
2432 var topmostAppDelegate = appRepeater.itemAt(0);
2432 var topmostAppDelegate = appRepeater.itemAt(0);
2433 verify(topmostAppDelegate);
2433 verify(topmostAppDelegate);
2434
2434