Use async method in tests.

Author: danasilver

firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java

@@ -112,19 +112,6 @@ public void setUp() {
             metadataClient);
   }
 
-  @Test
-  public void setDefaults_goodXml_setsDefaults() throws Exception {
-    ConfigContainer goodDefaultsXmlContainer = newDefaultsContainer(DEFAULTS_MAP);
-
-    frc.setDefaults(getResourceId("frc_good_defaults"));
-
-    ArgumentCaptor<ConfigContainer> captor = ArgumentCaptor.forClass(ConfigContainer.class);
-    verify(mockDefaultsCache).putWithoutWaitingForDiskWrite(captor.capture());
-
-    JSONAssert.assertEquals(
-        captor.getValue().toString(), goodDefaultsXmlContainer.toString(), false);
-  }
-
   @Test
   public void setDefaultsAsync_goodXml_setsDefaults() throws Exception {
     ConfigContainer goodDefaultsXmlContainer = newDefaultsContainer(DEFAULTS_MAP);
@@ -140,27 +127,27 @@ public void setDefaultsAsync_goodXml_setsDefaults() throws Exception {
   }
 
   @Test
-  public void setDefaults_emptyXml_setsEmptyDefaults() throws Exception {
+  public void setDefaultsAsync_emptyXml_setsEmptyDefaults() throws Exception {
     ConfigContainer emptyDefaultsXmlContainer = newDefaultsContainer(ImmutableMap.of());
 
-    frc.setDefaults(getResourceId("frc_empty_defaults"));
+    Task<Void> task = frc.setDefaultsAsync(getResourceId("frc_empty_defaults"));
+    Tasks.await(task);
 
     ArgumentCaptor<ConfigContainer> captor = ArgumentCaptor.forClass(ConfigContainer.class);
-    verify(mockDefaultsCache).putWithoutWaitingForDiskWrite(captor.capture());
-
+    verify(mockDefaultsCache).put(captor.capture());
     assertThat(captor.getValue()).isEqualTo(emptyDefaultsXmlContainer);
   }
 
   @Test
-  public void setDefaults_badXml_ignoresBadEntries() throws Exception {
+  public void setDefaultsAsync_badXml_ignoresBadEntries() throws Exception {
     ConfigContainer badDefaultsXmlContainer =
         newDefaultsContainer(ImmutableMap.of("second_default_key", "second_default_value"));
 
-    frc.setDefaults(getResourceId("frc_bad_defaults"));
+    Task<Void> task = frc.setDefaultsAsync(getResourceId("frc_bad_defaults"));
+    Tasks.await(task);
 
     ArgumentCaptor<ConfigContainer> captor = ArgumentCaptor.forClass(ConfigContainer.class);
-    verify(mockDefaultsCache).putWithoutWaitingForDiskWrite(captor.capture());
-
+    verify(mockDefaultsCache).put(captor.capture());
     assertThat(captor.getValue()).isEqualTo(badDefaultsXmlContainer);
   }
 

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

@@ -78,17 +78,6 @@ private ConfigCacheClient(ExecutorService executorService, ConfigStorageClient s
     cachedContainerTask = null;
   }
 
-  /**
-   * Sets the in-memory {@link ConfigContainer} to {@code configContainer} and then starts the file
-   * write to save the new config to disk.
-   *
-   * @return A {@link Task} representing the write to disk.
-   */
-  public Task<ConfigContainer> putWithoutWaitingForDiskWrite(ConfigContainer configContainer) {
-    updateInMemoryConfigContainer(configContainer);
-    return put(configContainer, /*shouldUpdateInMemoryContainer=*/ false);
-  }
-
   /**
    * Returns the cached {@link ConfigContainer}, blocking on a file read if necessary.
    *

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigCacheClientTest.java

@@ -275,26 +275,6 @@ public void getBlocking_firstTwoFileReadsFail_readsFileAndSetsCacheThreeTimes()
     verify(mockStorageClient, times(3)).read();
   }
 
-  @Test
-  public void putWithoutWaitingForDiskWrite_fileWriteFails_setsCache() throws Exception {
-    when(mockStorageClient.write(configContainer)).thenThrow(IO_EXCEPTION);
-
-    Task<ConfigContainer> putTask = cacheClient.putWithoutWaitingForDiskWrite(configContainer);
-    assertThrows(ExecutionException.class, () -> Tasks.await(putTask));
-
-    assertThat(putTask.getException()).isEqualTo(IO_EXCEPTION);
-    assertThat(cacheClient.getCachedContainerTask().getResult()).isEqualTo(configContainer);
-  }
-
-  @Test
-  public void putWithoutWaitingForDiskWrite_fileWriteSucceeds_setsCache() throws Exception {
-    ConfigContainer putContainer =
-        Tasks.await(cacheClient.putWithoutWaitingForDiskWrite(configContainer));
-
-    assertThat(putContainer).isEqualTo(configContainer);
-    assertThat(cacheClient.getCachedContainerTask().getResult()).isEqualTo(configContainer);
-  }
-
   @Test
   public void clear_hasNoCachedValue_setsCacheContainerToNull() {
     Preconditions.checkArgument(cacheClient.getCachedContainerTask() == null);