Skip to content

Commit 2c96fb8

Browse files
bmartybmarty
authored
Cleanup testImplementation dependencies (#4790)
1 parent 6b82e62 commit 2c96fb8

File tree

25 files changed

+409
-93
lines changed

25 files changed

+409
-93
lines changed

‎appnav/build.gradle.kts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,13 @@ dependencies {
5555
testImplementation(libs.test.turbine)
5656
testImplementation(projects.features.login.test)
5757
testImplementation(projects.libraries.matrix.test)
58-
testImplementation(projects.libraries.oidc.impl)
58+
testImplementation(projects.libraries.oidc.test)
5959
testImplementation(projects.libraries.preferences.test)
6060
testImplementation(projects.libraries.push.test)
6161
testImplementation(projects.libraries.pushproviders.test)
6262
testImplementation(projects.features.networkmonitor.test)
63-
testImplementation(projects.features.login.impl)
6463
testImplementation(projects.tests.testutils)
6564
testImplementation(projects.features.rageshake.test)
66-
testImplementation(projects.features.rageshake.impl)
6765
testImplementation(projects.features.share.test)
6866
testImplementation(projects.services.appnavstate.test)
6967
testImplementation(projects.services.analytics.test)

‎appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt‎

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
2222
import io.element.android.libraries.matrix.test.A_ROOM_ID
2323
import io.element.android.libraries.matrix.test.A_SESSION_ID
2424
import io.element.android.libraries.matrix.test.A_THREAD_ID
25-
import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
2625
import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
2726
import io.element.android.libraries.oidc.api.OidcAction
28-
import io.element.android.libraries.oidc.impl.DefaultOidcIntentResolver
29-
import io.element.android.libraries.oidc.impl.DefaultOidcUrlParser
27+
import io.element.android.libraries.oidc.test.FakeOidcIntentResolver
3028
import io.element.android.tests.testutils.lambda.lambdaError
31-
import org.junit.Assert.assertThrows
3229
import org.junit.Test
3330
import org.junit.runner.RunWith
3431
import org.robolectric.RobolectricTestRunner
@@ -118,8 +115,10 @@ class IntentResolverTest {
118115
}
119116

120117
@Test
121-
fun `test resolve oidc go back`() {
122-
val sut = createIntentResolver()
118+
fun `test resolve oidc`() {
119+
val sut = createIntentResolver(
120+
oidcIntentResolverResult = { OidcAction.GoBack },
121+
)
123122
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
124123
action = Intent.ACTION_VIEW
125124
data = "io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO".toUri()
@@ -132,43 +131,15 @@ class IntentResolverTest {
132131
)
133132
}
134133

135-
@Test
136-
fun `test resolve oidc success`() {
137-
val sut = createIntentResolver()
138-
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
139-
action = Intent.ACTION_VIEW
140-
data = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB".toUri()
141-
}
142-
val result = sut.resolve(intent)
143-
assertThat(result).isEqualTo(
144-
ResolvedIntent.Oidc(
145-
oidcAction = OidcAction.Success(
146-
url = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
147-
)
148-
)
149-
)
150-
}
151-
152-
@Test
153-
fun `test resolve oidc invalid`() {
154-
val sut = createIntentResolver()
155-
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
156-
action = Intent.ACTION_VIEW
157-
data = "io.element.android:/invalid".toUri()
158-
}
159-
assertThrows(IllegalStateException::class.java) {
160-
sut.resolve(intent)
161-
}
162-
}
163-
164134
@Test
165135
fun `test resolve external permalink`() {
166136
val permalinkData = PermalinkData.UserLink(
167137
userId = UserId("@alice:matrix.org")
168138
)
169139
val sut = createIntentResolver(
170140
loginIntentResolverResult = { null },
171-
permalinkParserResult = { permalinkData }
141+
permalinkParserResult = { permalinkData },
142+
oidcIntentResolverResult = { null },
172143
)
173144
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
174145
action = Intent.ACTION_VIEW
@@ -187,6 +158,7 @@ class IntentResolverTest {
187158
val sut = createIntentResolver(
188159
permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
189160
loginIntentResolverResult = { null },
161+
oidcIntentResolverResult = { null },
190162
)
191163
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
192164
action = Intent.ACTION_VIEW
@@ -202,7 +174,8 @@ class IntentResolverTest {
202174
userId = UserId("@alice:matrix.org")
203175
)
204176
val sut = createIntentResolver(
205-
permalinkParserResult = { permalinkData }
177+
permalinkParserResult = { permalinkData },
178+
oidcIntentResolverResult = { null },
206179
)
207180
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
208181
action = Intent.ACTION_BATTERY_LOW
@@ -214,7 +187,9 @@ class IntentResolverTest {
214187

215188
@Test
216189
fun `test incoming share simple`() {
217-
val sut = createIntentResolver()
190+
val sut = createIntentResolver(
191+
oidcIntentResolverResult = { null },
192+
)
218193
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
219194
action = Intent.ACTION_SEND
220195
}
@@ -224,7 +199,9 @@ class IntentResolverTest {
224199

225200
@Test
226201
fun `test incoming share multiple`() {
227-
val sut = createIntentResolver()
202+
val sut = createIntentResolver(
203+
oidcIntentResolverResult = { null },
204+
)
228205
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
229206
action = Intent.ACTION_SEND_MULTIPLE
230207
}
@@ -237,6 +214,7 @@ class IntentResolverTest {
237214
val sut = createIntentResolver(
238215
permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
239216
loginIntentResolverResult = { null },
217+
oidcIntentResolverResult = { null },
240218
)
241219
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
242220
action = Intent.ACTION_VIEW
@@ -251,6 +229,7 @@ class IntentResolverTest {
251229
val aLoginParams = LoginParams("accountProvider", null)
252230
val sut = createIntentResolver(
253231
loginIntentResolverResult = { aLoginParams },
232+
oidcIntentResolverResult = { null },
254233
)
255234
val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
256235
action = Intent.ACTION_VIEW
@@ -263,16 +242,15 @@ class IntentResolverTest {
263242
private fun createIntentResolver(
264243
permalinkParserResult: (String) -> PermalinkData = { lambdaError() },
265244
loginIntentResolverResult: (String) -> LoginParams? = { lambdaError() },
245+
oidcIntentResolverResult: (Intent) -> OidcAction? = { lambdaError() },
266246
): IntentResolver {
267247
return IntentResolver(
268248
deeplinkParser = DeeplinkParser(),
269249
loginIntentResolver = FakeLoginIntentResolver(
270250
parseResult = loginIntentResolverResult,
271251
),
272-
oidcIntentResolver = DefaultOidcIntentResolver(
273-
oidcUrlParser = DefaultOidcUrlParser(
274-
oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
275-
)
252+
oidcIntentResolver = FakeOidcIntentResolver(
253+
resolveResult = oidcIntentResolverResult,
276254
),
277255
permalinkParser = FakePermalinkParser(
278256
result = permalinkParserResult

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
testImplementation(projects.libraries.matrix.test)
5858
testImplementation(projects.services.analytics.test)
5959
testImplementation(projects.services.analytics.noop)
60-
testImplementation(projects.libraries.permissions.impl)
6160
testImplementation(projects.libraries.permissions.test)
6261
testImplementation(projects.libraries.preferences.test)
6362
testImplementation(projects.features.lockscreen.test)

‎features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import io.element.android.libraries.matrix.api.verification.SessionVerificationS
1919
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
2020
import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
2121
import io.element.android.libraries.permissions.api.PermissionStateProvider
22-
import io.element.android.libraries.permissions.impl.FakePermissionStateProvider
22+
import io.element.android.libraries.permissions.test.FakePermissionStateProvider
2323
import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
2424
import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
2525
import io.element.android.services.analytics.api.AnalyticsService

‎features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import app.cash.turbine.test
1414
import com.google.common.truth.Truth.assertThat
1515
import io.element.android.libraries.permissions.api.PermissionStateProvider
1616
import io.element.android.libraries.permissions.api.PermissionsPresenter
17-
import io.element.android.libraries.permissions.impl.FakePermissionStateProvider
17+
import io.element.android.libraries.permissions.test.FakePermissionStateProvider
1818
import io.element.android.libraries.permissions.test.FakePermissionsPresenter
1919
import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
2020
import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependencies {
6262
testImplementation(projects.features.enterprise.test)
6363
testImplementation(projects.libraries.featureflag.test)
6464
testImplementation(projects.libraries.matrix.test)
65-
testImplementation(projects.libraries.oidc.impl)
65+
testImplementation(projects.libraries.oidc.test)
6666
testImplementation(projects.libraries.permissions.test)
6767
testImplementation(projects.tests.testutils)
6868
testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

‎features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.A_THROWABLE
2828
import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
2929
import io.element.android.libraries.oidc.api.OidcAction
3030
import io.element.android.libraries.oidc.api.OidcActionFlow
31-
import io.element.android.libraries.oidc.impl.customtab.DefaultOidcActionFlow
31+
import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
3232
import io.element.android.tests.testutils.WarmUpRule
3333
import io.element.android.tests.testutils.waitForPredicate
3434
import kotlinx.coroutines.test.runTest
@@ -100,7 +100,7 @@ class ConfirmAccountProviderPresenterTest {
100100
@Test
101101
fun `present - oidc - cancel with failure`() = runTest {
102102
val authenticationService = FakeMatrixAuthenticationService()
103-
val defaultOidcActionFlow = DefaultOidcActionFlow()
103+
val defaultOidcActionFlow = FakeOidcActionFlow()
104104
val presenter = createConfirmAccountProviderPresenter(
105105
matrixAuthenticationService = authenticationService,
106106
defaultOidcActionFlow = defaultOidcActionFlow,
@@ -128,7 +128,7 @@ class ConfirmAccountProviderPresenterTest {
128128
@Test
129129
fun `present - oidc - cancel with success`() = runTest {
130130
val authenticationService = FakeMatrixAuthenticationService()
131-
val defaultOidcActionFlow = DefaultOidcActionFlow()
131+
val defaultOidcActionFlow = FakeOidcActionFlow()
132132
val presenter = createConfirmAccountProviderPresenter(
133133
matrixAuthenticationService = authenticationService,
134134
defaultOidcActionFlow = defaultOidcActionFlow,
@@ -155,7 +155,7 @@ class ConfirmAccountProviderPresenterTest {
155155
@Test
156156
fun `present - oidc - success with failure`() = runTest {
157157
val authenticationService = FakeMatrixAuthenticationService()
158-
val defaultOidcActionFlow = DefaultOidcActionFlow()
158+
val defaultOidcActionFlow = FakeOidcActionFlow()
159159
val presenter = createConfirmAccountProviderPresenter(
160160
matrixAuthenticationService = authenticationService,
161161
defaultOidcActionFlow = defaultOidcActionFlow,
@@ -185,7 +185,7 @@ class ConfirmAccountProviderPresenterTest {
185185
@Test
186186
fun `present - oidc - success with success`() = runTest {
187187
val authenticationService = FakeMatrixAuthenticationService()
188-
val defaultOidcActionFlow = DefaultOidcActionFlow()
188+
val defaultOidcActionFlow = FakeOidcActionFlow()
189189
val defaultLoginUserStory = DefaultLoginUserStory().apply {
190190
setLoginFlowIsDone(false)
191191
}
@@ -356,7 +356,7 @@ class ConfirmAccountProviderPresenterTest {
356356
params: ConfirmAccountProviderPresenter.Params = ConfirmAccountProviderPresenter.Params(isAccountCreation = false),
357357
accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
358358
matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
359-
defaultOidcActionFlow: OidcActionFlow = DefaultOidcActionFlow(),
359+
defaultOidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
360360
defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
361361
webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),
362362
) = ConfirmAccountProviderPresenter(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.test.A_THROWABLE
3030
import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
3131
import io.element.android.libraries.matrix.test.core.aBuildMeta
3232
import io.element.android.libraries.oidc.api.OidcActionFlow
33-
import io.element.android.libraries.oidc.impl.customtab.DefaultOidcActionFlow
33+
import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
3434
import io.element.android.tests.testutils.WarmUpRule
3535
import io.element.android.tests.testutils.test
3636
import kotlinx.coroutines.test.runTest
@@ -226,7 +226,7 @@ private fun createPresenter(
226226
)
227227

228228
fun createLoginHelper(
229-
oidcActionFlow: OidcActionFlow = DefaultOidcActionFlow(),
229+
oidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
230230
authenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
231231
defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
232232
webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ dependencies {
9393
testImplementation(libs.test.mockk)
9494
testImplementation(libs.test.robolectric)
9595
testImplementation(projects.features.poll.test)
96-
testImplementation(projects.features.poll.impl)
9796
testImplementation(libs.androidx.compose.ui.test.junit)
9897
testImplementation(projects.libraries.eventformatter.test)
9998
testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,11 @@ dependencies {
107107
testImplementation(projects.features.ftue.test)
108108
testImplementation(projects.features.invite.test)
109109
testImplementation(projects.features.rageshake.test)
110-
testImplementation(projects.features.rageshake.impl)
111110
testImplementation(projects.features.logout.test)
112-
testImplementation(projects.libraries.indicator.impl)
111+
testImplementation(projects.libraries.indicator.test)
113112
testImplementation(projects.libraries.pushproviders.test)
114-
testImplementation(projects.features.logout.impl)
115113
testImplementation(projects.services.analytics.test)
116114
testImplementation(projects.services.toolbox.test)
117-
testImplementation(projects.features.analytics.impl)
118115
testImplementation(projects.tests.testutils)
119116
testImplementation(libs.androidx.compose.ui.test.junit)
120117
testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

0 commit comments

Comments
 (0)