git.iko.soy/unity8
on xenial help sign in
fix some more tests
commit9a152f1f51a4b292a9905b124cea635da1b6ef5e authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 30 Aug 2016, 17:43 (10 years ago) parent78417e6
2 files changed+8−12
compare with xenial
unifiedsplit
qml/Stage/Stage.qml−4 tests/qmltests/tst_Shell.qml+8−8
qml/Stage/Stage.qml−4
@@ -330,7 +330,6 @@ AbstractStage {
330330 when: !appRepeater.startingUp && root.parent
331331 }
332332
333− onStateChanged: print("*** Main State changed to:", state)
334333 states: [
335334 State {
336335 name: "spread"; when: priv.goneToSpread
@@ -662,9 +661,6 @@ AbstractStage {
662661 return;
663662
664663 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)
668664 topLevelSurfaceList.raiseId(model.id);
669665 priv.focusedAppDelegate = appDelegate;
670666 topLevelSurfaceList.raiseId(model.id);
tests/qmltests/tst_Shell.qml+8−8
@@ -2136,10 +2136,10 @@ Rectangle {
21362136
21372137 // Sanity checking
21382138 if (data.usageScenario === "tablet") {
2139− var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
2139+ var app1Delegate = findChild(shell, "appDelegate_" + app1SurfaceId);
21402140 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
21412141
2142− var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
2142+ var app2Delegate = findChild(shell, "appDelegate_" + app2SurfaceId);
21432143 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
21442144 }
21452145 verify(!app1.isTouchApp);
@@ -2177,10 +2177,10 @@ Rectangle {
21772177
21782178 // Sanity checking
21792179 if (data.usageScenario === "tablet") {
2180− var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
2180+ var app1Delegate = findChild(shell, "appDelegate_" + app1SurfaceId);
21812181 compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
21822182
2183− var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
2183+ var app2Delegate = findChild(shell, "appDelegate_" + app2SurfaceId);
21842184 compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
21852185 }
21862186
@@ -2411,9 +2411,9 @@ Rectangle {
24112411
24122412 function test_inputEventsOnEdgesEndUpInAppSurface_data() {
24132413 return [
2414− { tag: "phone", repeaterName: "spreadRepeater" },
2415− { tag: "tablet", repeaterName: "spreadRepeater" },
2416− { tag: "desktop", repeaterName: "appRepeater" },
2414+ { tag: "phone" },
2415+ { tag: "tablet" },
2416+ { tag: "desktop" },
24172417 ]
24182418 }
24192419
@@ -2428,7 +2428,7 @@ Rectangle {
24282428 var app = ApplicationManager.startApplication("camera-app");
24292429 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
24302430
2431− var appRepeater = findChild(shell, data.repeaterName);
2431+ var appRepeater = findChild(shell, "appRepeater");
24322432 var topmostAppDelegate = appRepeater.itemAt(0);
24332433 verify(topmostAppDelegate);
24342434