From b079f627c03269cd54f32243a8953ab8522f162c Mon Sep 17 00:00:00 2001
From: Themis wang <themisw@google.com>
Date: Wed, 6 Dec 2023 22:10:26 -0500
Subject: [PATCH] really try to fix the unit tests

---
 FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h     | 3 +++
 FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m     | 6 ++++++
 .../Tests/Unit/FIRRemoteConfigComponentTest.m               | 1 +
 FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m       | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
index 3c6ec1ec7300..92d7bbfbefa9 100644
--- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
+++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
@@ -47,6 +47,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// Cached instances of Remote Config objects.
 @property(nonatomic, strong) NSMutableDictionary<NSString *, FIRRemoteConfig *> *instances;
 
+/// Clear all the component instances from the singleton which created previously;
++ (void)clearAllComponentInstance;
+
 /// Default method for retrieving a Remote Config instance, or creating one if it doesn't exist.
 - (FIRRemoteConfig *)remoteConfigForNamespace:(NSString *)remoteConfigNamespace;
 
diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
index 408050db51ad..0f10566d4baa 100644
--- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
+++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
@@ -40,6 +40,12 @@ + (FIRRemoteConfigComponent *)getComponentForApp:(FIRApp *)app {
   return nil;
 }
 
++ (void)clearAllComponentInstance {
+  @synchronized(_componentInstances) {
+    [_componentInstances removeAllObjects];
+  }
+}
+
 /// Default method for retrieving a Remote Config instance, or creating one if it doesn't exist.
 - (FIRRemoteConfig *)remoteConfigForNamespace:(NSString *)remoteConfigNamespace {
   if (!remoteConfigNamespace) {
diff --git a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
index d7ab885d4529..eebbe482da57 100644
--- a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
+++ b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
@@ -32,6 +32,7 @@ - (void)tearDown {
 
   // Clear out any apps that were called with `configure`.
   [FIRApp resetApps];
+  [FIRRemoteConfigComponent clearAllComponentInstance];
 }
 
 - (void)testRCInstanceCreationAndCaching {
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
index e1a23b5a695b..0a35d452a79d 100644
--- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
+++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
@@ -18,6 +18,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h"
 #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h"
@@ -286,6 +287,7 @@ __unsafe_unretained void (^handler)(FIRRemoteConfigFetchStatus status,
 
 - (void)tearDown {
   [_DBManager removeDatabaseOnDatabaseQueueAtPath:_DBPath];
+  [FIRRemoteConfigComponent clearAllComponentInstance];
   [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:_userDefaultsSuiteName];
   [_DBManagerMock stopMocking];
   _DBManagerMock = nil;