cleanup variable naming according to pr feedback

Author: Adam Duke

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CLSUUIDTest.java

@@ -28,9 +28,9 @@ public class CLSUUIDTest extends CrashlyticsTestCase {
 
   protected void setUp() throws Exception {
     super.setUp();
-    FirebaseInstallationsApi instanceIdMock = mock(FirebaseInstallationsApi.class);
-    when(instanceIdMock.getId()).thenReturn(Tasks.forResult("instanceId"));
-    idManager = new IdManager(getContext(), getContext().getPackageName(), instanceIdMock);
+    FirebaseInstallationsApi installationsApiMock = mock(FirebaseInstallationsApi.class);
+    when(installationsApiMock.getId()).thenReturn(Tasks.forResult("instanceId"));
+    idManager = new IdManager(getContext(), getContext().getPackageName(), installationsApiMock);
     uuid = new CLSUUID(idManager);
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java

@@ -353,10 +353,10 @@ public void testCapFileCount() throws Exception {
 
   private File createEmptyClsFile(File dir) throws IOException {
     final Context context = getContext();
-    FirebaseInstallationsApi instanceIdMock = mock(FirebaseInstallationsApi.class);
-    when(instanceIdMock.getId()).thenReturn(Tasks.forResult("instanceId"));
+    FirebaseInstallationsApi installationsApiMock = mock(FirebaseInstallationsApi.class);
+    when(installationsApiMock.getId()).thenReturn(Tasks.forResult("instanceId"));
     final CLSUUID id =
-        new CLSUUID(new IdManager(context, context.getPackageName(), instanceIdMock));
+        new CLSUUID(new IdManager(context, context.getPackageName(), installationsApiMock));
     final File f = new File(dir, id.toString() + ".cls");
     f.createNewFile();
     return f;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -99,9 +99,9 @@ protected void setUp() throws Exception {
 
     testContext = getContext();
 
-    FirebaseInstallationsApi instanceIdMock = mock(FirebaseInstallationsApi.class);
-    when(instanceIdMock.getId()).thenReturn(Tasks.forResult("instanceId"));
-    idManager = new IdManager(testContext, testContext.getPackageName(), instanceIdMock);
+    FirebaseInstallationsApi installationsApiMock = mock(FirebaseInstallationsApi.class);
+    when(installationsApiMock.getId()).thenReturn(Tasks.forResult("instanceId"));
+    idManager = new IdManager(testContext, testContext.getPackageName(), installationsApiMock);
 
     BatteryIntentProvider.returnNull = false;
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java

@@ -94,9 +94,9 @@ public CoreBuilder(Context context, FirebaseOptions firebaseOptions) {
       when(app.getApplicationContext()).thenReturn(context);
       when(app.getOptions()).thenReturn(firebaseOptions);
 
-      FirebaseInstallationsApi instanceIdMock = mock(FirebaseInstallationsApi.class);
-      when(instanceIdMock.getId()).thenReturn(Tasks.forResult("instanceId"));
-      idManager = new IdManager(context, context.getPackageName(), instanceIdMock);
+      FirebaseInstallationsApi installationsApiMock = mock(FirebaseInstallationsApi.class);
+      when(installationsApiMock.getId()).thenReturn(Tasks.forResult("instanceId"));
+      idManager = new IdManager(context, context.getPackageName(), installationsApiMock);
 
       nativeComponent = new MissingNativeComponent();
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -681,14 +681,14 @@ CrashlyticsCore build(Context context) {
       FirebaseApp app = mock(FirebaseApp.class);
       when(app.getApplicationContext()).thenReturn(context);
       when(app.getOptions()).thenReturn(testFirebaseOptions);
-      FirebaseInstallationsApi instanceIdMock = mock(FirebaseInstallationsApi.class);
-      when(instanceIdMock.getId()).thenReturn(Tasks.forResult("instanceId"));
+      FirebaseInstallationsApi installationsApiMock = mock(FirebaseInstallationsApi.class);
+      when(installationsApiMock.getId()).thenReturn(Tasks.forResult("instanceId"));
       BreadcrumbSource breadcrumbSource =
           this.breadcrumbSource == null ? new DisabledBreadcrumbSource() : this.breadcrumbSource;
       final CrashlyticsCore crashlyticsCore =
           new CrashlyticsCore(
               app,
-              new IdManager(context, "unused", instanceIdMock),
+              new IdManager(context, "unused", installationsApiMock),
               nativeComponent,
               arbiter,
               breadcrumbSource,

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java

@@ -44,16 +44,17 @@ public class CrashlyticsReportDataCaptureTest {
 
   @Mock private StackTraceTrimmingStrategy stackTraceTrimmingStrategy;
 
-  @Mock private FirebaseInstallationsApi instanceIdMock;
+  @Mock private FirebaseInstallationsApi installationsApiMock;
 
   @Before
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
-    when(instanceIdMock.getId()).thenReturn(Tasks.forResult("installId"));
+    when(installationsApiMock.getId()).thenReturn(Tasks.forResult("installId"));
     when(stackTraceTrimmingStrategy.getTrimmedStackTrace(any(StackTraceElement[].class)))
         .thenAnswer(i -> i.getArguments()[0]);
     final Context context = ApplicationProvider.getApplicationContext();
-    final IdManager idManager = new IdManager(context, context.getPackageName(), instanceIdMock);
+    final IdManager idManager =
+        new IdManager(context, context.getPackageName(), installationsApiMock);
     final AppData appData = AppData.create(context, idManager, "googleAppId", "buildId");
     dataCapture =
         new CrashlyticsReportDataCapture(context, idManager, appData, stackTraceTrimmingStrategy);

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/IdManagerTest.java

@@ -77,18 +77,18 @@ public void testCreateUUID() {
     assertEquals(installId, idManager.getCrashlyticsInstallId());
   }
 
-  public void testGetIdExceptionalCase() {
-    FirebaseInstallationsApi iid = mock(FirebaseInstallationsApi.class);
+  public void testGetIdExceptionalCase_doesNotRotateInstallId() {
+    FirebaseInstallationsApi fis = mock(FirebaseInstallationsApi.class);
     final String expectedInstallId = "expectedInstallId";
-    when(iid.getId())
+    when(fis.getId())
         .thenReturn(Tasks.forException(new TimeoutException("Fetching id timed out.")));
     prefs
         .edit()
         .putString(IdManager.PREFKEY_INSTALLATION_UUID, expectedInstallId)
         .putString(IdManager.PREFKEY_FIREBASE_IID, "firebase-iid")
         .apply();
 
-    final IdManager idManager = new IdManager(getContext(), getContext().getPackageName(), iid);
+    final IdManager idManager = new IdManager(getContext(), getContext().getPackageName(), fis);
     final String actualInstallId = idManager.getCrashlyticsInstallId();
     assertNotNull(actualInstallId);
     assertEquals(expectedInstallId, actualInstallId);