Skip to content

Commit 390e5cf

Browse files
bmartybmarty
authored
Rename classes overriding classes from the FFI layer. (#4817)
* Rename classes overriding classes from the FFI layer. * For other Konsist test.
1 parent 0953789 commit 390e5cf

Some content is hidden

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

43 files changed

+155
-143
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
package io.element.android.libraries.matrix.impl
99

10-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustClientBuilder
10+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClientBuilder
1111
import org.matrix.rustcomponents.sdk.ClientBuilder
1212

1313
class FakeClientBuilderProvider : ClientBuilderProvider {
1414
override fun provide(): ClientBuilder {
15-
return FakeRustClientBuilder()
15+
return FakeFfiClientBuilder()
1616
}
1717
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package io.element.android.libraries.matrix.impl
99

1010
import com.google.common.truth.Truth.assertThat
1111
import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
12-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustClient
13-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustSyncService
12+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClient
13+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSyncService
1414
import io.element.android.libraries.matrix.impl.room.FakeTimelineEventTypeFilterFactory
1515
import io.element.android.libraries.matrix.test.A_DEVICE_ID
1616
import io.element.android.libraries.matrix.test.A_USER_ID
@@ -40,7 +40,7 @@ class RustMatrixClientTest {
4040
val clearCachesResult = lambdaRecorder<Unit> { }
4141
val closeResult = lambdaRecorder<Unit> { }
4242
val client = createRustMatrixClient(
43-
client = FakeRustClient(
43+
client = FakeFfiClient(
4444
clearCachesResult = clearCachesResult,
4545
closeResult = closeResult,
4646
)
@@ -52,7 +52,7 @@ class RustMatrixClientTest {
5252
}
5353

5454
private fun TestScope.createRustMatrixClient(
55-
client: Client = FakeRustClient(),
55+
client: Client = FakeFfiClient(),
5656
sessionStore: SessionStore = InMemorySessionStore(),
5757
) = RustMatrixClient(
5858
innerClient = client,
@@ -62,7 +62,7 @@ class RustMatrixClientTest {
6262
sessionDelegate = aRustClientSessionDelegate(
6363
sessionStore = sessionStore,
6464
),
65-
innerSyncService = FakeRustSyncService(),
65+
innerSyncService = FakeFfiSyncService(),
6666
dispatchers = testCoroutineDispatchers(),
6767
baseCacheDirectory = File(""),
6868
clock = FakeSystemClock(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ package io.element.android.libraries.matrix.impl.auth
99

1010
import com.google.common.truth.Truth.assertThat
1111
import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
12-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustHomeserverLoginDetails
12+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiHomeserverLoginDetails
1313
import org.junit.Test
1414

1515
class HomeserverDetailsKtTest {
1616
@Test
1717
fun `map should be correct`() {
1818
// Given
19-
val homeserverLoginDetails = FakeRustHomeserverLoginDetails(
19+
val homeserverLoginDetails = FakeFfiHomeserverLoginDetails(
2020
url = "https://example.org",
2121
supportsPasswordLogin = true,
2222
supportsOidcLogin = false

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
package io.element.android.libraries.matrix.impl.auth.qrlogin
99

1010
import com.google.common.truth.Truth.assertThat
11-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeQrCodeData
11+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiQrCodeData
1212
import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
1313
import org.junit.Test
1414

1515
class SdkQrCodeLoginDataTest {
1616
@Test
1717
fun `getServer reads the value from the Rust side, null case`() {
1818
val sut = SdkQrCodeLoginData(
19-
rustQrCodeData = FakeQrCodeData(
19+
rustQrCodeData = FakeFfiQrCodeData(
2020
serverNameResult = { null },
2121
),
2222
)
@@ -26,7 +26,7 @@ class SdkQrCodeLoginDataTest {
2626
@Test
2727
fun `getServer reads the value from the Rust side`() {
2828
val sut = SdkQrCodeLoginData(
29-
rustQrCodeData = FakeQrCodeData(
29+
rustQrCodeData = FakeFfiQrCodeData(
3030
serverNameResult = { A_HOMESERVER_URL },
3131
),
3232
)

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package io.element.android.libraries.matrix.impl.fixtures.factories
99

10-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustLazyTimelineItemProvider
10+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiLazyTimelineItemProvider
1111
import io.element.android.libraries.matrix.test.AN_EVENT_ID
1212
import io.element.android.libraries.matrix.test.A_USER_ID
1313
import org.matrix.rustcomponents.sdk.EventOrTransactionId
@@ -50,7 +50,7 @@ fun aRustEventTimelineItem(
5050
readReceipts = readReceipts,
5151
origin = origin,
5252
localCreatedAt = localCreatedAt,
53-
lazyProvider = FakeRustLazyTimelineItemProvider(
53+
lazyProvider = FakeFfiLazyTimelineItemProvider(
5454
debugInfo = debugInfo,
5555
shieldsState = shieldsState,
5656
)

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package io.element.android.libraries.matrix.impl.fixtures.factories
99

1010
import io.element.android.libraries.matrix.api.core.ThreadId
11-
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustTimelineEvent
11+
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEvent
1212
import io.element.android.libraries.matrix.test.A_ROOM_NAME
1313
import io.element.android.libraries.matrix.test.A_USER_NAME
1414
import org.matrix.rustcomponents.sdk.JoinRule
@@ -65,7 +65,7 @@ fun aRustNotificationRoomInfo(
6565
)
6666

6767
fun aRustNotificationEventTimeline(
68-
event: TimelineEvent = FakeRustTimelineEvent(),
68+
event: TimelineEvent = FakeFfiTimelineEvent(),
6969
) = NotificationEvent.Timeline(
7070
event = event,
7171
)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClient.kt renamed to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ import org.matrix.rustcomponents.sdk.TaskHandle
3030
import org.matrix.rustcomponents.sdk.UnableToDecryptDelegate
3131
import org.matrix.rustcomponents.sdk.UserProfile
3232

33-
class FakeRustClient(
33+
class FakeFfiClient(
3434
private val userId: String = A_USER_ID.value,
3535
private val deviceId: String = A_DEVICE_ID.value,
36-
private val notificationClient: NotificationClient = FakeRustNotificationClient(),
37-
private val notificationSettings: NotificationSettings = FakeRustNotificationSettings(),
38-
private val encryption: Encryption = FakeRustEncryption(),
36+
private val notificationClient: NotificationClient = FakeFfiNotificationClient(),
37+
private val notificationSettings: NotificationSettings = FakeFfiNotificationSettings(),
38+
private val encryption: Encryption = FakeFfiEncryption(),
3939
private val session: Session = aRustSession(),
4040
private val clearCachesResult: () -> Unit = { lambdaError() },
4141
private val withUtdHook: (UnableToDecryptDelegate) -> Unit = { lambdaError() },
@@ -47,11 +47,11 @@ class FakeRustClient(
4747
override suspend fun getNotificationSettings(): NotificationSettings = notificationSettings
4848
override fun encryption(): Encryption = encryption
4949
override fun session(): Session = session
50-
override fun setDelegate(delegate: ClientDelegate?): TaskHandle = FakeRustTaskHandle()
50+
override fun setDelegate(delegate: ClientDelegate?): TaskHandle = FakeFfiTaskHandle()
5151
override suspend fun cachedAvatarUrl(): String? = null
5252
override suspend fun restoreSession(session: Session) = Unit
53-
override fun syncService(): SyncServiceBuilder = FakeRustSyncServiceBuilder()
54-
override fun roomDirectorySearch(): RoomDirectorySearch = FakeRustRoomDirectorySearch()
53+
override fun syncService(): SyncServiceBuilder = FakeFfiSyncServiceBuilder()
54+
override fun roomDirectorySearch(): RoomDirectorySearch = FakeFfiRoomDirectorySearch()
5555
override suspend fun setPusher(
5656
identifiers: PusherIdentifiers,
5757
kind: PusherKind,
@@ -64,12 +64,12 @@ class FakeRustClient(
6464
override suspend fun deletePusher(identifiers: PusherIdentifiers) = Unit
6565
override suspend fun clearCaches() = simulateLongTask { clearCachesResult() }
6666
override suspend fun setUtdDelegate(utdDelegate: UnableToDecryptDelegate) = withUtdHook(utdDelegate)
67-
override suspend fun getSessionVerificationController(): SessionVerificationController = FakeRustSessionVerificationController()
67+
override suspend fun getSessionVerificationController(): SessionVerificationController = FakeFfiSessionVerificationController()
6868
override suspend fun ignoredUsers(): List<String> {
6969
return emptyList()
7070
}
7171
override fun subscribeToIgnoredUsers(listener: IgnoredUsersListener): TaskHandle {
72-
return FakeRustTaskHandle()
72+
return FakeFfiTaskHandle()
7373
}
7474

7575
override suspend fun getProfile(userId: String): UserProfile {

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClientBuilder.kt renamed to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import uniffi.matrix_sdk.BackupDownloadStrategy
2020
import uniffi.matrix_sdk_crypto.CollectStrategy
2121
import uniffi.matrix_sdk_crypto.TrustRequirement
2222

23-
class FakeRustClientBuilder : ClientBuilder(NoPointer) {
23+
class FakeFfiClientBuilder : ClientBuilder(NoPointer) {
2424
override fun addRootCertificates(certificates: List<ByteArray>) = this
2525
override fun autoEnableBackups(autoEnableBackups: Boolean) = this
2626
override fun autoEnableCrossSigning(autoEnableCrossSigning: Boolean) = this
@@ -43,10 +43,10 @@ class FakeRustClientBuilder : ClientBuilder(NoPointer) {
4343
override fun username(username: String) = this
4444

4545
override suspend fun buildWithQrCode(qrCodeData: QrCodeData, oidcConfiguration: OidcConfiguration, progressListener: QrLoginProgressListener): Client {
46-
return FakeRustClient()
46+
return FakeFfiClient()
4747
}
4848

4949
override suspend fun build(): Client {
50-
return FakeRustClient(withUtdHook = {})
50+
return FakeFfiClient(withUtdHook = {})
5151
}
5252
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustEncryption.kt renamed to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiEncryption.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import org.matrix.rustcomponents.sdk.RecoveryStateListener
1717
import org.matrix.rustcomponents.sdk.TaskHandle
1818
import org.matrix.rustcomponents.sdk.VerificationStateListener
1919

20-
class FakeRustEncryption : Encryption(NoPointer) {
20+
class FakeFfiEncryption : Encryption(NoPointer) {
2121
override fun verificationStateListener(listener: VerificationStateListener): TaskHandle {
22-
return FakeRustTaskHandle()
22+
return FakeFfiTaskHandle()
2323
}
2424

2525
override fun recoveryStateListener(listener: RecoveryStateListener): TaskHandle {
26-
return FakeRustTaskHandle()
26+
return FakeFfiTaskHandle()
2727
}
2828

2929
override suspend fun waitForE2eeInitializationTasks() = simulateLongTask {}
@@ -41,6 +41,6 @@ class FakeRustEncryption : Encryption(NoPointer) {
4141
}
4242

4343
override fun backupStateListener(listener: BackupStateListener): TaskHandle {
44-
return FakeRustTaskHandle()
44+
return FakeFfiTaskHandle()
4545
}
4646
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustHomeserverLoginDetails.kt renamed to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverLoginDetails.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.impl.fixtures.fakes
1010
import org.matrix.rustcomponents.sdk.HomeserverLoginDetails
1111
import org.matrix.rustcomponents.sdk.NoPointer
1212

13-
class FakeRustHomeserverLoginDetails(
13+
class FakeFfiHomeserverLoginDetails(
1414
private val url: String = "https://example.org",
1515
private val supportsPasswordLogin: Boolean = true,
1616
private val supportsOidcLogin: Boolean = false

0 commit comments

Comments
 (0)