Move -messageWasLogged to FIRTestCase

This makes it accessible to other test classes.

3 files changed, 38 insertions, 24 deletions

diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m
index 5cc7465..6430bad 100644
--- a/Example/Core/Tests/FIRLoggerTest.m
+++ b/Example/Core/Tests/FIRLoggerTest.m
@@ -30,8 +30,6 @@ extern const char *kFIRLoggerCustomASLMessageFormat;
 
 extern void FIRResetLogger(void);
 
-extern aslclient getFIRLoggerClient(void);
-
 extern dispatch_queue_t getFIRClientQueue(void);
 
 extern BOOL getFIRLoggerDebugMode(void);
@@ -244,26 +242,4 @@ static NSString *const kMessageCode = @"I-COR000001";
   dispatch_semaphore_wait(workerSemaphore, DISPATCH_TIME_FOREVER);
 }
 
-- (BOOL)messageWasLogged:(NSString *)message {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  aslmsg query = asl_new(ASL_TYPE_QUERY);
-  asl_set_query(query, ASL_KEY_FACILITY, kFIRLoggerASLClientFacilityName, ASL_QUERY_OP_EQUAL);
-  aslresponse r = asl_search(getFIRLoggerClient(), query);
-  asl_free(query);
-  aslmsg m;
-  const char *val;
-  NSMutableArray *allMsg = [[NSMutableArray alloc] init];
-  while ((m = asl_next(r)) != NULL) {
-    val = asl_get(m, ASL_KEY_MSG);
-    if (val) {
-      [allMsg addObject:[NSString stringWithUTF8String:val]];
-    }
-  }
-  asl_free(m);
-  asl_release(r);
-  return [allMsg containsObject:message];
-#pragma clang pop
-}
-
 @end
diff --git a/Example/Core/Tests/FIRTestCase.h b/Example/Core/Tests/FIRTestCase.h
index acc7b16..f706b46 100644
--- a/Example/Core/Tests/FIRTestCase.h
+++ b/Example/Core/Tests/FIRTestCase.h
@@ -40,6 +40,15 @@ extern NSString *const kProjectID;
  */
 @interface FIRTestCase : XCTestCase
 
+
+/**
+ Checks to to see if a given message was recently logged to FIRLogger.
+
+ @param message The log message to look for.
+ @return Whether or not the given message was recently logged to the console.
+ */
+- (BOOL)messageWasLogged:(NSString *)message;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Example/Core/Tests/FIRTestCase.m b/Example/Core/Tests/FIRTestCase.m
index b52886b..123f332 100644
--- a/Example/Core/Tests/FIRTestCase.m
+++ b/Example/Core/Tests/FIRTestCase.m
@@ -14,6 +14,11 @@
 
 #import "FIRTestCase.h"
 
+#import <asl.h>
+
+extern aslclient getFIRLoggerClient(void);
+extern const char *kFIRLoggerASLClientFacilityName;
+
 NSString *const kAPIKey = @"correct_api_key";
 NSString *const kCustomizedAPIKey = @"customized_api_key";
 NSString *const kClientID = @"correct_client_id";
@@ -43,4 +48,28 @@ NSString *const kProjectID = @"abc-xyz-123";
   [super tearDown];
 }
 
+#pragma mark - Helper Methods
+
+- (BOOL)messageWasLogged:(NSString *)message {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+  aslmsg query = asl_new(ASL_TYPE_QUERY);
+  asl_set_query(query, ASL_KEY_FACILITY, kFIRLoggerASLClientFacilityName, ASL_QUERY_OP_EQUAL);
+  aslresponse r = asl_search(getFIRLoggerClient(), query);
+  asl_free(query);
+  aslmsg m;
+  const char *val;
+  NSMutableArray *allMsg = [[NSMutableArray alloc] init];
+  while ((m = asl_next(r)) != NULL) {
+    val = asl_get(m, ASL_KEY_MSG);
+    if (val) {
+      [allMsg addObject:[NSString stringWithUTF8String:val]];
+    }
+  }
+  asl_free(m);
+  asl_release(r);
+  return [allMsg containsObject:message];
+#pragma clang pop
+}
+
 @end