Fix internal integration test. (#791)

wu-hui · web-flow · commit 8a7b33cb9cc9 · 2019-09-12T12:23:13.000-04:00
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
@@ -161,10 +161,11 @@ public static FirebaseFirestoreSettings newTestSettingsWithSnapshotTimestampsEna
   }
 
   public static FirebaseApp testFirebaseApp() {
-    if (FirebaseApp.getInstance(FirebaseApp.DEFAULT_APP_NAME) != null) {
+    try {
       return FirebaseApp.getInstance(FirebaseApp.DEFAULT_APP_NAME);
+    } catch (IllegalStateException e) {
+      return FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), OPTIONS);
     }
-    return FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), OPTIONS);
   }
 
   /** Initializes a new Firestore instance that uses the default project. */

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,11 @@ public static FirebaseFirestoreSettings newTestSettingsWithSnapshotTimestampsEna`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`public static FirebaseApp testFirebaseApp() {`
`164`		`- if (FirebaseApp.getInstance(FirebaseApp.DEFAULT_APP_NAME) != null) {`
	`164`	`+ try {`
`165`	`165`	`return FirebaseApp.getInstance(FirebaseApp.DEFAULT_APP_NAME);`
	`166`	`+ } catch (IllegalStateException e) {`
	`167`	`+ return FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), OPTIONS);`
`166`	`168`	`}`
`167`		`- return FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), OPTIONS);`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`/** Initializes a new Firestore instance that uses the default project. */`