@@ -154,7 +154,7 @@ Rectangle {
154 function init() {
154 function init() {
155 stageSaver.clear();
155 stageSaver.clear();
157− tryCompare(topSurfaceList, "count", 0);
157+ tryCompare(topLevelSurfaceList, "count", 0);
159 // wait for Stage to stabilize back into its initial state
159 // wait for Stage to stabilize back into its initial state
160 var appRepeater = findChild(stage, "appRepeater");
160 var appRepeater = findChild(stage, "appRepeater");
@@ -278,11 +278,11 @@ Rectangle {
280 // Launch one of the available apps in this test case
280 // Launch one of the available apps in this test case
281− // Return the topSurfaceList's ID for the launched app
281+ // Return the topLevelSurfaceList's ID for the launched app
282 // Valid values are: "morph", "gallery", "dialer", and "facebook"
282 // Valid values are: "morph", "gallery", "dialer", and "facebook"
283 // "facebook" will be launched if no name is given
283 // "facebook" will be launched if no name is given
284 function launchApp(appName) {
284 function launchApp(appName) {
285− var nextAppId = topSurfaceList.nextId;
285+ var nextAppId = topLevelSurfaceList.nextId;
286 switch (appName) {
286 switch (appName) {
287 case "morph":
287 case "morph":
288 webbrowserCheckBox.checked = true;
288 webbrowserCheckBox.checked = true;
@@ -450,6 +450,7 @@ Rectangle {
450 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
450 compare(dialerDelegate.stage, ApplicationInfoInterface.SideStage);
452 var facebookSurfaceId = launchApp("facebook");
452 var facebookSurfaceId = launchApp("facebook");
453+ var facebookApp = ApplicationManager.findApplication(facebookCheckBox.appId);
453 facebookCheckBox.checked = true;
454 facebookCheckBox.checked = true;
454 waitUntilAppSurfaceShowsUp(facebookSurfaceId);
455 waitUntilAppSurfaceShowsUp(facebookSurfaceId);
@@ -492,6 +493,7 @@ Rectangle {
492 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
493 compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
494 var dialerSurfaceId = launchApp("dialer");
495 var dialerSurfaceId = launchApp("dialer");
496+ var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
495 dialerCheckBox.checked = true;
497 dialerCheckBox.checked = true;
496 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
498 waitUntilAppSurfaceShowsUp(dialerSurfaceId);
@@ -683,11 +685,11 @@ Rectangle {
684 function test_selectSuspendedAppWithoutSurface() {
686 function test_selectSuspendedAppWithoutSurface() {
685 launchApp("facebook");
687 launchApp("facebook");
686− compare(topSurfaceList.applicationAt(0).appId, "facebook-webapp");
688+ compare(topLevelSurfaceList.applicationAt(0).appId, "facebook-webapp");
687− var facebookSurfaceId = topSurfaceList.idAt(0);
689+ var facebookSurfaceId = topLevelSurfaceList.idAt(0);
688− var facebookWindow = topSurfaceList.windowAt(0);
690+ var facebookWindow = topLevelSurfaceList.windowAt(0);
690− var webbrowserSurfaceId = topSurfaceList.nextId;
692+ var webbrowserSurfaceId = topLevelSurfaceList.nextId;
691 launchApp("morph");
693 launchApp("morph");
693 webbrowserCheckBox.checked = true;
695 webbrowserCheckBox.checked = true;