From 7f943d37fdd1d5413c465680089737bbd04c0f13 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 18 Mar 2022 13:15:14 +0000 Subject: [PATCH] explicitly declaring the fake registrationb wizard as not relaxed and creating new test instances for each case --- .../features/onboarding/RegistrationActionHandlerTest.kt | 7 ++++--- .../im/vector/app/test/fakes/FakeRegistrationWizard.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vector/src/test/java/im/vector/app/features/onboarding/RegistrationActionHandlerTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/RegistrationActionHandlerTest.kt index 87efa0bddc..8e61c2946f 100644 --- a/vector/src/test/java/im/vector/app/features/onboarding/RegistrationActionHandlerTest.kt +++ b/vector/src/test/java/im/vector/app/features/onboarding/RegistrationActionHandlerTest.kt @@ -37,9 +37,6 @@ private val A_PID_TO_REGISTER = RegisterThreePid.Email("an email") class RegistrationActionHandlerTest { - private val fakeRegistrationWizard = FakeRegistrationWizard() - private val registrationActionHandler = RegistrationActionHandler() - @Test fun `when handling register action then delegates to wizard`() = runBlockingTest { val cases = listOf( @@ -60,6 +57,8 @@ class RegistrationActionHandlerTest { } private suspend fun testSuccessfulActionDelegation(case: Case) { + val registrationActionHandler = RegistrationActionHandler() + val fakeRegistrationWizard = FakeRegistrationWizard() fakeRegistrationWizard.givenSuccessFor(result = A_SESSION, case.expect) val result = registrationActionHandler.handleRegisterAction(fakeRegistrationWizard, case.action) @@ -71,3 +70,5 @@ class RegistrationActionHandlerTest { private fun case(action: RegisterAction, expect: suspend RegistrationWizard.() -> RegistrationResult) = Case(action, expect) private class Case(val action: RegisterAction, val expect: suspend RegistrationWizard.() -> RegistrationResult) + + diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt index 723ed4ec27..4e6e511abb 100644 --- a/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt +++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt @@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationResult import org.matrix.android.sdk.api.auth.registration.RegistrationWizard import org.matrix.android.sdk.api.session.Session -class FakeRegistrationWizard : RegistrationWizard by mockk() { +class FakeRegistrationWizard : RegistrationWizard by mockk(relaxed = false) { fun givenSuccessFor(result: Session, expect: suspend RegistrationWizard.() -> RegistrationResult) { coEvery { expect(this@FakeRegistrationWizard) } returns RegistrationResult.Success(result)