Skip to content

Commit 04e9e4d

Browse files
committed
Fix tests and lint issues
1 parent c907d04 commit 04e9e4d

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ package io.element.android.features.login.impl
1010

1111
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
1212
import com.bumble.appyx.core.modality.BuildContext
13+
import com.bumble.appyx.core.node.Node
1314
import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
1415
import com.google.common.truth.Truth.assertThat
1516
import io.element.android.features.enterprise.test.FakeEnterpriseService
1617
import io.element.android.features.login.api.LoginEntryPoint
1718
import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
19+
import io.element.android.features.login.impl.di.AuthGraph
20+
import io.element.android.libraries.architecture.AssistedNodeFactory
1821
import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
1922
import io.element.android.tests.testutils.lambda.lambdaError
2023
import io.element.android.tests.testutils.node.TestParentNode
2124
import kotlinx.coroutines.test.runTest
2225
import org.junit.Rule
2326
import org.junit.Test
27+
import kotlin.reflect.KClass
2428

2529
class DefaultLoginEntryPointTest {
2630
@get:Rule
@@ -39,6 +43,11 @@ class DefaultLoginEntryPointTest {
3943
accountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
4044
oidcActionFlow = FakeOidcActionFlow(),
4145
appCoroutineScope = backgroundScope,
46+
authGraphFactory = { object : AuthGraph {
47+
override fun nodeFactories(): Map<KClass<out Node>, AssistedNodeFactory<*>> {
48+
return emptyMap()
49+
}
50+
} }
4251
)
4352
}
4453
val callback = object : LoginEntryPoint.Callback {

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@ import io.element.android.libraries.architecture.AsyncAction
1313
import io.element.android.libraries.core.meta.BuildMeta
1414
import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
1515
import io.element.android.libraries.matrix.api.auth.external.ExternalSession
16-
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
1716
import io.element.android.libraries.matrix.test.AN_EXCEPTION
1817
import io.element.android.libraries.matrix.test.A_SESSION_ID
19-
import io.element.android.libraries.matrix.test.FakeMatrixClient
20-
import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
2118
import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
2219
import io.element.android.libraries.matrix.test.core.aBuildMeta
23-
import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
2420
import io.element.android.tests.testutils.WarmUpRule
2521
import io.element.android.tests.testutils.lambda.lambdaRecorder
2622
import io.element.android.tests.testutils.lambda.value
@@ -79,21 +75,16 @@ class CreateAccountPresenterTest {
7975
@Test
8076
fun `present - receiving a message able to be parsed change the state to success`() = runTest {
8177
val lambda = lambdaRecorder<String, ExternalSession> { _ -> anExternalSession() }
82-
val sessionVerificationService = FakeSessionVerificationService()
83-
val client = FakeMatrixClient(sessionVerificationService = sessionVerificationService)
84-
val clientProvider = FakeMatrixClientProvider(getClient = { Result.success(client) })
8578
val presenter = createPresenter(
8679
authenticationService = FakeMatrixAuthenticationService(
8780
importCreatedSessionLambda = { Result.success(A_SESSION_ID) }
8881
),
8982
messageParser = FakeMessageParser(lambda),
90-
clientProvider = clientProvider,
9183
)
9284
presenter.test {
9385
val initialState = awaitItem()
9486
initialState.eventSink(CreateAccountEvents.OnMessageReceived("aMessage"))
9587
assertThat(awaitItem().createAction.isLoading()).isTrue()
96-
sessionVerificationService.emitVerifiedStatus(SessionVerifiedStatus.Verified)
9788
assertThat(awaitItem().createAction.dataOrNull()).isEqualTo(A_SESSION_ID)
9889
}
9990
lambda.assertions().isCalledOnce().with(value("aMessage"))
@@ -120,12 +111,10 @@ class CreateAccountPresenterTest {
120111
authenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
121112
messageParser: MessageParser = FakeMessageParser(),
122113
buildMeta: BuildMeta = aBuildMeta(),
123-
clientProvider: FakeMatrixClientProvider = FakeMatrixClientProvider(),
124114
) = CreateAccountPresenter(
125115
url = url,
126116
authenticationService = authenticationService,
127117
messageParser = messageParser,
128118
buildMeta = buildMeta,
129-
clientProvider = clientProvider,
130119
)
131120
}

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnboardingViewTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class OnboardingViewTest {
225225
ensureCalledOnceWithParam(oidcDetails) { callback ->
226226
rule.setOnboardingView(
227227
state = anOnBoardingState(
228-
loginMode = AsyncData.Success(LoginMode.Oidc(oidcDetails)),
228+
loginMode = AsyncData.Success(LoginMode.Oidc(oidcDetails = oidcDetails, isAccountCreation = false)),
229229
eventSink = eventSink,
230230
),
231231
onOidcDetails = callback,

tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.lemonappdev.konsist.api.ext.list.withNameContaining
1818
import com.lemonappdev.konsist.api.ext.list.withNameEndingWith
1919
import com.lemonappdev.konsist.api.ext.list.withPackage
2020
import com.lemonappdev.konsist.api.ext.list.withoutName
21+
import com.lemonappdev.konsist.api.ext.list.withoutNameEndingWith
2122
import com.lemonappdev.konsist.api.ext.list.withoutNameStartingWith
2223
import com.lemonappdev.konsist.api.verify.assertEmpty
2324
import com.lemonappdev.konsist.api.verify.assertTrue
@@ -175,6 +176,8 @@ class KonsistClassNameTest {
175176
"Rust",
176177
"SharedPreferences",
177178
)
179+
// Exclude presenters too
180+
.withoutNameEndingWith("Presenter")
178181
.assertEmpty()
179182
}
180183
}

0 commit comments

Comments
 (0)