Add some refactoring and first simple test on RoomListPresenter

features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt

@@ -25,18 +25,18 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import io.element.android.x.architecture.Async
 import io.element.android.x.architecture.Presenter
 import io.element.android.x.architecture.execute
-import io.element.android.x.matrix.Matrix
+import io.element.android.x.matrix.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class ChangeServerPresenter @Inject constructor(private val matrix: Matrix) : Presenter<ChangeServerState> {
+class ChangeServerPresenter @Inject constructor(private val authenticationService: MatrixAuthenticationService) : Presenter<ChangeServerState> {
 
     @Composable
     override fun present(): ChangeServerState {
         val localCoroutineScope = rememberCoroutineScope()
         val homeserver = rememberSaveable {
-            mutableStateOf(matrix.getHomeserverOrDefault())
+            mutableStateOf(authenticationService.getHomeserverOrDefault())
         }
         val changeServerAction: MutableState<Async<Unit>> = remember {
             mutableStateOf(Async.Uninitialized)
@@ -58,7 +58,7 @@ class ChangeServerPresenter @Inject constructor(private val matrix: Matrix) : Pr
 
     private fun CoroutineScope.submit(homeserver: String, changeServerAction: MutableState<Async<Unit>>) = launch {
         suspend {
-            matrix.setHomeserver(homeserver)
+            authenticationService.setHomeserver(homeserver)
         }.execute(changeServerAction)
     }
 }

features/login/src/main/java/io/element/android/x/features/login/root/LoginRootPresenter.kt

@@ -23,18 +23,18 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import io.element.android.x.architecture.Presenter
-import io.element.android.x.matrix.Matrix
+import io.element.android.x.matrix.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class LoginRootPresenter @Inject constructor(private val matrix: Matrix) : Presenter<LoginRootState> {
+class LoginRootPresenter @Inject constructor(private val authenticationService: MatrixAuthenticationService) : Presenter<LoginRootState> {
 
     @Composable
     override fun present(): LoginRootState {
         val localCoroutineScope = rememberCoroutineScope()
         val homeserver = rememberSaveable {
-            mutableStateOf(matrix.getHomeserverOrDefault())
+            mutableStateOf(authenticationService.getHomeserverOrDefault())
         }
         val loggedInState: MutableState<LoggedInState> = remember {
             mutableStateOf(LoggedInState.NotLoggedIn)
@@ -67,8 +67,8 @@ class LoginRootPresenter @Inject constructor(private val matrix: Matrix) : Prese
     private fun CoroutineScope.submit(homeserver: String, formState: LoginFormState, loggedInState: MutableState<LoggedInState>) = launch {
         loggedInState.value = LoggedInState.LoggingIn
         try {
-            matrix.setHomeserver(homeserver)
-            val sessionId = matrix.login(formState.login.trim(), formState.password.trim())
+            authenticationService.setHomeserver(homeserver)
+            val sessionId = authenticationService.login(formState.login.trim(), formState.password.trim())
             loggedInState.value = LoggedInState.LoggedIn(sessionId)
         } catch (failure: Throwable) {
             loggedInState.value = LoggedInState.ErrorLoggingIn(failure)
@@ -80,6 +80,6 @@ class LoginRootPresenter @Inject constructor(private val matrix: Matrix) : Prese
     }
 
     private fun refreshHomeServer(homeserver: MutableState<String>) {
-        homeserver.value = matrix.getHomeserverOrDefault()
+        homeserver.value = authenticationService.getHomeserverOrDefault()
     }
 }

features/roomlist/build.gradle.kts

@@ -31,8 +31,9 @@ anvil {
 }
 
 dependencies {
-    implementation(project(":anvilannotations"))
     anvil(project(":anvilcodegen"))
+    implementation(project(":anvilannotations"))
+
     implementation(project(":libraries:di"))
     implementation(project(":libraries:core"))
     implementation(project(":libraries:architecture"))
@@ -43,7 +44,15 @@ dependencies {
     implementation(project(":libraries:elementresources"))
     implementation(libs.datetime)
     implementation(libs.accompanist.placeholder)
+
     testImplementation(libs.test.junit)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.truth)
+    testImplementation(libs.test.turbine)
+
     androidTestImplementation(libs.test.junitext)
+
     ksp(libs.showkase.processor)
+
 }

features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListState.kt

@@ -26,5 +26,5 @@ data class RoomListState(
     val roomList: ImmutableList<RoomListRoomSummary>,
     val filter: String,
     val isLoginOut: Boolean,
-    val eventSink: (RoomListEvents) -> Unit = {}
+    val eventSink: (RoomListEvents) -> Unit
 )

features/roomlist/src/test/java/io/element/android/x/features/roomlist/ExampleUnitTest.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.x.features.roomlist
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}

features/roomlist/src/test/java/io/element/android/x/features/roomlist/RoomListPresenterTests.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.features.roomlist
+
+import app.cash.molecule.RecompositionClock
+import app.cash.molecule.moleculeFlow
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.x.matrix.FakeMatrixClient
+import io.element.android.x.matrix.core.SessionId
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class RoomListPresenterTests {
+
+    @Test
+    fun `present - should start with no user and then load user with success`() = runTest {
+
+        val presenter = RoomListPresenter(FakeMatrixClient(SessionId("sessionId")), LastMessageFormatter())
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            assertThat(initialState.matrixUser).isNull()
+            val withUserState = awaitItem()
+            assertThat(withUserState).isNotNull()
+        }
+    }
+}