Fix up some tests.

Author: danasilver

firebase-config/bandwagoner/src/androidTest/java/com/googletest/firebase/remoteconfig/bandwagoner/BandwagonerEspressoTest.java

@@ -74,8 +74,7 @@ public void activateFetchedWithoutFetching_activateFetchedReturnsFalse()
 
     onView(withId(R.id.activate_fetched_button)).perform(click());
     onView(withId(R.id.api_call_results))
-        .check(
-            matches(withText(allOf(containsString("activateFetched"), containsString("false!")))));
+        .check(matches(withText(allOf(containsString("activate"), containsString("false!")))));
   }
 
   @Test
@@ -86,14 +85,11 @@ public void fetchAndActivateFetchedTwice_activateFetchedReturnsFalse()
 
     onView(withId(R.id.activate_fetched_button)).perform(click());
     onView(withId(R.id.api_call_results))
-        .check(
-            matches(
-                withText(allOf(containsString("activateFetched"), containsString("successful!")))));
+        .check(matches(withText(allOf(containsString("activate"), containsString("successful!")))));
 
     onView(withId(R.id.activate_fetched_button)).perform(click());
     onView(withId(R.id.api_call_results))
-        .check(
-            matches(withText(allOf(containsString("activateFetched"), containsString("false!")))));
+        .check(matches(withText(allOf(containsString("activate"), containsString("false!")))));
   }
 
   @Test

firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/ApiFragment.java

@@ -16,11 +16,11 @@
 
 package com.googletest.firebase.remoteconfig.bandwagoner;
 
-import static com.googletest.firebase.remoteconfig.bandwagoner.Constants.TAG;
 import static com.googletest.firebase.remoteconfig.bandwagoner.TimeFormatHelper.getCurrentTimeString;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -132,15 +132,21 @@ private void addListenerToButton(@IdRes int buttonResourceId, OnClickListener on
   }
 
   /** Sets the version of the FRC server the SDK fetches from. */
-  @SuppressWarnings("FirebaseUseExplicitDependencies")
-  private Task<Void> onDevModeToggle(boolean isChecked) {
+  private void onDevModeToggle(boolean isChecked) {
     hideSoftKeyboard();
 
+    FirebaseRemoteConfigSettings.Builder settingsBuilder =
+        new FirebaseRemoteConfigSettings.Builder();
     String minimumFetchIntervalString = minimumFetchIntervalText.getText().toString();
-    long fetchTimeout = isChecked ? 0L : Integer.valueOf(minimumFetchIntervalString);
 
-    return frc.setConfigSettingsAsync(
-        new FirebaseRemoteConfigSettings.Builder().setFetchTimeoutInSeconds(fetchTimeout).build());
+    if (isChecked || TextUtils.isEmpty(minimumFetchIntervalString)) {
+      settingsBuilder.setMinimumFetchIntervalInSeconds(0L);
+    } else {
+      settingsBuilder.setMinimumFetchIntervalInSeconds(
+          Integer.parseInt(minimumFetchIntervalString));
+    }
+
+    frc.setConfigSettingsAsync(settingsBuilder.build());
   }
 
   /**

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

@@ -128,6 +128,7 @@ public void setDefaultsAsync_goodXml_setsDefaults() throws Exception {
   @Test
   public void setDefaultsAsync_emptyXml_setsEmptyDefaults() throws Exception {
     ConfigContainer emptyDefaultsXmlContainer = newDefaultsContainer(ImmutableMap.of());
+    cachePutReturnsConfig(mockDefaultsCache, emptyDefaultsXmlContainer);
 
     Task<Void> task = frc.setDefaultsAsync(getResourceId("frc_empty_defaults"));
     Tasks.await(task);
@@ -141,6 +142,7 @@ public void setDefaultsAsync_emptyXml_setsEmptyDefaults() throws Exception {
   public void setDefaultsAsync_badXml_ignoresBadEntries() throws Exception {
     ConfigContainer badDefaultsXmlContainer =
         newDefaultsContainer(ImmutableMap.of("second_default_key", "second_default_value"));
+    cachePutReturnsConfig(mockDefaultsCache, badDefaultsXmlContainer);
 
     Task<Void> task = frc.setDefaultsAsync(getResourceId("frc_bad_defaults"));
     Tasks.await(task);