Skip to content

Commit fc1fccc

Browse files
Fixed: DownloadTest, and InitialDownloadTest which was failing on Android 35.
1 parent ba5c185 commit fc1fccc

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadTest.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import androidx.test.uiautomator.UiDevice
3838
import com.adevinta.android.barista.interaction.BaristaSleepInteractions
3939
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
4040
import com.google.android.apps.common.testing.accessibility.framework.checks.DuplicateClickableBoundsCheck
41+
import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
4142
import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator
4243
import leakcanary.LeakAssertions
4344
import org.hamcrest.Matchers.anyOf
@@ -113,8 +114,16 @@ class DownloadTest : BaseActivityTest() {
113114
)
114115
}
115116
}
116-
val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true).apply {
117-
setSuppressingResultMatcher(
117+
val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true)
118+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
119+
accessibilityValidator.setSuppressingResultMatcher(
120+
anyOf(
121+
matchesCheck(DuplicateClickableBoundsCheck::class.java),
122+
matchesCheck(SpeakableTextPresentCheck::class.java)
123+
)
124+
)
125+
} else {
126+
accessibilityValidator.setSuppressingResultMatcher(
118127
anyOf(
119128
matchesCheck(DuplicateClickableBoundsCheck::class.java)
120129
)

app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadTest.kt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.kiwix.kiwixmobile.initial.download
2020

21+
import android.os.Build
2122
import androidx.compose.ui.test.junit4.accessibility.enableAccessibilityChecks
2223
import androidx.compose.ui.test.junit4.createComposeRule
2324
import androidx.core.content.edit
@@ -30,6 +31,7 @@ import androidx.test.uiautomator.UiDevice
3031
import com.adevinta.android.barista.interaction.BaristaSleepInteractions
3132
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
3233
import com.google.android.apps.common.testing.accessibility.framework.checks.DuplicateClickableBoundsCheck
34+
import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
3335
import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator
3436
import leakcanary.LeakAssertions
3537
import org.hamcrest.Matchers.anyOf
@@ -94,8 +96,16 @@ class InitialDownloadTest : BaseActivityTest() {
9496
)
9597
}
9698
}
97-
val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true).apply {
98-
setSuppressingResultMatcher(
99+
val accessibilityValidator = AccessibilityValidator().setRunChecksFromRootView(true)
100+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
101+
accessibilityValidator.setSuppressingResultMatcher(
102+
anyOf(
103+
matchesCheck(DuplicateClickableBoundsCheck::class.java),
104+
matchesCheck(SpeakableTextPresentCheck::class.java)
105+
)
106+
)
107+
} else {
108+
accessibilityValidator.setSuppressingResultMatcher(
99109
anyOf(
100110
matchesCheck(DuplicateClickableBoundsCheck::class.java)
101111
)

0 commit comments

Comments
 (0)