Don't rely on test always being in foreground (#2021)

Author: paulb777

Example/Messaging/Tests/FIRMessagingAnalyticsTest.m

@@ -112,7 +112,7 @@ + (void)logUserPropertyForConversionTracking:(NSDictionary *)notification
 + (void)logOpenNotification:(NSDictionary *)notification
                 toAnalytics:(id<FIRAnalyticsInterop> _Nullable)analytics;
 + (void)logForegroundNotification:(NSDictionary *)notification
-                      toAnalytics:(id<FIRAnalyticsInterop> _Nullable)analytics ;;
+                      toAnalytics:(id<FIRAnalyticsInterop> _Nullable)analytics;
 + (void)logEvent:(NSString *)event
 withNotification:(NSDictionary *)notification
      toAnalytics:(id<FIRAnalyticsInterop> _Nullable)analytics ;;
@@ -398,7 +398,7 @@ - (void)testLogMessage {
                                  @"google.c.a.e" : @"1",
                                  };
   [FIRMessagingAnalytics logMessage:notification toAnalytics:nil];
-  OCMVerify([self.logClassMock logForegroundNotification:notification toAnalytics:nil]);
+  OCMVerify([self.logClassMock logEvent:OCMOCK_ANY withNotification:notification toAnalytics:nil]);
 }
 
 - (void)testLogOpenNotification {