Remove need for [FIRApp configure] in Messaging unit tests (#1927)

* Remove need for [FIRApp configure] in Messaging unit tests
* Add missing file to test target

Author: paulb777

Example/Firebase.xcodeproj/project.pbxproj

@@ -550,6 +550,7 @@
 		DEE14D941E84468D006FA992 /* FIRTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D7C1E844677006FA992 /* FIRTestCase.m */; };
 		DEF288411F9AB6E100D480CF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DEF288401F9AB6E100D480CF /* [email protected] */; };
 		DEF288421F9AB6E100D480CF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DEF288401F9AB6E100D480CF /* [email protected] */; };
+		DEF61BFD216E8B1100A738D4 /* FIRMessagingReceiverTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEF61BFC216E8B1000A738D4 /* FIRMessagingReceiverTest.m */; };
 		DEF6C30D1FBCE72F005D0740 /* FIRAuthDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9314FF1E86C6FF0083EDBF /* FIRAuthDispatcherTests.m */; };
 		DEF6C30F1FBCE775005D0740 /* FIRAdditionalUserInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9314FA1E86C6FF0083EDBF /* FIRAdditionalUserInfoTests.m */; };
 		DEF6C3101FBCE775005D0740 /* FIRApp+FIRAuthUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9314FC1E86C6FF0083EDBF /* FIRApp+FIRAuthUnitTests.m */; };
@@ -1331,6 +1332,7 @@
 		DEE14D7C1E844677006FA992 /* FIRTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTestCase.m; sourceTree = "<group>"; };
 		DEE14D7D1E844677006FA992 /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
 		DEF288401F9AB6E100D480CF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		DEF61BFC216E8B1000A738D4 /* FIRMessagingReceiverTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRMessagingReceiverTest.m; sourceTree = "<group>"; };
 		E2C2834C90DBAB56D568189F /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		ED34CF4A20DC16DC000EA5D1 /* FIRComponentContainerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRComponentContainerTest.m; sourceTree = "<group>"; };
 		ED34CF4B20DC16DC000EA5D1 /* FIRTestComponents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTestComponents.m; sourceTree = "<group>"; };
@@ -2328,6 +2330,7 @@
 				DE9315CC1E8738B70083EDBF /* FIRMessagingLinkHandlingTest.m */,
 				DE9315CD1E8738B70083EDBF /* FIRMessagingPendingTopicsListTest.m */,
 				DE9315CE1E8738B70083EDBF /* FIRMessagingPubSubTest.m */,
+				DEF61BFC216E8B1000A738D4 /* FIRMessagingReceiverTest.m */,
 				DE9315CF1E8738B70083EDBF /* FIRMessagingRegistrarTest.m */,
 				DE9315D01E8738B70083EDBF /* FIRMessagingRemoteNotificationsProxyTest.m */,
 				DE9315D11E8738B70083EDBF /* FIRMessagingRmqManagerTest.m */,
@@ -3204,7 +3207,6 @@
 					};
 					AFD562E41EB13C6D00EA2233 = {
 						CreatedOnToolsVersion = 8.3.2;
-						DevelopmentTeam = EQHXZ8M8AV;
 						LastSwiftMigration = 0830;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
@@ -4414,6 +4416,7 @@
 				DE9315FE1E8738E60083EDBF /* FIRMessagingRegistrarTest.m in Sources */,
 				DE9316031E8738E60083EDBF /* FIRMessagingSyncMessageManagerTest.m in Sources */,
 				DE9315FF1E8738E60083EDBF /* FIRMessagingRemoteNotificationsProxyTest.m in Sources */,
+				DEF61BFD216E8B1100A738D4 /* FIRMessagingReceiverTest.m in Sources */,
 				DE9315F81E8738E60083EDBF /* FIRMessagingDataMessageManagerTest.m in Sources */,
 				DE9316051E8738E60083EDBF /* FIRMessagingTestNotificationUtilities.m in Sources */,
 				DE37C63B2163D5F30025D03E /* FIRMessagingAnalyticsTest.m in Sources */,
@@ -5109,7 +5112,7 @@
 				CODE_SIGN_ENTITLEMENTS = Messaging/Sample/iOS/Messaging_Example.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = EQHXZ8M8AV;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Messaging/Sample/iOS/Messaging-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -5138,7 +5141,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = EQHXZ8M8AV;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Messaging/Sample/iOS/Messaging-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;

Example/Messaging/App/iOS/FIRAppDelegate.m

@@ -20,7 +20,6 @@ @implementation FIRAppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  [FIRApp configure];
   return YES;
 }
 

