← Back to branch summary

~nick-dedekind/unity8/side-stage-redesign-tutorial

« back to all changes in this revision

Viewing changes to tests/qmltests/Stages/tst_TabletStage.qml

  • Committer: Nick Dedekind
  • Date: 2015-12-14 18:06:18 UTC
  • mfrom: (1998.1.101 unity8)
  • Revision ID: nick.dedekind@canonical.com-20151214180618-men18zbauv1r153m
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qmltests/Stages/tst_TabletStage.qml
192
192
            waitUntilAppSurfaceShowsUp(webbrowserCheckBox.appId);
193
193
            var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
194
194
            compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
195
 
            tryCompare(webbrowserApp.session.surface, "activeFocus", true);
 
195
            tryCompare(webbrowserApp.session.lastSurface, "activeFocus", true);
196
196
 
197
197
            dialerCheckBox.checked = true;
198
198
            waitUntilAppSurfaceShowsUp(dialerCheckBox.appId);
199
199
            var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
200
200
            compare(dialerApp.stage, ApplicationInfoInterface.SideStage);
201
 
            tryCompare(dialerApp.session.surface, "activeFocus", true);
202
 
            tryCompare(webbrowserApp.session.surface, "activeFocus", false);
 
201
            tryCompare(dialerApp.session.lastSurface, "activeFocus", true);
 
202
            tryCompare(webbrowserApp.session.lastSurface, "activeFocus", false);
203
203
 
204
204
            // Tap on the main stage application and check if the focus
205
205
            // has been passed to it.
208
208
            verify(webbrowserWindow);
209
209
            tap(webbrowserWindow);
210
210
 
211
 
            tryCompare(dialerApp.session.surface, "activeFocus", false);
212
 
            tryCompare(webbrowserApp.session.surface, "activeFocus", true);
 
211
            tryCompare(dialerApp.session.lastSurface, "activeFocus", false);
 
212
            tryCompare(webbrowserApp.session.lastSurface, "activeFocus", true);
213
213
 
214
214
            // Now tap on the side stage application and check if the focus
215
215
            // has been passed back to it.
218
218
            verify(dialerWindow);
219
219
            tap(dialerWindow);
220
220
 
221
 
            tryCompare(dialerApp.session.surface, "activeFocus", true);
222
 
            tryCompare(webbrowserApp.session.surface, "activeFocus", false);
 
221
            tryCompare(dialerApp.session.lastSurface, "activeFocus", true);
 
222
            tryCompare(webbrowserApp.session.lastSurface, "activeFocus", false);
223
223
        }
224
224
 
225
225
        function test_closeAppInSideStage() {