fix automated tests

Author: TomTasche

app/src/androidTest/java/at/tomtasche/reader/test/MainActivityTests.java

@@ -1,22 +1,5 @@
 package at.tomtasche.reader.test;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.clearText;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.intent.matcher.IntentMatchers.hasAction;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.equalTo;
-
-import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +12,6 @@
 import androidx.core.content.FileProvider;
 import androidx.test.espresso.IdlingRegistry;
 import androidx.test.espresso.IdlingResource;
-import androidx.test.espresso.intent.Intents;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -49,12 +31,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import at.tomtasche.reader.R;
+import at.tomtasche.reader.background.FileLoader;
 import at.tomtasche.reader.ui.EditActionModeCallback;
 import at.tomtasche.reader.ui.activity.MainActivity;
 import at.tomtasche.reader.ui.activity.DocumentFragment;
@@ -83,8 +66,6 @@ public void setUp() {
         // Close system dialogs which may cover our Activity.
         // Happens frequently on slow emulators.
         mainActivity.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-
-        Intents.init();
 
         // Log test setup for debugging
         Log.d("MainActivityTests", "setUp() called for test: " + getClass().getName());
@@ -93,8 +74,6 @@ public void setUp() {
     @After
     public void tearDown() {
         Log.d("MainActivityTests", "tearDown() called");
-        
-        Intents.release();
 
         if (null != m_idlingResource) {
             IdlingRegistry.getInstance().unregister(m_idlingResource);
@@ -150,78 +129,39 @@ public static void cleanupTestFiles() {
     }
 
     @Test
-    public void testODT() {
+    public void testODT() throws InterruptedException {
         File testFile = s_testFiles.get("test.odt");
         Assert.assertNotNull(testFile);
-        Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        Uri testFileUri = FileProvider.getUriForFile(appCtx, appCtx.getPackageName() + ".provider", testFile);
-        Intents.intending(hasAction(Intent.ACTION_OPEN_DOCUMENT)).respondWith(
-                new Instrumentation.ActivityResult(Activity.RESULT_OK,
-                        new Intent()
-                                .setData(testFileUri)
-                                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                )
-        );
-
-        onView(allOf(withId(R.id.menu_open), withContentDescription("Open document"), isDisplayed()))
-                .perform(click());
-
-        // The menu item could be either Documents or Files.
-        onView(allOf(withId(android.R.id.text1), anyOf(withText("Documents"), withText("Files")), isDisplayed()))
-                .perform(click());
+        MainActivity activity = mainActivityActivityTestRule.getActivity();
+        DocumentFragment documentFragment = loadDocument(activity, testFile);
 
-        // next onView will be blocked until m_idlingResource is idle.
-        onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isEnabled()))
-                .withFailureHandler((error, viewMatcher) -> {
-                    // fails on small screens, try again with overflow menu
-                    onView(allOf(withContentDescription("More options"), isDisplayed())).perform(click());
+        PageView pageView = documentFragment.getPageView();
+        Assert.assertNotNull(pageView);
+        Assert.assertTrue("ODT should load", waitForPageLoaded(pageView, 10000));
 
-                    onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
-                            .perform(click());
-                });
+        String fileType = documentFragment.getLastFileType();
+        Assert.assertNotNull(fileType);
+        Assert.assertTrue("Expected ODT file type", fileType.startsWith("application/vnd.oasis.opendocument"));
     }
 
     @Test
-    public void testPDF() {
+    public void testPDF() throws InterruptedException {
         File testFile = s_testFiles.get("dummy.pdf");
         Assert.assertNotNull(testFile);
-        Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        Uri testFileUri = FileProvider.getUriForFile(appCtx, appCtx.getPackageName() + ".provider", testFile);
-        Intents.intending(hasAction(Intent.ACTION_OPEN_DOCUMENT)).respondWith(
-                new Instrumentation.ActivityResult(Activity.RESULT_OK,
-                        new Intent()
-                                .setData(testFileUri)
-                                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                )
-        );
-
-        onView(allOf(withId(R.id.menu_open), withContentDescription("Open document"), isDisplayed()))
-            .perform(click());
-
-        // The menu item could be either Documents or Files.
-        onView(allOf(withId(android.R.id.text1), anyOf(withText("Documents"), withText("Files")), isDisplayed()))
-                .perform(click());
-
-        // next onView will be blocked until m_idlingResource is idle.
-
-        onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isEnabled()))
-            .withFailureHandler((error, viewMatcher) -> {
-                // fails on small screens, try again with overflow menu
-                onView(allOf(withContentDescription("More options"), isDisplayed())).perform(click());
+        MainActivity activity = mainActivityActivityTestRule.getActivity();
+        DocumentFragment documentFragment = loadDocument(activity, testFile);
 
-                onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
-                        .perform(click());
-            });
+        PageView pageView = documentFragment.getPageView();
+        Assert.assertNotNull(pageView);
+        Assert.assertTrue("PDF should load", waitForPageLoaded(pageView, 10000));
 
-        try {
-            Thread.sleep(10000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        String fileType = documentFragment.getLastFileType();
+        Assert.assertNotNull(fileType);
+        Assert.assertTrue("Expected PDF file type", fileType.startsWith("application/pdf"));
     }
 
     @Test
-    public void testPasswordProtectedODT() {
+    public void testPasswordProtectedODT() throws InterruptedException {
         File testFile = s_testFiles.get("password-test.odt");
         Assert.assertNotNull(testFile);
 
@@ -237,52 +177,15 @@ public void testPasswordProtectedODT() {
         // Double-check we're using the right file
         Assert.assertEquals("password-test.odt file size mismatch", 12671L, testFile.length());
 
-        Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        Uri testFileUri = FileProvider.getUriForFile(appCtx, appCtx.getPackageName() + ".provider", testFile);
-        Intents.intending(hasAction(Intent.ACTION_OPEN_DOCUMENT)).respondWith(
-                new Instrumentation.ActivityResult(Activity.RESULT_OK,
-                        new Intent()
-                                .setData(testFileUri)
-                                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                )
-        );
-
-        onView(allOf(withId(R.id.menu_open), withContentDescription("Open document"), isDisplayed()))
-                .perform(click());
-
-        onView(allOf(withId(android.R.id.text1), anyOf(withText("Documents"), withText("Files")), isDisplayed()))
-                .perform(click());
-
-        // Wait for the password dialog to appear
-        onView(withText("This document is password-protected"))
-                .check(matches(isDisplayed()));
-
-        // Enter wrong password first
-        onView(withClassName(equalTo("android.widget.EditText")))
-                .perform(typeText("wrongpassword"));
-
-        onView(withId(android.R.id.button1))
-                .perform(click());
-
-        // Should show password dialog again for wrong password
-        onView(withText("This document is password-protected"))
-                .check(matches(isDisplayed()));
-
-        // Clear the text field and enter correct password
-        onView(withClassName(equalTo("android.widget.EditText")))
-                .perform(clearText(), typeText("passwort"));
-
-        onView(withId(android.R.id.button1))
-                .perform(click());
+        MainActivity activity = mainActivityActivityTestRule.getActivity();
+        DocumentFragment documentFragment = loadDocument(activity, testFile);
 
-        // Check if edit button becomes available (indicating successful load)
-        onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isEnabled()))
-                .withFailureHandler((error, viewMatcher) -> {
-                    onView(allOf(withContentDescription("More options"), isDisplayed())).perform(click());
+        setPasswordAndReload(documentFragment, "passwort");
 
-                    onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
-                            .perform(click());
-                });
+        PageView pageView = documentFragment.getPageView();
+        Assert.assertNotNull(pageView);
+        Assert.assertTrue("Password-protected ODT should load with correct password",
+                waitForPageLoaded(pageView, 10000));
     }
 
     @Test
@@ -355,6 +258,25 @@ private boolean waitForLastResult(DocumentFragment fragment, long timeoutMs) thr
         return false;
     }
 
+    private void setPasswordAndReload(DocumentFragment documentFragment, String password) {
+        FileLoader.Result result = getLastResult(documentFragment);
+        Assert.assertNotNull(result);
+        Assert.assertNotNull(result.options);
+        result.options.password = password;
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> documentFragment.reloadUri(false));
+    }
+
+    private FileLoader.Result getLastResult(DocumentFragment documentFragment) {
+        try {
+            Field field = DocumentFragment.class.getDeclaredField("lastResult");
+            field.setAccessible(true);
+            return (FileLoader.Result) field.get(documentFragment);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            Assert.fail("Failed to access lastResult: " + e.getMessage());
+            return null;
+        }
+    }
+
     private void enterEditMode(MainActivity activity, DocumentFragment documentFragment) {
         AtomicReference<Boolean> started = new AtomicReference<>(false);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
@@ -364,27 +286,41 @@ private void enterEditMode(MainActivity activity, DocumentFragment documentFragm
         Assert.assertTrue("Failed to enter edit mode", started.get());
     }
 
-    private boolean waitForEditableState(PageView pageView, boolean expected, long timeoutMs)
-            throws InterruptedException {
+    private boolean waitForPageLoaded(PageView pageView, long timeoutMs) throws InterruptedException {
         long startMs = SystemClock.elapsedRealtime();
         while (SystemClock.elapsedRealtime() - startMs < timeoutMs) {
-            if (expected == isEditableDom(pageView)) {
+            String url = getPageViewUrl(pageView);
+            if (url != null && !url.isEmpty() && !"about:blank".equals(url)) {
                 return true;
             }
             SystemClock.sleep(250);
         }
         return false;
     }
 
-    private boolean waitForNonEditableState(PageView pageView, long timeoutMs) throws InterruptedException {
+    private String getPageViewUrl(PageView pageView) throws InterruptedException {
+        AtomicReference<String> url = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
+            url.set(pageView.getUrl());
+            latch.countDown();
+        });
+        if (!latch.await(5, TimeUnit.SECONDS)) {
+            Assert.fail("Timed out waiting for WebView URL");
+        }
+        return url.get();
+    }
+
+    private boolean waitForEditableState(PageView pageView, boolean expected, long timeoutMs)
+            throws InterruptedException {
         long startMs = SystemClock.elapsedRealtime();
         while (SystemClock.elapsedRealtime() - startMs < timeoutMs) {
-            if (isEditableDom(pageView)) {
-                return false;
+            if (expected == isEditableDom(pageView)) {
+                return true;
             }
             SystemClock.sleep(250);
         }
-        return true;
+        return false;
     }
 
     private boolean isEditableDom(PageView pageView) throws InterruptedException {