Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use string resource instead of hard-coded strings.

Browse source
This commit is contained in:
Benoit Marty 2024-01-08 09:50:08 +01:00
parent 6b2f79959d
commit 6798352fb7
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
View file

@ -16,17 +16,18 @@
package io.element.android.features.logout.impl package io.element.android.features.logout.impl
import androidx.compose.ui.test.hasContentDescription import androidx.activity.ComponentActivity
import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.performClick
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import io.element.android.libraries.architecture.AsyncAction import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.tests.testutils.EnsureCalledOnce import io.element.android.tests.testutils.EnsureCalledOnce
import io.element.android.tests.testutils.EnsureCalledOnceWithParam import io.element.android.tests.testutils.EnsureCalledOnceWithParam
import io.element.android.tests.testutils.EnsureNeverCalled import io.element.android.tests.testutils.EnsureNeverCalled
import io.element.android.tests.testutils.EnsureNeverCalledWithParam import io.element.android.tests.testutils.EnsureNeverCalledWithParam
import io.element.android.tests.testutils.EventsRecorder import io.element.android.tests.testutils.EventsRecorder
import io.element.android.tests.testutils.clickOn import io.element.android.tests.testutils.clickOn
import io.element.android.tests.testutils.pressBack
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@ -34,7 +35,7 @@ import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
class LogoutViewTest { class LogoutViewTest {
@get:Rule val rule = createComposeRule() @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
@Test @Test
fun `clicking on logout sends a LogoutEvents`() { fun `clicking on logout sends a LogoutEvents`() {
@ -49,7 +50,7 @@ class LogoutViewTest {
onSuccessLogout = EnsureNeverCalledWithParam(), onSuccessLogout = EnsureNeverCalledWithParam(),
) )
} }
rule.clickOn("Sign out") rule.clickOn(CommonStrings.action_signout)
eventsRecorder.assertSingle(LogoutEvents.Logout(false)) eventsRecorder.assertSingle(LogoutEvents.Logout(false))
} }
@ -67,7 +68,7 @@ class LogoutViewTest {
onSuccessLogout = EnsureNeverCalledWithParam(), onSuccessLogout = EnsureNeverCalledWithParam(),
) )
} }
rule.onNode(hasContentDescription("Back")).performClick() rule.pressBack()
callback.assertSuccess() callback.assertSuccess()
} }
@ -85,7 +86,7 @@ class LogoutViewTest {
onSuccessLogout = EnsureNeverCalledWithParam(), onSuccessLogout = EnsureNeverCalledWithParam(),
) )
} }
rule.clickOn("Sign out anyway") rule.clickOn(CommonStrings.action_signout_anyway)
eventsRecorder.assertSingle(LogoutEvents.Logout(true)) eventsRecorder.assertSingle(LogoutEvents.Logout(true))
} }
@ -103,7 +104,7 @@ class LogoutViewTest {
onSuccessLogout = EnsureNeverCalledWithParam(), onSuccessLogout = EnsureNeverCalledWithParam(),
) )
} }
rule.clickOn("Cancel") rule.clickOn(CommonStrings.action_cancel)
eventsRecorder.assertSingle(LogoutEvents.CloseDialogs) eventsRecorder.assertSingle(LogoutEvents.CloseDialogs)
} }
@ -141,7 +142,7 @@ class LogoutViewTest {
onSuccessLogout = EnsureNeverCalledWithParam(), onSuccessLogout = EnsureNeverCalledWithParam(),
) )
} }
rule.clickOn("Settings") rule.clickOn(CommonStrings.common_settings)
callback.assertSuccess() callback.assertSuccess()
} }
} }

1
tests/testutils/build.gradle.kts
View file

@ -31,6 +31,7 @@ dependencies {
implementation(libs.test.truth) implementation(libs.test.truth)
implementation(libs.coroutines.test) implementation(libs.coroutines.test)
implementation(projects.libraries.core) implementation(projects.libraries.core)
implementation(projects.libraries.uiStrings)
implementation(libs.test.turbine) implementation(libs.test.turbine)
implementation(libs.molecule.runtime) implementation(libs.molecule.runtime)
implementation(libs.androidx.compose.ui.test.junit) implementation(libs.androidx.compose.ui.test.junit)

15
tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
View file

@ -16,12 +16,23 @@
package io.element.android.tests.testutils package io.element.android.tests.testutils
import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import androidx.activity.ComponentActivity
import androidx.annotation.StringRes
import androidx.compose.ui.test.hasClickAction import androidx.compose.ui.test.hasClickAction
import androidx.compose.ui.test.hasContentDescription
import androidx.compose.ui.test.hasText import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.AndroidComposeTestRule
import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performClick
import io.element.android.libraries.ui.strings.CommonStrings
import org.junit.rules.TestRule
fun SemanticsNodeInteractionsProvider.clickOn(text: String) { fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOn(@StringRes res: Int) {
val text = activity.getString(res)
onNode(hasText(text) and hasClickAction()) onNode(hasText(text) and hasClickAction())
.performClick() .performClick()
} }
fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.pressBack() {
val text = activity.getString(CommonStrings.action_back)
onNode(hasContentDescription(text)).performClick()
}