mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Benoit Marty 2022-10-05 17:18:39 +02:00
commit 6e9bc7845d
13 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dependencies.gradle
View file

@ -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"

2
docs/unit_testing.md
View file

@ -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`() {

4
vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
View file

@ -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()

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

@ -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()

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

@ -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)

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

@ -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()

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

@ -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)

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

@ -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
)

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

@ -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>()

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

@ -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

4
vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
View file

@ -18,7 +18,7 @@ package im.vector.app.features.settings.devices.v2.overview
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.R
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
@ -67,7 +67,7 @@ private const val A_PASSWORD = "password"
class SessionOverviewViewModelTest {
@get:Rule
val mvRxTestRule = MvRxTestRule(testDispatcher = testDispatcher)
val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
private val args = SessionOverviewArgs(
deviceId = A_SESSION_ID_1

4
vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModelTest.kt
View file

@ -16,7 +16,7 @@
package im.vector.app.features.settings.devices.v2.rename
import com.airbnb.mvrx.test.MvRxTestRule
import com.airbnb.mvrx.test.MavericksTestRule
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
import im.vector.app.test.test
@ -36,7 +36,7 @@ private const val AN_EDITED_SESSION_NAME = "edited-session-name"
class RenameSessionViewModelTest {
@get:Rule
val mvRxTestRule = MvRxTestRule(testDispatcher = testDispatcher)
val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
private val args = RenameSessionArgs(
deviceId = A_SESSION_ID

4
vector/src/test/java/im/vector/app/features/settings/font/FontScaleSettingViewModelTest.kt
View file

@ -16,7 +16,7 @@
package im.vector.app.features.settings.font
import com.airbnb.mvrx.test.MvRxTestRule
import com.airbnb.mvrx.test.MavericksTestRule
import im.vector.app.features.settings.FontScaleValue
import im.vector.app.test.fakes.FakeConfiguration
import im.vector.app.test.fakes.FakeFontScalePreferences
@ -38,7 +38,7 @@ private fun aFontScaleValue(index: Int) = FontScaleValue(index, "foo", -1f, 0)
class FontScaleSettingViewModelTest {
@get:Rule
val mvrxTestRule = MvRxTestRule()
val mavericksTestRule = MavericksTestRule()
private val fakeConfiguration = FakeConfiguration()
private val fakeFontScalePreferences = FakeFontScalePreferences()