Skip to content

Commit e9a898f

Browse files
bmartybmarty
committed
Cleanup
1 parent 85ff062 commit e9a898f

File tree

41 files changed

+327
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+327
-176
lines changed

‎features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AppMigration05Test {
2121
val sessionStore = InMemorySessionStore().apply {
2222
updateData(
2323
aSessionData(
24-
sessionId = A_SESSION_ID,
24+
sessionId = A_SESSION_ID.value,
2525
sessionPath = "",
2626
)
2727
)
@@ -37,7 +37,7 @@ class AppMigration05Test {
3737
val sessionStore = InMemorySessionStore().apply {
3838
updateData(
3939
aSessionData(
40-
sessionId = A_SESSION_ID,
40+
sessionId = A_SESSION_ID.value,
4141
sessionPath = "/a/path/existing",
4242
)
4343
)

‎features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AppMigration06Test {
2121
val sessionStore = InMemorySessionStore().apply {
2222
updateData(
2323
aSessionData(
24-
sessionId = A_SESSION_ID,
24+
sessionId = A_SESSION_ID.value,
2525
sessionPath = "/a/path/to/a/session/AN_ID",
2626
cachePath = "",
2727
)
@@ -38,7 +38,7 @@ class AppMigration06Test {
3838
val sessionStore = InMemorySessionStore().apply {
3939
updateData(
4040
aSessionData(
41-
sessionId = A_SESSION_ID,
41+
sessionId = A_SESSION_ID.value,
4242
cachePath = "/a/path/existing",
4343
)
4444
)

‎features/signedout/impl/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ dependencies {
3737
testImplementation(libs.test.turbine)
3838
testImplementation(projects.libraries.matrix.test)
3939
testImplementation(projects.libraries.sessionStorage.implMemory)
40+
testImplementation(projects.libraries.sessionStorage.test)
4041
testImplementation(projects.tests.testutils)
4142
}

‎features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
1616
import io.element.android.libraries.matrix.test.core.aBuildMeta
1717
import io.element.android.libraries.sessionstorage.api.SessionStore
1818
import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
19+
import io.element.android.libraries.sessionstorage.test.aSessionData
1920
import io.element.android.tests.testutils.WarmUpRule
2021
import kotlinx.coroutines.test.runTest
2122
import org.junit.Rule

‎libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
1515
import kotlinx.coroutines.sync.Mutex
1616
import kotlinx.coroutines.sync.withLock
1717
import org.matrix.rustcomponents.sdk.TimelineChange
18-
import org.matrix.rustcomponents.sdk.TimelineDiffInterface
18+
import org.matrix.rustcomponents.sdk.TimelineDiff
1919
import org.matrix.rustcomponents.sdk.TimelineItem
2020
import timber.log.Timber
2121

@@ -36,7 +36,7 @@ internal class MatrixTimelineDiffProcessor(
3636
}
3737
}
3838

39-
suspend fun postDiffs(diffs: List<TimelineDiffInterface>) {
39+
suspend fun postDiffs(diffs: List<TimelineDiff>) {
4040
updateTimelineItems {
4141
Timber.v("Update timeline items from postDiffs (with ${diffs.size} items) on ${Thread.currentThread()}")
4242
diffs.forEach { diff ->
@@ -52,7 +52,7 @@ internal class MatrixTimelineDiffProcessor(
5252
timelineItems.value = mutableTimelineItems
5353
}
5454

55-
private fun MutableList<MatrixTimelineItem>.applyDiff(diff: TimelineDiffInterface) {
55+
private fun MutableList<MatrixTimelineItem>.applyDiff(diff: TimelineDiff) {
5656
when (diff.change()) {
5757
TimelineChange.APPEND -> {
5858
val items = diff.append()?.map { it.asMatrixTimelineItem() } ?: return

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensionsKtTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ class QrLoginProgressExtensionsKtTest {
2525
.isEqualTo(QrCodeLoginStep.Finished)
2626
}
2727
}
28-
29-

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapperTest.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ import org.matrix.rustcomponents.sdk.BackupState as RustBackupState
1515
class BackupStateMapperTest {
1616
@Test
1717
fun `Ensure that mapping is correct`() {
18-
assertThat(BackupStateMapper().map(RustBackupState.UNKNOWN)).isEqualTo(BackupState.UNKNOWN)
19-
assertThat(BackupStateMapper().map(RustBackupState.CREATING)).isEqualTo(BackupState.CREATING)
20-
assertThat(BackupStateMapper().map(RustBackupState.ENABLING)).isEqualTo(BackupState.ENABLING)
21-
assertThat(BackupStateMapper().map(RustBackupState.RESUMING)).isEqualTo(BackupState.RESUMING)
22-
assertThat(BackupStateMapper().map(RustBackupState.ENABLED)).isEqualTo(BackupState.ENABLED)
23-
assertThat(BackupStateMapper().map(RustBackupState.DOWNLOADING)).isEqualTo(BackupState.DOWNLOADING)
24-
assertThat(BackupStateMapper().map(RustBackupState.DISABLING)).isEqualTo(BackupState.DISABLING)
18+
val sut = BackupStateMapper()
19+
assertThat(sut.map(RustBackupState.UNKNOWN)).isEqualTo(BackupState.UNKNOWN)
20+
assertThat(sut.map(RustBackupState.CREATING)).isEqualTo(BackupState.CREATING)
21+
assertThat(sut.map(RustBackupState.ENABLING)).isEqualTo(BackupState.ENABLING)
22+
assertThat(sut.map(RustBackupState.RESUMING)).isEqualTo(BackupState.RESUMING)
23+
assertThat(sut.map(RustBackupState.ENABLED)).isEqualTo(BackupState.ENABLED)
24+
assertThat(sut.map(RustBackupState.DOWNLOADING)).isEqualTo(BackupState.DOWNLOADING)
25+
assertThat(sut.map(RustBackupState.DISABLING)).isEqualTo(BackupState.DISABLING)
2526
}
2627
}

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapperTest.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ import org.matrix.rustcomponents.sdk.BackupUploadState as RustBackupUploadState
1515
class BackupUploadStateMapperTest {
1616
@Test
1717
fun `Ensure that mapping is correct`() {
18-
assertThat(BackupUploadStateMapper().map(RustBackupUploadState.Waiting))
18+
val sut = BackupUploadStateMapper()
19+
assertThat(sut.map(RustBackupUploadState.Waiting))
1920
.isEqualTo(BackupUploadState.Waiting)
20-
assertThat(BackupUploadStateMapper().map(RustBackupUploadState.Error))
21+
assertThat(sut.map(RustBackupUploadState.Error))
2122
.isEqualTo(BackupUploadState.Error)
22-
assertThat(BackupUploadStateMapper().map(RustBackupUploadState.Done))
23+
assertThat(sut.map(RustBackupUploadState.Done))
2324
.isEqualTo(BackupUploadState.Done)
24-
assertThat(BackupUploadStateMapper().map(RustBackupUploadState.Uploading(1.toUInt(), 2.toUInt())))
25+
assertThat(sut.map(RustBackupUploadState.Uploading(1.toUInt(), 2.toUInt())))
2526
.isEqualTo(BackupUploadState.Uploading(1, 2))
2627
}
2728

2829
@Test
2930
fun `Ensure that full uploading is mapper to Done`() {
30-
assertThat(BackupUploadStateMapper().map(RustBackupUploadState.Uploading(2.toUInt(), 2.toUInt())))
31+
val sut = BackupUploadStateMapper()
32+
assertThat(sut.map(RustBackupUploadState.Uploading(2.toUInt(), 2.toUInt())))
3133
.isEqualTo(BackupUploadState.Done)
3234
}
3335
}

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapperTest.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ import org.matrix.rustcomponents.sdk.EnableRecoveryProgress as RustEnableRecover
1515
class EnableRecoveryProgressMapperTest {
1616
@Test
1717
fun `Ensure that mapping is correct`() {
18-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.CreatingRecoveryKey))
18+
val sut = EnableRecoveryProgressMapper()
19+
assertThat(sut.map(RustEnableRecoveryProgress.CreatingRecoveryKey))
1920
.isEqualTo(EnableRecoveryProgress.CreatingRecoveryKey)
20-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.CreatingBackup))
21+
assertThat(sut.map(RustEnableRecoveryProgress.CreatingBackup))
2122
.isEqualTo(EnableRecoveryProgress.CreatingBackup)
22-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.Starting))
23+
assertThat(sut.map(RustEnableRecoveryProgress.Starting))
2324
.isEqualTo(EnableRecoveryProgress.Starting)
24-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.BackingUp(1.toUInt(), 2.toUInt())))
25+
assertThat(sut.map(RustEnableRecoveryProgress.BackingUp(1.toUInt(), 2.toUInt())))
2526
.isEqualTo(EnableRecoveryProgress.BackingUp(1, 2))
26-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.RoomKeyUploadError))
27+
assertThat(sut.map(RustEnableRecoveryProgress.RoomKeyUploadError))
2728
.isEqualTo(EnableRecoveryProgress.RoomKeyUploadError)
28-
assertThat(EnableRecoveryProgressMapper().map(RustEnableRecoveryProgress.Done("recoveryKey")))
29+
assertThat(sut.map(RustEnableRecoveryProgress.Done("recoveryKey")))
2930
.isEqualTo(EnableRecoveryProgress.Done("recoveryKey"))
3031
}
3132
}

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapperTest.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import org.matrix.rustcomponents.sdk.RecoveryState as RustRecoveryState
1515
class RecoveryStateMapperTest {
1616
@Test
1717
fun `Ensure that mapping is correct`() {
18-
assertThat(RecoveryStateMapper().map(RustRecoveryState.UNKNOWN)).isEqualTo(RecoveryState.UNKNOWN)
19-
assertThat(RecoveryStateMapper().map(RustRecoveryState.ENABLED)).isEqualTo(RecoveryState.ENABLED)
20-
assertThat(RecoveryStateMapper().map(RustRecoveryState.DISABLED)).isEqualTo(RecoveryState.DISABLED)
21-
assertThat(RecoveryStateMapper().map(RustRecoveryState.INCOMPLETE)).isEqualTo(RecoveryState.INCOMPLETE)
18+
val sut = RecoveryStateMapper()
19+
assertThat(sut.map(RustRecoveryState.UNKNOWN)).isEqualTo(RecoveryState.UNKNOWN)
20+
assertThat(sut.map(RustRecoveryState.ENABLED)).isEqualTo(RecoveryState.ENABLED)
21+
assertThat(sut.map(RustRecoveryState.DISABLED)).isEqualTo(RecoveryState.DISABLED)
22+
assertThat(sut.map(RustRecoveryState.INCOMPLETE)).isEqualTo(RecoveryState.INCOMPLETE)
2223
}
2324
}

0 commit comments

Comments
 (0)