@@ -185,6 +185,53 @@ Rectangle {
185185 tryCompare(sessionSpy, "count", data.count);
186186 }
187187
188+ function test_childSessionDestructionReturnsFocusToSiblingOrParent() {
189+ console.log("FAIL: entering childSessionDestriction....")
190+ sessionCheckbox.checked = true;
191+
192+ var sessionContainer = sessionContainerLoader.item;
193+
194+ // Without this, we cannot get active focus
195+ sessionContainer.interactive = true;
196+ compare(sessionContainer.childSessions.count(), 0);
197+
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+ */
204+ var i;
205+ var sessions = [];
206+ 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);
212+
213+ sessions.push(session);
214+ }
215+
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);
222+
223+ var nextSession = sessions.pop();
224+ if(nextSession != undefined) {
225+ sessions.push(nextSession);
226+ sessionContainer.session.removeChildSession(sessionUnderTest);
227+ compare(surface.activeFocus, false);
228+
229+ compare(nextSession.surface.activeFocus, true)
230+ }
231+ }
232+ console.log("FAIL: exiting childSessionDestriction....")
233+ }
234+
188235 function test_nestedChildSessions_data() {
189236 return [ { tag: "depth=2", depth: 2 },
190237 { tag: "depth=8", depth: 8 }