Perform all the writes in close

This fixes the bug reported in issue facebookarchive#64.

Author: Greg Haines

xctool/xctool/JUnitReporter.m

@@ -1,5 +1,9 @@
 #import "JUnitReporter.h"
 
+#pragma mark Constants
+#define kJUnitReporter_Suite_Event @"event"
+#define kJUnitReporter_Suite_Results @"results"
+
 #pragma mark Private Interface
 @interface JUnitReporter ()
 
@@ -26,6 +30,11 @@ - (id)init
   if (self = [super init]) {
     _formatter = [[NSDateFormatter alloc] init];
     [_formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZZ"];
+    self.testSuites = [NSMutableArray array];
+    self.totalTests = 0;
+    self.totalFailures = 0;
+    self.totalErrors = 0;
+    self.totalTime = 0.0;
   }
   return self;
 }
@@ -39,15 +48,6 @@ - (void)dealloc
 }
 
 #pragma mark Reporter
-- (void)beginOcunit:(NSDictionary *)event
-{
-  self.testSuites = [NSMutableArray array];
-  self.totalTests = 0;
-  self.totalFailures = 0;
-  self.totalErrors = 0;
-  self.totalTime = 0.0;
-}
-
 - (void)beginTestSuite:(NSDictionary *)event
 {
   self.testResults = [NSMutableArray array];
@@ -66,24 +66,23 @@ - (void)endTestSuite:(NSDictionary *)event
     self.totalErrors += [event[kReporter_EndTestSuite_UnexpectedExceptionCountKey] intValue];
     self.totalTime += [event[kReporter_EndTestSuite_TotalDurationKey] floatValue];
     [self.testSuites addObject:@{
-      @"event": event,
-      @"results": self.testResults
+      kJUnitReporter_Suite_Event: event,
+      kJUnitReporter_Suite_Results: self.testResults
     }];
     self.testResults = nil;
   }
 }
 
-- (void)endOcunit:(NSDictionary *)event
+- (void)close
 {
   [self write:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"];
   [self writeWithFormat:
-   @"<testsuites name=\"%@\" tests=\"%d\" failures=\"%d\" errors=\"%d\" time=\"%f\">\n",
-   [self xmlEscape:event[kReporter_EndOCUnit_BundleNameKey]],
+   @"<testsuites name=\"AllTestUnits\" tests=\"%d\" failures=\"%d\" errors=\"%d\" time=\"%f\">\n",
    self.totalTests, self.totalFailures, self.totalErrors, self.totalTime];
 
   for (NSDictionary *testSuite in self.testSuites) {
-    NSDictionary *suiteEvent = testSuite[@"event"];
-    NSArray *suiteResults = testSuite[@"results"];
+    NSDictionary *suiteEvent = testSuite[kJUnitReporter_Suite_Event];
+    NSArray *suiteResults = testSuite[kJUnitReporter_Suite_Results];
     [self writeWithFormat:
      @"\t<testsuite name=\"%@\" tests=\"%d\" failures=\"%d\" errors=\"%d\" "
      @"time=\"%f\" timestamp=\"%@\">\n",
@@ -119,6 +118,7 @@ - (void)endOcunit:(NSDictionary *)event
   }
   [self write:@"</testsuites>\n"];
   self.testSuites = nil;
+  [super close];
 }
 
 #pragma mark Private Methods