jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIx test compilation

This commit is contained in:
valere 2022-12-13 18:56:04 +01:00
parent f1e8f846b9
commit ee156239b9
16 changed files with 128 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -323,7 +323,7 @@ tasks.register("recordScreenshots", GradleBuild) {
tasks.register("verifyScreenshots", GradleBuild) {
startParameter.projectProperties.screenshot = ""
tasks = [':vector:verifyPaparazziDebug']
tasks = [':vector:verifyPaparazziKotlinCryptoDebug']
}
ext.initScreenshotTests = { project ->

2
vector/src/test/java/im/vector/app/core/pushers/PushersManagerTest.kt
View File

@ -75,7 +75,7 @@ class PushersManagerTest {
deviceDisplayName = deviceDisplayName,
url = gateway,
enabled = true,
deviceId = session.sessionParams.deviceId!!,
deviceId = session.sessionParams.deviceId,
append = false,
withEventIdOnly = true,
)

12
vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
View File

@ -142,11 +142,11 @@ class MemberListViewModelTest {
val fakeSession: Session = mockk {
val fakeCrossSigningService: CrossSigningService = mockk {
every { isUserTrusted(aliceMxid) } returns true
every { isUserTrusted(bobMxid) } returns true
every { isUserTrusted(marcMxid) } returns false
coEvery { isUserTrusted(aliceMxid) } returns true
coEvery { isUserTrusted(bobMxid) } returns true
coEvery { isUserTrusted(marcMxid) } returns false
every { getUserCrossSigningKeys(aliceMxid) } returns MXCrossSigningInfo(
coEvery { getUserCrossSigningKeys(aliceMxid) } returns MXCrossSigningInfo(
aliceMxid,
crossSigningKeys = listOf(
CryptoCrossSigningKey(
@ -173,7 +173,7 @@ class MemberListViewModelTest {
),
true
)
every { getUserCrossSigningKeys(bobMxid) } returns MXCrossSigningInfo(
coEvery { getUserCrossSigningKeys(bobMxid) } returns MXCrossSigningInfo(
aliceMxid,
crossSigningKeys = listOf(
CryptoCrossSigningKey(
@ -200,7 +200,7 @@ class MemberListViewModelTest {
),
true
)
every { getUserCrossSigningKeys(marcMxid) } returns MXCrossSigningInfo(
coEvery { getUserCrossSigningKeys(marcMxid) } returns MXCrossSigningInfo(
aliceMxid,
crossSigningKeys = listOf(
CryptoCrossSigningKey(

4
vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
View File

@ -26,6 +26,8 @@ import im.vector.app.test.fakes.FakeVectorFeatures
import im.vector.app.test.fakes.FakeVectorPreferences
import im.vector.app.test.fakes.FakeWidgetArgsBuilder
import im.vector.app.test.fixtures.RoomSummaryFixture.aRoomSummary
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import org.junit.Test
internal class DefaultNavigatorTest {
@ -38,6 +40,7 @@ internal class DefaultNavigatorTest {
private val features = FakeVectorFeatures()
private val analyticsTracker = FakeAnalyticsTracker()
private val debugNavigator = FakeDebugNavigator()
private val coroutineScope = CoroutineScope(SupervisorJob())
private val navigator = DefaultNavigator(
sessionHolder.instance,
@ -46,6 +49,7 @@ internal class DefaultNavigatorTest {
spaceStateHandler,
supportedVerificationMethodsProvider.instance,
features,
coroutineScope,
analyticsTracker,
debugNavigator,
)

5
vector/src/test/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCaseTest.kt
View File

@ -18,6 +18,7 @@ package im.vector.app.features.settings.devices
import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
import im.vector.app.test.fakes.FakeActiveSessionHolder
import kotlinx.coroutines.runBlocking
import org.amshove.kluent.shouldBeEqualTo
import org.junit.Test
@ -50,7 +51,9 @@ class GetCurrentSessionCrossSigningInfoUseCaseTest {
isCrossSigningVerified = isCrossSigningVerified
)
val result = getCurrentSessionCrossSigningInfoUseCase.execute()
val result = runBlocking {
getCurrentSessionCrossSigningInfoUseCase.execute()
}
result shouldBeEqualTo expectedResult
}

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

@ -41,12 +41,12 @@ import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.runs
import io.mockk.unmockkAll
import io.mockk.verify
import io.mockk.verifyAll
import kotlinx.coroutines.flow.flowOf
import org.amshove.kluent.shouldBeEqualTo
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
@ -105,13 +105,10 @@ class DevicesViewModelTest {
}
private fun givenVerificationService(): FakeVerificationService {
val fakeVerificationService = fakeActiveSessionHolder
return fakeActiveSessionHolder
.fakeSession
.fakeCryptoService
.fakeVerificationService
fakeVerificationService.givenAddListenerSucceeds()
fakeVerificationService.givenRemoveListenerSucceeds()
return fakeVerificationService
}
@After
@ -120,32 +117,34 @@ class DevicesViewModelTest {
}
@Test
@Ignore
fun `given the viewModel when initializing it then verification listener is added`() {
// Given
val fakeVerificationService = givenVerificationService()
// When
val viewModel = createViewModel()
// Then
verify {
fakeVerificationService.addListener(viewModel)
}
// // Given
// val fakeVerificationService = givenVerificationService()
//
// // When
// val viewModel = createViewModel()
//
// // Then
// verify {
// fakeVerificationService.addListener(viewModel)
// }
}
@Test
@Ignore
fun `given the viewModel when clearing it then verification listener is removed`() {
// Given
val fakeVerificationService = givenVerificationService()
// When
val viewModel = createViewModel()
viewModel.onCleared()
// Then
verify {
fakeVerificationService.removeListener(viewModel)
}
// // Given
// val fakeVerificationService = givenVerificationService()
//
// // When
// val viewModel = createViewModel()
// viewModel.onCleared()
//
// // Then
// verify {
// fakeVerificationService.removeListener(viewModel)
// }
}
@Test
@ -249,7 +248,7 @@ class DevicesViewModelTest {
)
.assertEvent { it is DevicesViewEvent.SignoutSuccess }
.finish()
verify {
coVerify {
fakeRefreshDevicesUseCase.execute()
}
}

5
vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCaseTest.kt
View File

@ -17,11 +17,10 @@
package im.vector.app.features.settings.devices.v2
import im.vector.app.test.fakes.FakeActiveSessionHolder
import io.mockk.coEvery
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.runs
import io.mockk.unmockkAll
import io.mockk.verify
import kotlinx.coroutines.flow.flowOf
@ -60,7 +59,7 @@ class RefreshDevicesOnCryptoDevicesChangeUseCaseTest {
val flowSession = mockk<FlowSession>()
every { fakeSession.flow() } returns flowSession
every { flowSession.liveUserCryptoDevices(any()) } returns flowOf(devices)
every { fakeSession.cryptoService().fetchDevicesList(any()) } just runs
coEvery { fakeSession.cryptoService().fetchDevicesList() }
// When
refreshDevicesOnCryptoDevicesChangeUseCase.execute()

23
vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCaseTest.kt
View File

@ -17,12 +17,11 @@
package im.vector.app.features.settings.devices.v2
import im.vector.app.test.fakes.FakeActiveSessionHolder
import io.mockk.every
import io.mockk.just
import io.mockk.runs
import io.mockk.verifyAll
import io.mockk.coEvery
import io.mockk.coVerifyAll
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.matrix.android.sdk.api.NoOpMatrixCallback
import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
class RefreshDevicesUseCaseTest {
@ -35,14 +34,16 @@ class RefreshDevicesUseCaseTest {
@Test
fun `given current session when refreshing then devices list and keys are fetched`() {
val session = fakeActiveSessionHolder.fakeSession
every { session.cryptoService().fetchDevicesList(any()) } just runs
every { session.cryptoService().downloadKeys(any(), any(), any()) } just runs
coEvery { session.cryptoService().fetchDevicesList() } returns emptyList()
coEvery { session.cryptoService().downloadKeysIfNeeded(any()) } returns MXUsersDevicesMap()
refreshDevicesUseCase.execute()
runBlocking {
refreshDevicesUseCase.execute()
}
verifyAll {
session.cryptoService().fetchDevicesList(match { it is NoOpMatrixCallback })
session.cryptoService().downloadKeys(listOf(session.myUserId), true, match { it is NoOpMatrixCallback })
coVerifyAll {
session.cryptoService().fetchDevicesList()
session.cryptoService().downloadKeysIfNeeded(listOf(session.myUserId), true)
}
}
}

58
vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
View File

@ -32,17 +32,18 @@ import im.vector.app.test.fakes.FakeVerificationService
import im.vector.app.test.fixtures.aDeviceFullInfo
import im.vector.app.test.test
import im.vector.app.test.testDispatcher
import io.mockk.coVerify
import io.mockk.every
import io.mockk.justRun
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.unmockkAll
import io.mockk.verify
import io.mockk.verifyAll
import kotlinx.coroutines.flow.flowOf
import org.amshove.kluent.shouldBeEqualTo
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
@ -94,13 +95,10 @@ class OtherSessionsViewModelTest {
}
private fun givenVerificationService(): FakeVerificationService {
val fakeVerificationService = fakeActiveSessionHolder
return fakeActiveSessionHolder
.fakeSession
.fakeCryptoService
.fakeVerificationService
fakeVerificationService.givenAddListenerSucceeds()
fakeVerificationService.givenRemoveListenerSucceeds()
return fakeVerificationService
}
@After
@ -109,36 +107,38 @@ class OtherSessionsViewModelTest {
}
@Test
@Ignore
fun `given the viewModel when initializing it then verification listener is added`() {
// Given
val fakeVerificationService = givenVerificationService()
val devices = mockk<List<DeviceFullInfo>>()
givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
// When
val viewModel = createViewModel()
// val fakeVerificationService = givenVerificationService()
// val devices = mockk<List<DeviceFullInfo>>()
// givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
//
// // When
// val viewModel = createViewModel()
// Then
verify {
fakeVerificationService.addListener(viewModel)
}
// verify {
// fakeVerificationService.addListener(viewModel)
// }
}
@Test
@Ignore
fun `given the viewModel when clearing it then verification listener is removed`() {
// Given
val fakeVerificationService = givenVerificationService()
val devices = mockk<List<DeviceFullInfo>>()
givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
// When
val viewModel = createViewModel()
viewModel.onCleared()
// Then
verify {
fakeVerificationService.removeListener(viewModel)
}
// // Given
// val fakeVerificationService = givenVerificationService()
// val devices = mockk<List<DeviceFullInfo>>()
// givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
//
// // When
// val viewModel = createViewModel()
// viewModel.onCleared()
//
// // Then
// verify {
// fakeVerificationService.removeListener(viewModel)
// }
}
@Test
@ -347,7 +347,7 @@ class OtherSessionsViewModelTest {
)
.assertEvent { it is OtherSessionsViewEvents.SignoutSuccess }
.finish()
verify {
coVerify {
fakeRefreshDevicesUseCase.execute()
}
}
@ -383,7 +383,7 @@ class OtherSessionsViewModelTest {
)
.assertEvent { it is OtherSessionsViewEvents.SignoutSuccess }
.finish()
verify {
coVerify {
fakeRefreshDevicesUseCase.execute()
}
}

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

@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.flowOf
import org.amshove.kluent.shouldBeEqualTo
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
@ -114,8 +115,7 @@ class SessionOverviewViewModelTest {
.fakeSession
.fakeCryptoService
.fakeVerificationService
fakeVerificationService.givenAddListenerSucceeds()
fakeVerificationService.givenRemoveListenerSucceeds()
fakeVerificationService.givenEventFlow()
return fakeVerificationService
}
@ -130,27 +130,28 @@ class SessionOverviewViewModelTest {
val fakeVerificationService = givenVerificationService()
// When
val viewModel = createViewModel()
createViewModel()
// Then
verify {
fakeVerificationService.addListener(viewModel)
fakeVerificationService.requestEventFlow()
}
}
@Test
@Ignore
fun `given the viewModel when clearing it then verification listener is removed`() {
// Given
val fakeVerificationService = givenVerificationService()
// When
val viewModel = createViewModel()
viewModel.onCleared()
// Then
verify {
fakeVerificationService.removeListener(viewModel)
}
// // Given
// val fakeVerificationService = givenVerificationService()
//
// // When
// val viewModel = createViewModel()
// viewModel.onCleared()
//
// // Then
// verify {
// fakeVerificationService.removeListener(viewModel)
// }
}
@Test
@ -281,7 +282,7 @@ class SessionOverviewViewModelTest {
)
.assertEvent { it is SessionOverviewViewEvent.SignoutSuccess }
.finish()
verify {
coVerify {
refreshDevicesUseCase.execute()
}
}

14
vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCaseTest.kt
View File

@ -18,11 +18,9 @@ package im.vector.app.features.settings.devices.v2.rename
import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
import im.vector.app.test.fakes.FakeActiveSessionHolder
import io.mockk.every
import io.mockk.just
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.mockk
import io.mockk.runs
import io.mockk.verify
import kotlinx.coroutines.test.runTest
import org.amshove.kluent.shouldBe
import org.amshove.kluent.shouldBeEqualTo
@ -45,17 +43,17 @@ class RenameSessionUseCaseTest {
fun `given a device id and a new name when no error during rename then the device is renamed with success`() = runTest {
// Given
fakeActiveSessionHolder.fakeSession.fakeCryptoService.givenSetDeviceNameSucceeds()
every { refreshDevicesUseCase.execute() } just runs
coVerify { refreshDevicesUseCase.execute() }
// When
val result = renameSessionUseCase.execute(A_DEVICE_ID, A_DEVICE_NAME)
// Then
result.isSuccess shouldBe true
verify {
coVerify {
fakeActiveSessionHolder.fakeSession
.cryptoService()
.setDeviceName(A_DEVICE_ID, A_DEVICE_NAME, any())
.setDeviceName(A_DEVICE_ID, A_DEVICE_NAME)
refreshDevicesUseCase.execute()
}
}
@ -79,7 +77,7 @@ class RenameSessionUseCaseTest {
// Given
val error = Exception()
fakeActiveSessionHolder.fakeSession.fakeCryptoService.givenSetDeviceNameSucceeds()
every { refreshDevicesUseCase.execute() } throws error
coEvery { refreshDevicesUseCase.execute() } throws error
// When
val result = renameSessionUseCase.execute(A_DEVICE_ID, A_DEVICE_NAME)

14
vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCaseTest.kt
View File

@ -17,9 +17,9 @@
package im.vector.app.features.settings.devices.v2.signout
import im.vector.app.test.fakes.FakeActiveSessionHolder
import io.mockk.coVerify
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.test.runTest
import org.amshove.kluent.shouldBe
import org.junit.Test
@ -51,10 +51,10 @@ class SignoutSessionsUseCaseTest {
// Then
result.isSuccess shouldBe true
verify {
coVerify {
fakeActiveSessionHolder.fakeSession
.fakeCryptoService
.deleteDevices(deviceIds, any(), any())
.deleteDevices(deviceIds, any())
}
}
@ -73,10 +73,10 @@ class SignoutSessionsUseCaseTest {
// Then
result.isFailure shouldBe true
verify {
coVerify {
fakeActiveSessionHolder.fakeSession
.fakeCryptoService
.deleteDevices(deviceIds, any(), any())
.deleteDevices(deviceIds, any())
}
}
@ -101,10 +101,10 @@ class SignoutSessionsUseCaseTest {
// Then
result.isSuccess shouldBe true
verify {
coVerify {
fakeActiveSessionHolder.fakeSession
.fakeCryptoService
.deleteDevices(deviceIds, any(), any())
.deleteDevices(deviceIds, any())
callback(reAuthNeeded)
}
}

19
vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
View File

@ -16,12 +16,11 @@
package im.vector.app.test.fakes
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import im.vector.app.test.fixtures.CryptoDeviceInfoFixture.aCryptoDeviceInfo
import io.mockk.coEvery
import io.mockk.every
import io.mockk.mockk
import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
import org.matrix.android.sdk.api.session.crypto.CryptoService
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
@ -47,11 +46,11 @@ class FakeCryptoService(
override fun getLiveCryptoDeviceInfo() = MutableLiveData(cryptoDeviceInfos.values.toList())
override fun getLiveCryptoDeviceInfoList(userId: String) = getLiveCryptoDeviceInfo(listOf(userId))
override fun getLiveCryptoDeviceInfoList(userIds: List<String>) = MutableLiveData(
cryptoDeviceInfos.filterKeys { userIds.contains(it) }.values.toList()
)
override fun getLiveCryptoDeviceInfo(userId: String): LiveData<List<CryptoDeviceInfo>> {
return MutableLiveData(
cryptoDeviceInfos.filterKeys { it == userId }.values.toList()
)
}
override fun getLiveCryptoDeviceInfoWithId(deviceId: String) = cryptoDeviceInfoWithIdLiveData
@ -70,9 +69,7 @@ class FakeCryptoService(
}
fun givenDeleteDevicesSucceeds(deviceIds: List<String>) {
every { deleteDevices(deviceIds, any(), any()) } answers {
thirdArg<MatrixCallback<Unit>>().onSuccess(Unit)
}
coEvery { deleteDevices(deviceIds, any()) } returns Unit
}
fun givenDeleteDevicesNeedsUIAuth(deviceIds: List<String>) {
@ -87,5 +84,5 @@ class FakeCryptoService(
}
}
override fun getMyDevice() = cryptoDeviceInfo
override fun getMyCryptoDevice() = cryptoDeviceInfo
}

2
vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
View File

@ -86,7 +86,7 @@ class FakeSession(
fun givenSessionId(sessionId: String?): SessionParams {
val sessionParams = mockk<SessionParams>()
every { sessionParams.deviceId } returns sessionId
every { sessionParams.deviceId } returns sessionId.orEmpty()
givenSessionParams(sessionParams)
return sessionParams
}

11
vector/src/test/java/im/vector/app/test/fakes/FakeVerificationService.kt
View File

@ -17,18 +17,13 @@
package im.vector.app.test.fakes
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.runs
import kotlinx.coroutines.flow.flow
import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
class FakeVerificationService : VerificationService by mockk() {
fun givenAddListenerSucceeds() {
every { addListener(any()) } just runs
}
fun givenRemoveListenerSucceeds() {
every { removeListener(any()) } just runs
fun givenEventFlow() {
every { requestEventFlow() } returns flow { }
}
}

2
vector/src/test/java/im/vector/app/test/fixtures/CredentialsFixture.kt vendored
View File

@ -25,7 +25,7 @@ object CredentialsFixture {
accessToken: String = "",
refreshToken: String? = null,
homeServer: String? = null,
deviceId: String? = null,
deviceId: String = "VOPOED",
discoveryInformation: DiscoveryInformation? = null,
) = Credentials(
userId,