@@ -186,50 +186,38 @@ Rectangle {
186186 }
187187
188188 function test_childSessionDestructionReturnsFocusToSiblingOrParent() {
189− console.log("FAIL: entering childSessionDestriction....")
190189 sessionCheckbox.checked = true;
191−
192190 var sessionContainer = sessionContainerLoader.item;
191+ compare(sessionContainer.childSessions.count(), 0);
193192
194− // Without this, we cannot get active focus
195− sessionContainer.interactive = true;
196− compare(sessionContainer.childSessions.count(), 0);
193+ sessionContainer.interactive = true;
197194
198− /*
199− * Build a stack of fake sessions
200− * 3 sessions should cover all edge cases
201− * - Focus from departing session goes to sibling
202− * - Focus from last child goes to parent
203− */
204195 var i;
205196 var sessions = [];
197+ // 3 sessions should cover all edge cases
206198 for(i = 0; i < 3; i++) {
207− var session = ApplicationTest.addChildSession(
208− sessionContainer.session, "gallery");
209− session.createSurface();
210− sessionContainer.session.addChildSession(session);
211− compare(sessionContainer.childSessions.count(), i+1);
199+ var a_session = ApplicationTest.addChildSession(
200+ sessionContainer.session, "gallery"
201+ )
212202
213− sessions.push(session);
203+ a_session.createSurface();
204+ sessionContainer.session.addChildSession(a_session);
205+ compare(sessionContainer.childSessions.count(), i + 1);
206+
207+ sessions.push(a_session);
214208 }
215209
216− // Traverse the fake session stack, following and testing focus
217− var sessionUnderTest;
218− while(sessionUnderTest = sessions.pop()) {
219− var surface = sessionUnderTest.surface;
220− surface.forceActiveFocus();
221− compare(surface.activeFocus, true);
210+ var a_session;
211+ while(a_session = sessions.pop()) {
212+ a_session.surface.forceActiveFocus();
213+ compare(a_session.surface.activeFocus, true);
222214
223− var nextSession = sessions.pop();
224− if(nextSession != undefined) {
225− sessions.push(nextSession);
226− sessionContainer.session.removeChildSession(sessionUnderTest);
227− compare(surface.activeFocus, false);
215+ var parentSession = a_session.parentSession;
216+ sessionContainer.session.removeChildSession(a_session);
217+ compare(a_session.surface.activeFocus, false);
228218
229− compare(nextSession.surface.activeFocus, true)
230− }
219+ compare(parentSession.surface.activeFocus, true);
231220 }
232− console.log("FAIL: exiting childSessionDestriction....")
233221 }
234222
235223 function test_nestedChildSessions_data() {