stuff

Author: TomTasche

app/build.gradle

@@ -31,7 +31,6 @@ android {
     defaultConfig {
         applicationId "at.tomtasche.reader"
         minSdkVersion 23
-        compileSdkVersion 34
         targetSdkVersion 34
 
         testApplicationId "at.tomtasche.reader.test"

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

@@ -61,12 +61,14 @@ public class MainActivityTests {
 
     // Yes, this is ActivityTestRule instead of ActivityScenario, because ActivityScenario does not actually work.
     // Issue ID may or may not be added later.
+    // Launch activity manually to ensure complete restart between tests
     @Rule
-    public ActivityTestRule<MainActivity> mainActivityActivityTestRule = new ActivityTestRule<>(MainActivity.class);
+    public ActivityTestRule<MainActivity> mainActivityActivityTestRule = new ActivityTestRule<>(MainActivity.class, false, false);
 
     @Before
     public void setUp() {
-        MainActivity mainActivity = mainActivityActivityTestRule.getActivity();
+        // Launch a fresh activity for each test
+        MainActivity mainActivity = mainActivityActivityTestRule.launchActivity(null);
 
         m_idlingResource = mainActivity.getOpenFileIdlingResource();
         IdlingRegistry.getInstance().register(m_idlingResource);
@@ -91,8 +93,14 @@ public void tearDown() {
             IdlingRegistry.getInstance().unregister(m_idlingResource);
         }
 
-        // Ensure activity is finished to reset state between tests
-        mainActivityActivityTestRule.getActivity().finish();
+        // Finish and wait for activity to be destroyed
+        MainActivity activity = mainActivityActivityTestRule.getActivity();
+        if (activity != null) {
+            mainActivityActivityTestRule.finishActivity();
+            
+            // Use Instrumentation to wait until activity is destroyed
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        }
     }
 
     private static void copy(InputStream src, File dst) throws IOException {
@@ -135,7 +143,7 @@ public static void cleanupTestFiles() {
     }
 
     @Test
-    public void testODT() {
+    public void testXODT() {
         File testFile = s_testFiles.get("test.odt");
         Assert.assertNotNull(testFile);
         Context appCtx = InstrumentationRegistry.getInstrumentation().getTargetContext();
@@ -149,21 +157,21 @@ public void testODT() {
         );
 
         onView(allOf(withId(R.id.menu_open), withContentDescription("Open document"), isDisplayed()))
-            .perform(click());
+                .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());
+                .withFailureHandler((error, viewMatcher) -> {
+                    // fails on small screens, try again with overflow menu
+                    onView(allOf(withContentDescription("More options"), isDisplayed())).perform(click());
 
-                onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
-                        .perform(click());
-            });
+                    onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
+                            .perform(click());
+                });
     }
 
     @Test
@@ -203,19 +211,19 @@ public void testPDF() {
     public void testPasswordProtectedODT() {
         File testFile = s_testFiles.get("password-test.odt");
         Assert.assertNotNull(testFile);
-        
+
         // Check if the file exists and is readable
         Assert.assertTrue("Password test file does not exist: " + testFile.getAbsolutePath(), testFile.exists());
         Assert.assertTrue("Password test file is not readable: " + testFile.getAbsolutePath(), testFile.canRead());
-        
+
         // Log file info for debugging CI issues
         Log.d("MainActivityTests", "Password test file path: " + testFile.getAbsolutePath());
         Log.d("MainActivityTests", "Password test file size: " + testFile.length());
         Log.d("MainActivityTests", "All test files: " + s_testFiles.keySet());
-        
+
         // 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(
@@ -227,7 +235,7 @@ public void testPasswordProtectedODT() {
         );
 
         onView(allOf(withId(R.id.menu_open), withContentDescription("Open document"), isDisplayed()))
-            .perform(click());
+                .perform(click());
 
         onView(allOf(withId(android.R.id.text1), anyOf(withText("Documents"), withText("Files")), isDisplayed()))
                 .perform(click());
@@ -256,11 +264,11 @@ public void testPasswordProtectedODT() {
 
         // 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());
+                .withFailureHandler((error, viewMatcher) -> {
+                    onView(allOf(withContentDescription("More options"), isDisplayed())).perform(click());
 
-                onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
-                        .perform(click());
-            });
+                    onView(allOf(withId(R.id.menu_edit), withContentDescription("Edit document"), isDisplayed()))
+                            .perform(click());
+                });
     }
 }

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
+    id 'com.android.application' version '8.9.2' apply false
     id 'com.google.gms.google-services'version '4.4.2' apply false
     id 'com.google.firebase.crashlytics' version '3.0.2' apply false
     id 'app.opendocument.conanandroidgradleplugin' version '0.9.6' apply false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME