Update test and nit changes.

Author: tusharkhandelwal8

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigAutoFetch.java

@@ -79,13 +79,14 @@ public ConfigAutoFetch(
     this.random = new Random();
     this.isInBackground = false;
     this.sharedPrefsClient = sharedPrefsClient;
-    clock = DefaultClock.getInstance();
+    this.clock = DefaultClock.getInstance();
   }
 
   // Increase the backoff duration with a new end time based on Retry Interval
-  private synchronized void updateBackoffMetadataWithRetryInterval(int realtimeRetryInterval) {
+  private synchronized void updateBackoffMetadataWithRetryInterval(
+      int realtimeRetryIntervalInSeconds) {
     Date currentTime = new Date(clock.currentTimeMillis());
-    long backoffDurationInMillis = realtimeRetryInterval * 1000L;
+    long backoffDurationInMillis = realtimeRetryIntervalInSeconds * 1000L;
     Date backoffEndTime = new Date(currentTime.getTime() + backoffDurationInMillis);
 
     // Persist the new values to disk-backed metadata.
@@ -215,8 +216,8 @@ private void handleNotifications(InputStream inputStream) throws IOException {
           // backoff duration without affecting the number of retries, so it will not enter an
           // exponential backoff state.
           if (jsonObject.has(REALTIME_RETRY_INTERVAL)) {
-            int realtimeRetryInterval = jsonObject.getInt(REALTIME_RETRY_INTERVAL);
-            updateBackoffMetadataWithRetryInterval(realtimeRetryInterval);
+            int realtimeRetryIntervalInSeconds = jsonObject.getInt(REALTIME_RETRY_INTERVAL);
+            updateBackoffMetadataWithRetryInterval(realtimeRetryIntervalInSeconds);
           }
         } catch (JSONException ex) {
           // Message was mangled up and so it was unable to be parsed. User is notified of this

firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java

@@ -50,6 +50,8 @@
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.common.util.Clock;
+import com.google.android.gms.common.util.DefaultClock;
 import com.google.android.gms.shadows.common.internal.ShadowPreconditions;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -104,6 +106,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -200,6 +203,7 @@ public final class FirebaseRemoteConfigTest {
 
   private final ScheduledExecutorService scheduledExecutorService =
       Executors.newSingleThreadScheduledExecutor();
+  private final Clock clock = DefaultClock.getInstance();
 
   @Before
   public void setUp() throws Exception {
@@ -1556,18 +1560,28 @@ public void realtimeStreamListen_andUnableToParseMessage() throws Exception {
   public void realtime_updatesBackoffMetadataWithProvidedRetryInterval() throws Exception {
     ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
     when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
-    int expectedRetryInterval = 240;
+    int expectedRetryIntervalInSeconds = 240;
     when(mockHttpURLConnection.getInputStream())
         .thenReturn(
             new ByteArrayInputStream(
                 String.format(
                         "{ \"latestTemplateVersionNumber\": 1, \"retryIntervalSeconds\": %d }",
-                        expectedRetryInterval)
+                        expectedRetryIntervalInSeconds)
                     .getBytes(StandardCharsets.UTF_8)));
     when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
     configAutoFetch.listenForNotifications();
 
-    verify(sharedPrefsClient, times(1)).setRealtimeBackoffEndTime(any());
+    ArgumentMatcher<Date> backoffEndTimeWithinTolerance =
+        argument -> {
+          Date currentTime = new Date(clock.currentTimeMillis());
+          long backoffDurationInMillis = expectedRetryIntervalInSeconds * 1000L;
+          Date expectedBackoffEndTime = new Date(currentTime.getTime() + backoffDurationInMillis);
+          return Math.abs(argument.getTime() - expectedBackoffEndTime.getTime())
+              <= TimeUnit.SECONDS.toSeconds(1);
+        };
+
+    verify(sharedPrefsClient, times(1))
+        .setRealtimeBackoffEndTime(argThat(backoffEndTimeWithinTolerance));
   }
 
   @Test