Merge remote-tracking branch 'origin/develop' into develop

Author: bmarty

dependencies.gradle

@@ -21,7 +21,7 @@ def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
 def flipper = "0.164.0"
 def epoxy = "4.6.2"
-def mavericks = "2.7.0"
+def mavericks = "3.0.1"
 def glide = "4.14.1"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"

docs/unit_testing.md

@@ -314,7 +314,7 @@ class ViewModelTest {
     private var initialState = ViewState.Empty
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
+    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
 
     @Test
     fun `when handling MyAction, then emits Loading and Content states`() {

vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt

@@ -18,7 +18,7 @@ package im.vector.app.features
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
 import im.vector.app.features.roomprofile.members.RoomMemberListViewState
@@ -52,7 +52,7 @@ import org.matrix.android.sdk.api.util.Optional
 class MemberListViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     @get:Rule
     val instantExecutorRule = InstantTaskExecutorRule()

vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt

@@ -17,7 +17,7 @@
 package im.vector.app.features.crypto.quads
 
 import com.airbnb.mvrx.Uninitialized
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.test.fakes.FakeSession
 import im.vector.app.test.fakes.FakeStringProvider
 import im.vector.app.test.test
@@ -42,7 +42,7 @@ private val KEY_INFO_WITHOUT_PASSPHRASE = KeyInfo(id = "id", content = SecretSto
 class SharedSecureStorageViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val stringProvider = FakeStringProvider()
     private val fakeSession = FakeSession()

vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt

@@ -16,7 +16,7 @@
 
 package im.vector.app.features.location.live.map
 
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.live.StopLiveLocationShareUseCase
 import im.vector.app.test.fakes.FakeLocationSharingServiceConnection
@@ -37,7 +37,7 @@ private const val A_ROOM_ID = "room_id"
 class LiveLocationMapViewModelTest {
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
+    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
 
     private val args = LiveLocationMapViewArgs(roomId = A_ROOM_ID)
 

vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt

@@ -18,7 +18,7 @@ package im.vector.app.features.onboarding
 
 import android.net.Uri
 import android.os.Build
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.R
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
@@ -96,7 +96,7 @@ private val SSO_REGISTRATION_DESCRIPTION = AuthenticationDescription.Register(Au
 class OnboardingViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val fakeUri = FakeUri()
     private val fakeContext = FakeContext()

vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt

@@ -21,7 +21,7 @@ import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import com.airbnb.mvrx.withState
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricAuthError
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricHelper
@@ -54,7 +54,7 @@ import org.junit.Test
 class LockScreenViewModelTests {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val pinCodeHelper = mockk<PinCodeHelper>(relaxed = true)
     private val biometricHelper = mockk<BiometricHelper>(relaxed = true)
@@ -295,7 +295,7 @@ class LockScreenViewModelTests {
         test.assertEvents(LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage)
     }
 
-        private fun createViewState(
+    private fun createViewState(
             lockScreenConfiguration: LockScreenConfiguration = createDefaultConfiguration(),
             canUseBiometricAuth: Boolean = false,
             showBiometricPromptAutomatically: Boolean = false,

vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt

@@ -16,7 +16,7 @@
 
 package im.vector.app.features.poll.create
 
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.poll.PollMode
 import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_OPTIONS
 import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_QUESTION
@@ -48,7 +48,7 @@ class CreatePollViewModelTest {
     private val testDispatcher = UnconfinedTestDispatcher()
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(
+    val mavericksTestRule = MavericksTestRule(
             testDispatcher = testDispatcher // See https://github.com/airbnb/mavericks/issues/599
     )
 

vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt

@@ -18,7 +18,7 @@ package im.vector.app.features.settings.devices.v2
 
 import android.os.SystemClock
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.settings.devices.v2.list.DeviceType
 import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
 import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
@@ -48,7 +48,7 @@ import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 class DevicesViewModelTest {
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(testDispatcher = testDispatcher)
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
 
     private val fakeActiveSessionHolder = FakeActiveSessionHolder()
     private val getCurrentSessionCrossSigningInfoUseCase = mockk<GetCurrentSessionCrossSigningInfoUseCase>()

vector/src/test/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModelTest.kt

@@ -17,7 +17,7 @@
 package im.vector.app.features.settings.devices.v2.details
 
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.core.utils.CopyToClipboardUseCase
 import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
@@ -39,7 +39,7 @@ private const val A_TEXT = "text"
 class SessionDetailsViewModelTest {
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(testDispatcher = testDispatcher)
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
 
     private val args = SessionDetailsArgs(
             deviceId = A_SESSION_ID