Maybe Deflake RTDB tests (#2422)

Author: schmidt-sebastian

firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java

@@ -57,6 +57,7 @@ public class DataTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/EventTest.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.fail;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.database.core.RepoManager;
 import com.google.firebase.database.core.ZombieVerifier;
 import com.google.firebase.database.core.view.Event;
 import com.google.firebase.database.future.ReadFuture;
@@ -46,8 +47,10 @@ public class EventTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
+
   // NOTE: skipping test on valid types.
 
   @Test

firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java

@@ -25,6 +25,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.database.core.DatabaseConfig;
+import com.google.firebase.database.core.RepoManager;
 import com.google.firebase.database.core.persistence.CachePolicy;
 import com.google.firebase.database.core.persistence.DefaultPersistenceManager;
 import com.google.firebase.database.core.persistence.MockPersistenceStorageEngine;
@@ -45,6 +46,7 @@ public class FirebaseDatabaseTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java

@@ -36,6 +36,7 @@ public class InfoTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestHelpers.java

@@ -262,6 +262,7 @@ public static DatabaseConfig newTestConfig() {
     config.setRunLoop(runLoop);
     config.setFirebaseApp(FirebaseApp.getInstance());
     config.setAuthTokenProvider(AndroidAuthTokenProvider.forUnauthenticatedAccess());
+    config.setSessionPersistenceKey(UUID.randomUUID().toString());
     return config;
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/OrderByTest.java

@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertEquals;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.database.core.RepoManager;
 import com.google.firebase.database.future.ReadFuture;
 import com.google.firebase.database.future.WriteFuture;
 import java.util.ArrayList;
@@ -27,6 +28,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeoutException;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -35,6 +37,12 @@
 public class OrderByTest {
   @Rule public RetryRule retryRule = new RetryRule(3);
 
+  @After
+  public void tearDown() {
+    RepoManager.clear();
+    IntegrationTestHelpers.failOnFirstUncaughtException();
+  }
+
   @Test
   public void snapshotsAreIteratedInOrder()
       throws InterruptedException, ExecutionException, TimeoutException, TestFailure {

firebase-database/src/androidTest/java/com/google/firebase/database/OrderTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.fail;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.database.core.RepoManager;
 import com.google.firebase.database.core.view.Event;
 import com.google.firebase.database.future.ReadFuture;
 import com.google.firebase.database.future.WriteFuture;
@@ -49,6 +50,7 @@ public void setUp()
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java

@@ -56,6 +56,7 @@ public class QueryTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java

@@ -45,6 +45,7 @@ public class RealtimeTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/androidTest/java/com/google/firebase/database/TransactionTest.java

@@ -52,6 +52,7 @@ public class TransactionTest {
 
   @After
   public void tearDown() {
+    RepoManager.clear();
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 

firebase-database/src/main/java/com/google/firebase/database/core/RepoManager.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.database.core;
 
+import androidx.annotation.VisibleForTesting;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.DatabaseException;
 import com.google.firebase.database.FirebaseDatabase;
@@ -74,6 +75,18 @@ public static void resume(Context ctx) {
 
   public RepoManager() {}
 
+  /** Remove all active instances. */
+  @VisibleForTesting
+  public static void clear() {
+    instance.clearRepos();
+  }
+
+  private void clearRepos() {
+    synchronized (repos) {
+      repos.clear();
+    }
+  }
+
   private Repo getLocalRepo(Context ctx, RepoInfo info) throws DatabaseException {
     ctx.freeze(); // No-op if it's already frozen
     String repoHash = "https://" + info.host + "/" + info.namespace;