Example/Messaging/Sample/iOS/Messaging-Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>FirebaseMessagingAutoInitEnabled</key>
-	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +22,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>FirebaseMessagingAutoInitEnabled</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m

@@ -18,14 +18,13 @@
 
 #import <OCMock/OCMock.h>
 
-#import <FirebaseCore/FIRApp.h>
 #import "FIRMessaging.h"
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingTestNotificationUtilities.h"
 
 @interface FIRMessaging ()
 
-- (instancetype)initPrivately;
++ (FIRMessaging *)messagingForTests;
 - (NSURL *)linkURLFromMessage:(NSDictionary *)message;
 
 @end
@@ -40,7 +39,7 @@ @implementation FIRMessagingLinkHandlingTest
 
 - (void)setUp {
   [super setUp];
-  _messaging = [FIRMessaging messaging];
+  _messaging = [FIRMessaging messagingForTests];
 }
 
 - (void)tearDown {

Example/Messaging/Tests/FIRMessagingReceiverTest.m

@@ -23,6 +23,10 @@
 #import "FIRMessaging.h"
 #import "FIRMessaging_Private.h"
 
+@interface FIRMessaging ()
++ (FIRMessaging *)messagingForTests;
+@end
+
 @interface FIRMessagingReceiverTest : XCTestCase
 @property(nonatomic, readonly, strong) FIRMessaging *messaging;
 
@@ -32,7 +36,7 @@ @implementation FIRMessagingReceiverTest
 - (void)setUp {
   [super setUp];
 
-  _messaging = [FIRMessaging messaging];
+  _messaging = [FIRMessaging messagingForTests];
   [[NSUserDefaults standardUserDefaults]
       removePersistentDomainForName:[NSBundle mainBundle].bundleIdentifier];
 }

Example/Messaging/Tests/FIRMessagingServiceTest.m

@@ -25,15 +25,14 @@
 #import "FIRMessagingTopicsCommon.h"
 #import "InternalHeaders/FIRMessagingInternalUtilities.h"
 #import "NSError+FIRMessaging.h"
-#import <FirebaseCore/FIRAppInternal.h>
 
 static NSString *const kFakeToken =
     @"fE1e1PZJFSQ:APA91bFAOjp1ahBWn9rTlbjArwBEm_"
     @"yUTTzK6dhIvLqzqqCSabaa4TQVM0pGTmF6r7tmMHPe6VYiGMHuCwJFgj5v97xl78sUNMLwuPPhoci8z_"
     @"QGlCrTbxCFGzEUfvA3fGpGgIVQU2W6";
 
 @interface FIRMessaging () <FIRMessagingClientDelegate>
-
++ (FIRMessaging *)messagingForTests;
 @property(nonatomic, readwrite, strong) FIRMessagingClient *client;
 @property(nonatomic, readwrite, strong) FIRMessagingPubSub *pubsub;
 @property(nonatomic, readwrite, strong) NSString *defaultFcmToken;
@@ -56,9 +55,10 @@ @interface FIRMessagingServiceTest : XCTestCase {
 @implementation FIRMessagingServiceTest
 
 - (void)setUp {
-  _messaging = [FIRMessaging messaging];
+  _messaging = [FIRMessaging messagingForTests];
   _messaging.defaultFcmToken = kFakeToken;
   _mockPubSub = OCMPartialMock(_messaging.pubsub);
+  [_mockPubSub setClient:nil];
   [super setUp];
 }
 
@@ -151,7 +151,7 @@ - (void)testSubscribeWithoutStart {
                    topic:@"/topics/hello-world"
                  options:nil
                  handler:^(NSError *error) {
-                   XCTAssertNil(error);
+                   XCTAssertNotNil(error);
                    XCTAssertEqual(kFIRMessagingErrorCodePubSubFIRMessagingNotSetup, error.code);
                  }];
 }

Example/Messaging/Tests/FIRMessagingTest.m

@@ -27,6 +27,7 @@
 extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
 
 @interface FIRMessaging ()
++ (FIRMessaging *)messagingForTests;
 
 @property(nonatomic, readwrite, strong) NSString *defaultFcmToken;
 @property(nonatomic, readwrite, strong) NSData *apnsTokenData;
@@ -53,7 +54,7 @@ @implementation FIRMessagingTest
 
 - (void)setUp {
   [super setUp];
-  _messaging = [FIRMessaging messaging];
+  _messaging = [FIRMessaging messagingForTests];
   _mockFirebaseApp = OCMClassMock([FIRApp class]);
    OCMStub([_mockFirebaseApp defaultApp]).andReturn(_mockFirebaseApp);
   _mockInstanceID = OCMPartialMock(self.messaging.instanceID);

Firebase/Messaging/FIRMessaging.m

@@ -165,7 +165,14 @@ @interface FIRMessaging () <FIRMessagingInstanceProvider,
 
 @implementation FIRMessaging
 
+// File static to support InstanceID tests that call [FIRMessaging messaging] after
+// [FIRMessaging messagingForTests].
+static FIRMessaging *sMessaging;
+
 + (FIRMessaging *)messaging {
+  if (sMessaging != nil) {
+    return sMessaging;
+  }
   FIRApp *defaultApp = [FIRApp defaultApp];  // Missing configure will be logged here.
   id<FIRMessagingInstanceProvider> messaging =
       FIR_COMPONENT(FIRMessagingInstanceProvider, defaultApp.container);
@@ -174,7 +181,16 @@ + (FIRMessaging *)messaging {
   dispatch_once(&onceToken, ^{
     [(FIRMessaging *)messaging start];
   });
-  return (FIRMessaging *)messaging;
+  sMessaging = (FIRMessaging *)messaging;
+  return sMessaging;
+}
+
++ (FIRMessaging *)messagingForTests {
+  sMessaging = [[FIRMessaging alloc] initWithAnalytics:nil
+                                        withInstanceID:[FIRInstanceID instanceID]
+                                      withUserDefaults:[NSUserDefaults standardUserDefaults]];
+  [sMessaging start];
+  return sMessaging;
 }
 
 - (instancetype)initWithAnalytics:(nullable id<FIRAnalyticsInterop>)analytics

Firebase/Messaging/FIRMessagingDefines.h

@@ -55,7 +55,7 @@ _Pragma("clang diagnostic pop")
 #ifndef _FIRMessagingDevAssert
 // we directly invoke the NSAssert handler so we can pass on the varargs
 // (NSAssert doesn't have a macro we can use that takes varargs)
-#if !defined(NS_BLOCK_ASSERTIONS)
+#ifdef DEBUG
 #define _FIRMessagingDevAssert(condition, ...)                                       \
   do {                                                                      \
     if (!(condition)) {                                                     \
@@ -67,9 +67,9 @@ _Pragma("clang diagnostic pop")
                       description:__VA_ARGS__];                             \
     }                                                                       \
   } while(0)
-#else // !defined(NS_BLOCK_ASSERTIONS)
+#else // !defined(DEBUG)
 #define _FIRMessagingDevAssert(condition, ...) do { } while (0)
-#endif // !defined(NS_BLOCK_ASSERTIONS)
+#endif // !defined(DEBUG)
 
 #endif // _FIRMessagingDevAssert