make ReportMessage take a list of reporters instead of using globals

Having the global list of reporters is holding us back in PR facebookarchive#51.
@yiding is parallelizing test runs, buffering their reporter events
until the test is finished, and then flushing all the reporter events at
at the end.  In this case, we need the events from ReportMessage(...)
to feed into the BufferedReporters intead of sidestepping it and going
for the globals.

Tests pass, and via manual testing verified that reporter messages show
up correctly.

Author: fpotter

xctool/xctool/OCUnitIOSAppTestRunner.m

@@ -222,14 +222,16 @@ - (BOOL)runTestsAndFeedOutputTo:(void (^)(NSString *))outputLineBlock error:(NSS
   NSString *testHostBundleID = plist[@"CFBundleIdentifier"];
 
   if (_freshSimulator) {
-    ReportMessage(REPORTER_MESSAGE_INFO,
+    ReportMessage(_reporters,
+                  REPORTER_MESSAGE_INFO,
                   @"Stopping any existing iOS simulator jobs to get a "
                   @"fresh simulator.");
     KillSimulatorJobs();
   }
 
   if (_freshInstall) {
-    ReportMessage(REPORTER_MESSAGE_INFO,
+    ReportMessage(_reporters,
+                  REPORTER_MESSAGE_INFO,
                   @"Uninstalling '%@' to get a fresh install.",
                   testHostBundleID);
     BOOL uninstalled = [self runMobileInstallationHelperWithArguments:@[
@@ -255,7 +257,7 @@ - (BOOL)runTestsAndFeedOutputTo:(void (^)(NSString *))outputLineBlock error:(NSS
   //
   // By making sure the app is already installed, we guarantee the environment
   // is always set correctly.
-  ReportMessage(REPORTER_MESSAGE_INFO, @"Installing '%@' ...", testHostAppPath);
+  ReportMessage(_reporters, REPORTER_MESSAGE_INFO, @"Installing '%@' ...", testHostAppPath);
   BOOL installed = [self runMobileInstallationHelperWithArguments:@[
                     @"install",
                     testHostAppPath,
@@ -267,7 +269,8 @@ - (BOOL)runTestsAndFeedOutputTo:(void (^)(NSString *))outputLineBlock error:(NSS
     return NO;
   }
 
-  ReportMessage(REPORTER_MESSAGE_INFO,
+  ReportMessage(_reporters,
+                REPORTER_MESSAGE_INFO,
                 @"Launching test host and running tests...");
   if (![self runTestsInSimulator:testHostAppPath feedOutputToBlock:outputLineBlock]) {
     *error = [NSString stringWithFormat:@"Failed to run tests"];

xctool/xctool/Options.m

@@ -258,11 +258,15 @@ - (BOOL)validateOptions:(NSString **)errorMessage
     }
 
     if (targetMatch.workspacePath) {
-      ReportMessage(REPORTER_MESSAGE_INFO,
+      ReportMessage(
+        _reporters,
+        REPORTER_MESSAGE_INFO,
         @"Found target %@. Using workspace path %@, scheme %@.",
         self.findTarget, targetMatch.workspacePath, targetMatch.schemeName);
     } else {
-      ReportMessage(REPORTER_MESSAGE_INFO,
+      ReportMessage(
+        _reporters,
+        REPORTER_MESSAGE_INFO,
         @"Found target %@. Using project path %@, scheme %@.",
         self.findTarget, targetMatch.projectPath, targetMatch.schemeName);
     }

xctool/xctool/Reporter.h

@@ -116,10 +116,7 @@ typedef enum {
 
 NSString *ReporterMessageLevelToString(ReporterMessageLevel level);
 
-void RegisterReporters(NSArray *reporters);
-void UnregisterReporters(NSArray *reporters);
-
-void ReportMessage(ReporterMessageLevel level, NSString *format, ...) NS_FORMAT_FUNCTION(2, 3);
+void ReportMessage(NSArray *reporters, ReporterMessageLevel level, NSString *format, ...) NS_FORMAT_FUNCTION(3, 4);
 
 @interface Reporter : NSObject
 {

xctool/xctool/Reporter.m

@@ -39,25 +39,11 @@
   }
 }
 
-static NSArray *RegisteredReporters = nil;
-
-void RegisterReporters(NSArray *reporters) {
-  NSCAssert(RegisteredReporters == nil, @"Cannot register reporters twice.");
-  NSCAssert(reporters != nil, @"Must have array of reporters to register.");
-  RegisteredReporters = [reporters retain];
-}
-
-void UnregisterReporters(NSArray *reporters) {
-  NSCAssert(reporters == RegisteredReporters, @"Cannot unregister reporters without first registering.");
-  [RegisteredReporters release];
-  RegisteredReporters = nil;
-}
-
-void ReportMessage(ReporterMessageLevel level, NSString *format, ...) {
+void ReportMessage(NSArray *reporters, ReporterMessageLevel level, NSString *format, ...) {
   va_list args;
   va_start(args, format);
-
   NSString *message = [[[NSString alloc] initWithFormat:format arguments:args] autorelease];
+  va_end(args);
 
   NSDate *now = [NSDate date];
   NSDictionary *event = @{
@@ -67,10 +53,8 @@ void ReportMessage(ReporterMessageLevel level, NSString *format, ...) {
     kReporter_Message_LevelKey: ReporterMessageLevelToString(level),
   };
 
-  for (Reporter *reporter in RegisteredReporters) {
-    [reporter message:event];
-  }
-  va_end(args);
+  [reporters makeObjectsPerformSelector:@selector(handleEvent:)
+                             withObject:event];
 }
 
 @implementation Reporter

xctool/xctool/XCTool.m

@@ -165,9 +165,6 @@ - (void)run
     }
   }
 
-  // After this point, we can start reporting messages.
-  RegisterReporters(options.reporters);
-
   // We want to make sure we always unregister the reporters, even if validation fails,
   // so we use a try-finally block.
   @try {
@@ -205,9 +202,6 @@ - (void)run
     }
   } @finally {
     [options.reporters makeObjectsPerformSelector:@selector(close)];
-
-    // After this point, we can no longer report messages.
-    UnregisterReporters(options.reporters);
   }
 }