diff --git a/src/test/java/com/google/firebase/database/FirebaseDatabaseTest.java b/src/test/java/com/google/firebase/database/FirebaseDatabaseTest.java index 74e835884..d8395035e 100644 --- a/src/test/java/com/google/firebase/database/FirebaseDatabaseTest.java +++ b/src/test/java/com/google/firebase/database/FirebaseDatabaseTest.java @@ -38,11 +38,15 @@ public class FirebaseDatabaseTest { - private static FirebaseOptions firebaseOptions = + private static final FirebaseOptions firebaseOptions = new FirebaseOptions.Builder() .setCredentials(TestUtils.getCertCredential(ServiceAccount.EDITOR.asStream())) .setDatabaseUrl("https://firebase-db-test.firebaseio.com") .build(); + private static final FirebaseOptions firebaseOptionsWithoutDatabaseUrl = + new FirebaseOptions.Builder() + .setCredentials(TestUtils.getCertCredential(ServiceAccount.EDITOR.asStream())) + .build(); @Test public void testGetInstance() { @@ -210,9 +214,10 @@ public void testDbUrlIsEmulatorUrlWhenSettingOptionsManually() { new CustomTestCase("https://test.firebaseio.com?ns=valid-namespace", "localhost:90", "http://localhost:90", "valid-namespace") ); + for (CustomTestCase tc : testCases) { try { - FirebaseApp app = FirebaseApp.initializeApp(); + FirebaseApp app = FirebaseApp.initializeApp(firebaseOptionsWithoutDatabaseUrl); TestUtils.setEnvironmentVariables( ImmutableMap.of(EmulatorHelper.FIREBASE_RTDB_EMULATOR_HOST_ENV_VAR, Strings.nullToEmpty(tc.envVariableUrl))); @@ -249,7 +254,7 @@ public void testDbUrlIsEmulatorUrlForDbRefWithPath() { for (CustomTestCase tc : testCases) { try { - FirebaseApp app = FirebaseApp.initializeApp(); + FirebaseApp app = FirebaseApp.initializeApp(firebaseOptionsWithoutDatabaseUrl); TestUtils.setEnvironmentVariables( ImmutableMap.of(EmulatorHelper.FIREBASE_RTDB_EMULATOR_HOST_ENV_VAR, Strings.nullToEmpty(tc.envVariableUrl)));