Restore thread safety to unit tests

Author: paulb777

Example/Core/Tests/FIRAppTest.m

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #import "FIRTestCase.h"
+#import "FIRTestComponents.h"
 
 #import <FirebaseCore/FIRAnalyticsConfiguration+Internal.h>
 #import <FirebaseCore/FIRAppInternal.h>
@@ -798,6 +799,17 @@ - (void)testMultipleLibraries {
   XCTAssertTrue([[FIRApp firebaseUserAgent] containsString:@"LegalName/1.0.0 LegalName2/2.0.0"]);
 }
 
+- (void)testRegisteringConformingLibrary {
+  Class testClass = [FIRTestClass class];
+  [FIRApp registerInternalLibrary:testClass withName:@"LegalName" withVersion:@"1.0.0"];
+  XCTAssertTrue([[FIRApp firebaseUserAgent] containsString:@"LegalName/1.0.0"]);
+}
+
+- (void)testRegisteringNonConformingLibrary {
+  XCTAssertThrows([FIRApp registerInternalLibrary:[NSString class] withName:@"IllegalLibrary" withVersion:@"1.0.0"]);
+  XCTAssertFalse([[FIRApp firebaseUserAgent] containsString:@"LegalName/1.0.0"]);
+}
+
 #pragma mark - private
 
 - (void)expectNotificationForObserver:(id)observer

Example/Core/Tests/FIRComponentContainerTest.m

@@ -26,10 +26,9 @@ @interface FIRComponentContainer (TestInternal)
 @property(nonatomic, strong) NSMutableDictionary<NSString *, FIRComponentCreationBlock> *components;
 @property(nonatomic, strong) NSMutableDictionary<NSString *, id> *cachedInstances;
 
-+ (void)registerAsComponentRegistrant:(Class)klass inSet:(NSMutableSet<Class> *)allRegistrants;
++ (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass
+                                inSet:(NSMutableSet<Class> *)allRegistrants;
 - (instancetype)initWithApp:(FIRApp *)app registrants:(NSMutableSet<Class> *)allRegistrants;
-+ (void)setRegistrantSet:(NSMutableSet<Class> *)testInput;
-+ (NSMutableSet<Class> *)registrantSet;
 @end
 
 @interface FIRComponentContainer (TestInternalImplementations)
@@ -59,17 +58,10 @@ @implementation FIRComponentContainerTest
 #pragma mark - Registration Tests
 
 - (void)testRegisteringConformingClass {
-  [FIRComponentContainer setRegistrantSet:[NSMutableSet<Class> set]];
-  Class testClass = [FIRTestClass class];
-  [FIRComponentContainer registerAsComponentRegistrant:testClass];
-  XCTAssertTrue([[FIRComponentContainer registrantSet] containsObject:testClass]);
-}
-
-- (void)testRegisteringNonConformingClass {
   NSMutableSet<Class> *allRegistrants = [NSMutableSet<Class> set];
-  XCTAssertThrows(
-      [FIRComponentContainer registerAsComponentRegistrant:[NSString class] inSet:allRegistrants]);
-  XCTAssertTrue(allRegistrants.count == 0);
+  Class testClass = [FIRTestClass class];
+  [FIRComponentContainer registerAsComponentRegistrant:testClass inSet:allRegistrants];
+  XCTAssertTrue([allRegistrants containsObject:testClass]);
 }
 
 - (void)testComponentsPopulatedOnInit {
@@ -161,15 +153,13 @@ - (void)testProtocolAlreadyRegistered {
 /// Create a container that has registered the test class.
 - (FIRComponentContainer *)containerWithRegistrants:(NSArray<Class> *)registrants {
   id appMock = OCMClassMock([FIRApp class]);
-  [FIRComponentContainer setRegistrantSet:[NSMutableSet<Class> set]];
+  NSMutableSet<Class> *allRegistrants = [NSMutableSet<Class> set];
 
   // Initialize the container with the test classes.
   for (Class c in registrants) {
-    [FIRComponentContainer registerAsComponentRegistrant:c];
+    [FIRComponentContainer registerAsComponentRegistrant:c inSet:allRegistrants];
   }
-
-  return [[FIRComponentContainer alloc] initWithApp:appMock
-                                        registrants:[FIRComponentContainer registrantSet]];
+  return [[FIRComponentContainer alloc] initWithApp:appMock registrants:allRegistrants];
 }
 
 @end

Firebase/Core/FIRComponentContainer.m

@@ -47,7 +47,12 @@ + (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass {
     sFIRComponentRegistrants = [[NSMutableSet<Class> alloc] init];
   });
 
-  [sFIRComponentRegistrants addObject:klass];
+  [self registerAsComponentRegistrant:klass inSet:sFIRComponentRegistrants];
+}
+
++ (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass
+                                inSet:(NSMutableSet<Class> *)allRegistrants {
+  [allRegistrants addObject:klass];
 }
 
 #pragma mark - Internal Initialization
@@ -166,16 +171,6 @@ - (void)removeAllCachedInstances {
   [self.cachedInstances removeAllObjects];
 }
 
-#pragma mark - Testing Accessors
-
-+ (void)setRegistrantSet:(NSMutableSet<Class> *)testInput {
-  sFIRComponentRegistrants = testInput;
-}
-
-+ (NSMutableSet<Class> *)registrantSet {
-  return sFIRComponentRegistrants;
-}
-
 @end
 
 NS_ASSUME_NONNULL_END