Add test for updating cache

firebase-segmentation/src/androidTest/java/com/google/firebase/segmentation/CustomInstallationIdCacheTest.java

@@ -15,7 +15,6 @@
 package com.google.firebase.segmentation;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import androidx.test.InstrumentationRegistry;
@@ -66,12 +65,21 @@ public void testUpdateAndReadCacheEntry() {
     cache.insertOrUpdateCacheEntry(
         firebaseApp0,
         CustomInstallationIdCacheEntryValue.create(
-            "123456", "cAAAAAAAAAA", CustomInstallationIdCache.CacheStatus.SYNCED));
+            "123456", "cAAAAAAAAAA", CustomInstallationIdCache.CacheStatus.PENDING));
     CustomInstallationIdCacheEntryValue entryValue = cache.readCacheEntryValue(firebaseApp0);
-    assertNotNull(entryValue);
     assertThat(entryValue.getCustomInstallationId()).isEqualTo("123456");
     assertThat(entryValue.getFirebaseInstanceId()).isEqualTo("cAAAAAAAAAA");
-    assertThat(entryValue.getCacheStatus()).isEqualTo(CustomInstallationIdCache.CacheStatus.SYNCED);
+    assertThat(entryValue.getCacheStatus())
+        .isEqualTo(CustomInstallationIdCache.CacheStatus.PENDING);
     assertNull(cache.readCacheEntryValue(firebaseApp1));
+
+    cache.insertOrUpdateCacheEntry(
+        firebaseApp0,
+        CustomInstallationIdCacheEntryValue.create(
+            "123456", "cAAAAAAAAAA", CustomInstallationIdCache.CacheStatus.SYNCED));
+    entryValue = cache.readCacheEntryValue(firebaseApp0);
+    assertThat(entryValue.getCustomInstallationId()).isEqualTo("123456");
+    assertThat(entryValue.getFirebaseInstanceId()).isEqualTo("cAAAAAAAAAA");
+    assertThat(entryValue.getCacheStatus()).isEqualTo(CustomInstallationIdCache.CacheStatus.SYNCED);
   }
 }

firebase-segmentation/src/main/java/com/google/firebase/segmentation/CustomInstallationIdCache.java

@@ -109,8 +109,6 @@ CustomInstallationIdCacheEntryValue readCacheEntryValue(FirebaseApp firebaseApp)
 
   void insertOrUpdateCacheEntry(
       FirebaseApp firebaseApp, CustomInstallationIdCacheEntryValue entryValue) {
-    String gmpAppId = firebaseApp.getOptions().getApplicationId();
-    String appName = firebaseApp.getName();
     localDb.execSQL(
         String.format(
             "INSERT OR REPLACE INTO %s(%s, %s, %s, %s, %s) VALUES(%s, %s, %s, %s, %s)",
@@ -120,8 +118,8 @@ void insertOrUpdateCacheEntry(
             CUSTOM_INSTALLATION_ID_COLUMN_NAME,
             INSTANCE_ID_COLUMN_NAME,
             CACHE_STATUS_COLUMN,
-            "\"" + gmpAppId + "\"",
-            "\"" + appName + "\"",
+            "\"" + firebaseApp.getOptions().getApplicationId() + "\"",
+            "\"" + firebaseApp.getName() + "\"",
             "\"" + entryValue.getCustomInstallationId() + "\"",
             "\"" + entryValue.getFirebaseInstanceId() + "\"",
             entryValue.getCacheStatus().ordinal()));