Skip to content

Wait for the marking strip in testPDF, rather than reading it off the next line #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andiwand merged 1 commit into from
Sep 20, 2026
Merged

Wait for the marking strip in testPDF, rather than reading it off the next line #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions app/src/androidTest/java/app/opendocument/droid/test/MainActivityTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import android.app.Instrumentation
import android.content.Intent
import android.net.Uri
import android.os.SystemClock
import android.view.View
import androidx.core.content.FileProvider
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.IdlingRegistry
import androidx.test.espresso.IdlingResource
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
import androidx.test.espresso.action.ViewActions.replaceText
import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents
Expand Down Expand Up @@ -162,12 +164,17 @@ class MainActivityTests {
// is free so that the mode is worth opening
onView(withContentDescription(R.string.menu_annotate)).perform(click())

onView(withContentDescription(R.string.tool_mark_draw)).check(matches(isDisplayed()))
// the strip is waited for rather than asserted on the next line: a slow device lays it
// out after the click returns, and api 26 read it as missing
Assert.assertTrue("the marking strip should come up", awaitEditingTools())

// the highlighter, which every edition offers and a narrow screen shows without
// scrolling the strip
onView(withContentDescription(R.string.tool_mark_highlight)).check(matches(isDisplayed()))

if (!Features.advancedEditing) {
// the pen is pro's, and says so rather than arming itself
onView(withContentDescription(R.string.tool_mark_draw)).perform(click())
onView(withContentDescription(R.string.tool_mark_draw)).perform(scrollTo(), click())

awaitViewWithText(R.string.pro_offer_title)
onView(withText(R.string.pro_offer_title)).check(matches(isDisplayed()))
Expand Down Expand Up @@ -768,6 +775,23 @@ class MainActivityTests {
return false
}

/** Whether the strip of editing tools reaches the screen, which a slow device delays. */
private fun awaitEditingTools(): Boolean =
waitFor(EDIT_MODE_TIMEOUT_MS) {
// the activity is looked up first: resumedMainActivity syncs with the main thread
// itself, and nesting that inside another sync throws
val activity = resumedMainActivity()
val shown = AtomicReference(false)
if (activity != null) {
InstrumentationRegistry.getInstrumentation().runOnMainSync {
shown.set(
activity.findViewById<View>(R.id.editing_tools)?.visibility == View.VISIBLE
)
}
}
shown.get()
}

private fun enterEditMode(activity: MainActivity, documentFragment: DocumentFragment) {
val started = AtomicReference(false)
InstrumentationRegistry.getInstrumentation().runOnMainSync {
Expand Down
Loading