@@ -41,6 +41,8 @@ Item {
4141 elapsedTimerRunning: true
4242 }
4343
44+ SurfaceManager {}
45+
4446 ActiveCallHint {
4547 id: callHint
4648 anchors {
@@ -95,18 +97,30 @@ Item {
9597
9698 function test_activeHint(data) {
9799 if (data.dialer) {
100+ var dashApp = ApplicationManager.startApplication("unity8-dash");
101+ tryCompare(dashApp.surfaceList, "count", 1);
102+
98103 var application = ApplicationManager.startApplication("dialer-app");
99104 tryCompare(application.surfaceList, "count", 1);
100− MirFocusController.focusedSurface = application.surfaceList.get(0);
101105 tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
102106 tryCompare(application, "state", ApplicationInfoInterface.Running);
103107
104− if (!data.focused) { MirFocusController.focusedSurface = null; }
108+ if (!data.focused) {
109+ dashApp.surfaceList.get(0).activate();
110+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
111+ }
105112 }
106113 callManager.foregroundCall = data.call;
107114 callManager.callIndicatorVisible = data.visible;
108115
109116 compare(callHint.active, data.expected, "Call hint should be active when callIndicatorVisible=true");
117+
118+ if (data.dialer) {
119+ // clean up
120+ ApplicationManager.stopApplication("dialer-app");
121+ ApplicationManager.stopApplication("unity8-dash");
122+ tryCompare(ApplicationManager, "count", 0);
123+ }
110124 }
111125
112126 function test_currentCall_data() {