Cover the onStart thaw, and put robolectric.properties where Gradle looks

The freeze suite passed with the onStart thaw deleted, so the branch of it
that matters was untested: ShadowWebView's pause/resume flags are sticky, so
`onStart_thawsTheWebView_whenTheServerIsAlreadyReady` set serverReady after
stopping the activity and was served by the observer re-delivering a changed
value — the same path the test below it already covered. The case only onStart
can reach is an *unchanged* value, which LiveData does not re-deliver.

A shadow subclass records the pause/resume order, so that case now asserts
resume, pause, resume: the observer's thaw when the server first came up, the
freeze, then the thaw from onStart with serverReady untouched throughout.
Verified to fail when the onStart branch is removed.

robolectric.properties moves to src/test/resources, the source set Gradle
already puts on the test runtime classpath, so it needs no build.gradle entry.
Nothing under src/test/resources reads as a test.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: rtibblesbot

platforms/android/app/build.gradle

@@ -260,11 +260,6 @@ android {
 				exclude "tests/**"
 			}
 		}
-		test {
-			// Robolectric reads robolectric.properties off the test runtime classpath, so its
-			// configuration can live outside src/test — where it would read as a test itself.
-			resources.srcDir "robolectric"
-		}
 	}
 }
 

platforms/android/app/src/test/java/org/learningequality/Kolibri/WebViewActivityTest.java

@@ -1,8 +1,7 @@
 package org.learningequality.Kolibri;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -12,15 +11,22 @@
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowWebView;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = WebViewActivityTest.FreezeRecordingWebView.class)
 public class WebViewActivityTest {
   private static final String PAGE_URL = "http://127.0.0.1:46655/en/facility/#/data/import";
   private static final String SAME_ORIGIN_INITIALIZE_URL =
@@ -33,6 +39,7 @@ public class WebViewActivityTest {
 
   @Before
   public void setUp() {
+    FreezeRecordingWebView.freezeCalls.clear();
     controller = Robolectric.buildActivity(WebViewActivity.class).setup();
     webView = controller.get().findViewById(R.id.webview);
   }
@@ -47,21 +54,26 @@ public void tearDown() {
   }
 
   @Test
-  public void onStop_pausesTheWebView() {
+  public void onStop_freezesTheWebView() {
     controller.stop();
 
-    assertTrue(shadowOf(webView).wasOnPauseCalled());
+    assertEquals(asList("pause"), FreezeRecordingWebView.freezeCalls);
   }
 
+  /**
+   * The common case, and the one the idle stop does not reach: the app was backgrounded for less
+   * than the idle timeout, so serverReady never changed. LiveData does not re-deliver an unchanged
+   * value to an observer returning to STARTED, so onStart itself has to thaw the page — the leading
+   * resume here is the observer's, at the point the server first came up.
+   */
   @Test
-  public void onStart_thawsTheWebView_whenTheServerIsAlreadyReady() {
-    controller.stop();
-
+  public void onStart_thawsTheWebView_whenTheServerNeverWentAway() {
     KolibriServerViewModel.getInstance().setServerReady(true);
     shadowOf(Looper.getMainLooper()).idle();
-    controller.start();
 
-    assertTrue(shadowOf(webView).wasOnResumeCalled());
+    controller.stop().start();
+
+    assertEquals(asList("resume", "pause", "resume"), FreezeRecordingWebView.freezeCalls);
   }
 
   /**
@@ -71,12 +83,12 @@ public void onStart_thawsTheWebView_whenTheServerIsAlreadyReady() {
   @Test
   public void theObserver_thawsTheWebView_whenTheServerComesBackAfterTheActivityHasStarted() {
     controller.stop().start();
-    assertFalse(shadowOf(webView).wasOnResumeCalled());
+    assertEquals(asList("pause"), FreezeRecordingWebView.freezeCalls);
 
     KolibriServerViewModel.getInstance().setServerReady(true);
     shadowOf(Looper.getMainLooper()).idle();
 
-    assertTrue(shadowOf(webView).wasOnResumeCalled());
+    assertEquals(asList("pause", "resume"), FreezeRecordingWebView.freezeCalls);
   }
 
   @Test
@@ -145,4 +157,28 @@ private void failLoad(String url) {
     client.onReceivedError(webView, request, mock(WebResourceError.class));
     client.onPageFinished(webView, url);
   }
+
+  /**
+   * ShadowWebView's pause/resume flags are sticky, so they cannot tell a thaw that happened before
+   * the freeze from one that happened after — which is the whole question for the onStart gate.
+   * Record the order instead.
+   */
+  @Implements(WebView.class)
+  public static class FreezeRecordingWebView extends ShadowWebView {
+    static final List<String> freezeCalls = new ArrayList<>();
+
+    @Implementation
+    @Override
+    protected void onPause() {
+      super.onPause();
+      freezeCalls.add("pause");
+    }
+
+    @Implementation
+    @Override
+    protected void onResume() {
+      super.onResume();
+      freezeCalls.add("resume");
+    }
+  }
 }

…d/app/robolectric/robolectric.properties …rc/test/resources/robolectric.propertiesplatforms/android/app/robolectric/robolectric.properties renamed to platforms/android/app/src/test/resources/robolectric.properties platforms/android/app/robolectric/robolectric.properties renamed to platforms/android/app/src/test/resources/robolectric.properties

@@ -1,4 +1,3 @@
-# Robolectric configuration for the JVM unit tests, not a test itself.
 # includeAndroidResources makes Robolectric honour android:name=".App" from the merged manifest,
 # and App.onCreate calls Python.start(...), which throws UnsatisfiedLinkError on the JVM.
 application=android.app.Application