Bug 1830080 Add more careful handling of preview-collection in maybeFetchExperiments

app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt

@@ -109,12 +109,11 @@ fun NimbusInterface.maybeFetchExperiments(
     feature: NimbusSystem = FxNimbusMessaging.features.nimbusSystem.value(),
     currentTimeMillis: Long = System.currentTimeMillis(),
 ) {
-    val minimumPeriodMinutes = if (!context.settings().nimbusUsePreview) {
+    if (context.settings().nimbusUsePreview) {
-        feature.refreshIntervalForeground
+        context.settings().nimbusLastFetchTime = 0L
+        fetchExperiments()
     } else {
-        0
+        val minimumPeriodMinutes = feature.refreshIntervalForeground
-    }
-
         val lastFetchTimeMillis = context.settings().nimbusLastFetchTime
         val minimumPeriodMillis = minimumPeriodMinutes * Settings.ONE_MINUTE_MS
 
@@ -123,3 +122,4 @@ fun NimbusInterface.maybeFetchExperiments(
             fetchExperiments()
         }
     }
+}

app/src/test/java/org/mozilla/fenix/nimbus/NimbusSystemTest.kt

@@ -100,4 +100,65 @@ class NimbusSystemTest {
         )
         assertTrue(nimbus.isFetching)
     }
+
+    @Test
+    fun `GIVEN a nimbus object calling maybeFetchExperiments WHEN using a preview collection THEN always call fetchExperiments`() {
+        var currentTime = 0L
+        fun assertFetchEveryTime() {
+            nimbus.maybeFetchExperiments(
+                context,
+                config,
+                currentTime,
+            )
+            assertTrue(nimbus.isFetching)
+            assertEquals(lastTimeSlot.captured, 0L)
+            nimbus.isFetching = false
+        }
+
+        // Using usePreview, we call fetch every time we call maybeFetch.
+        every { settings.nimbusUsePreview } returns true
+        currentTime = Settings.ONE_HOUR_MS
+        assertFetchEveryTime()
+
+        currentTime += Settings.ONE_MINUTE_MS
+        assertFetchEveryTime()
+
+        currentTime += Settings.ONE_MINUTE_MS
+        assertFetchEveryTime()
+
+        // Now turn preview collection off.
+        // We should fetch exactly once…
+        every { settings.nimbusUsePreview } returns false
+
+        currentTime += Settings.ONE_MINUTE_MS
+        nimbus.maybeFetchExperiments(
+            context,
+            config,
+            currentTime,
+        )
+        assertTrue(nimbus.isFetching)
+        assertEquals(lastTimeSlot.captured, currentTime)
+        nimbus.isFetching = false
+        every { settings.nimbusLastFetchTime } returns currentTime
+
+        // … and then back off. We show here that the next call to maybeFetch
+        // doesn't call fetch.
+        currentTime += Settings.ONE_MINUTE_MS
+        nimbus.maybeFetchExperiments(
+            context,
+            config,
+            currentTime,
+        )
+        assertFalse(nimbus.isFetching)
+
+        // Now wait, another hour, and we've reset the behaviour back to normal operation.
+        currentTime += Settings.ONE_HOUR_MS + Settings.ONE_MINUTE_MS
+        nimbus.maybeFetchExperiments(
+            context,
+            config,
+            currentTime,
+        )
+        assertTrue(nimbus.isFetching)
+        assertEquals(lastTimeSlot.captured, currentTime)
+    }
 }