RemoveTabUseCase: Support selecting parent tab

Author: csadilek

components/feature/tabs/src/main/java/mozilla/components/feature/tabs/TabsUseCases.kt

@@ -80,6 +80,20 @@ class TabsUseCases(
          */
         operator fun invoke(sessionId: String)
 
+        /**
+         * Removes the session with the provided ID. This method
+         * has no effect if the session doesn't exist.
+         *
+         * @param sessionId The ID of the session to remove.
+         * @param selectParentIfExists Whether or not to select the parent tab
+         * of the removed tab if a parent exists. Note that the default implementation
+         * of this method will ignore [selectParentIfExists] and never select a parent.
+         * This is a temporary workaround to prevent additional API breakage for
+         * subtypes other than [DefaultRemoveTabUseCase]. The default implementation
+         * should be removed together with invoke(Session).
+         */
+        operator fun invoke(sessionId: String, selectParentIfExists: Boolean) = invoke(sessionId)
+
         /**
          * Removes the provided session.
          *
@@ -109,6 +123,21 @@ class TabsUseCases(
             }
         }
 
+        /**
+         * Removes the session with the provided ID. This method
+         * has no effect if the session doesn't exist.
+         *
+         * @param sessionId The ID of the session to remove.
+         * @param selectParentIfExists Whether or not to select the parent tab
+         * of the removed tab if a parent exists.
+         */
+        override operator fun invoke(sessionId: String, selectParentIfExists: Boolean) {
+            val session = sessionManager.findSessionById(sessionId)
+            if (session != null) {
+                sessionManager.remove(session, selectParentIfExists)
+            }
+        }
+
         /**
          * Removes the provided session.
          *

components/feature/tabs/src/test/java/mozilla/components/feature/tabs/TabsUseCasesTest.kt

@@ -21,6 +21,7 @@ import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
 import mozilla.components.support.test.argumentCaptor
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.components.support.test.whenever
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
@@ -58,19 +59,29 @@ class TabsUseCasesTest {
         val session = Session("A")
         useCases.removeTab(session)
 
-        verify(sessionManager).remove(session)
+        verify(sessionManager).remove(session, false)
     }
 
     @Test
     fun `RemoveTabUseCase - session can be removed by ID`() {
-        val sessionManager = spy(SessionManager(mock()))
+        val sessionManager: SessionManager = mock()
+        val session = Session(id = "test", initialUrl = "http://mozilla.org")
+        whenever(sessionManager.findSessionById(session.id)).thenReturn(session)
+
         val useCases = TabsUseCases(BrowserStore(), sessionManager)
+        useCases.removeTab(session.id)
+        verify(sessionManager).remove(session, false)
+    }
 
+    @Test
+    fun `RemoveTabUseCase - remove by ID and select parent if it exists`() {
+        val sessionManager: SessionManager = mock()
         val session = Session(id = "test", initialUrl = "http://mozilla.org")
-        sessionManager.remove(session)
-        useCases.removeTab(session.id)
+        whenever(sessionManager.findSessionById(session.id)).thenReturn(session)
 
-        verify(sessionManager).remove(session)
+        val useCases = TabsUseCases(BrowserStore(), sessionManager)
+        useCases.removeTab(session.id, selectParentIfExists = true)
+        verify(sessionManager).remove(session, true)
     }
 
     @Test