Skip to content

Commit dfda142

Browse files
committed
Move -messageWasLogged to FIRTestCase
This makes it accessible to other test classes.
1 parent f735461 commit dfda142

File tree

3 files changed

+38
-24
lines changed

3 files changed

+38
-24
lines changed

Example/Core/Tests/FIRLoggerTest.m

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030

3131
extern void FIRResetLogger(void);
3232

33-
extern aslclient getFIRLoggerClient(void);
34-
3533
extern dispatch_queue_t getFIRClientQueue(void);
3634

3735
extern BOOL getFIRLoggerDebugMode(void);
@@ -244,26 +242,4 @@ - (void)drainFIRClientQueue {
244242
dispatch_semaphore_wait(workerSemaphore, DISPATCH_TIME_FOREVER);
245243
}
246244

247-
- (BOOL)messageWasLogged:(NSString *)message {
248-
#pragma clang diagnostic push
249-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
250-
aslmsg query = asl_new(ASL_TYPE_QUERY);
251-
asl_set_query(query, ASL_KEY_FACILITY, kFIRLoggerASLClientFacilityName, ASL_QUERY_OP_EQUAL);
252-
aslresponse r = asl_search(getFIRLoggerClient(), query);
253-
asl_free(query);
254-
aslmsg m;
255-
const char *val;
256-
NSMutableArray *allMsg = [[NSMutableArray alloc] init];
257-
while ((m = asl_next(r)) != NULL) {
258-
val = asl_get(m, ASL_KEY_MSG);
259-
if (val) {
260-
[allMsg addObject:[NSString stringWithUTF8String:val]];
261-
}
262-
}
263-
asl_free(m);
264-
asl_release(r);
265-
return [allMsg containsObject:message];
266-
#pragma clang pop
267-
}
268-
269245
@end

Example/Core/Tests/FIRTestCase.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ extern NSString *const kProjectID;
4040
*/
4141
@interface FIRTestCase : XCTestCase
4242

43+
44+
/**
45+
Checks to to see if a given message was recently logged to FIRLogger.
46+
47+
@param message The log message to look for.
48+
@return Whether or not the given message was recently logged to the console.
49+
*/
50+
- (BOOL)messageWasLogged:(NSString *)message;
51+
4352
@end
4453

4554
NS_ASSUME_NONNULL_END

Example/Core/Tests/FIRTestCase.m

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414

1515
#import "FIRTestCase.h"
1616

17+
#import <asl.h>
18+
19+
extern aslclient getFIRLoggerClient(void);
20+
extern const char *kFIRLoggerASLClientFacilityName;
21+
1722
NSString *const kAPIKey = @"correct_api_key";
1823
NSString *const kCustomizedAPIKey = @"customized_api_key";
1924
NSString *const kClientID = @"correct_client_id";
@@ -43,4 +48,28 @@ - (void)tearDown {
4348
[super tearDown];
4449
}
4550

51+
#pragma mark - Helper Methods
52+
53+
- (BOOL)messageWasLogged:(NSString *)message {
54+
#pragma clang diagnostic push
55+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
56+
aslmsg query = asl_new(ASL_TYPE_QUERY);
57+
asl_set_query(query, ASL_KEY_FACILITY, kFIRLoggerASLClientFacilityName, ASL_QUERY_OP_EQUAL);
58+
aslresponse r = asl_search(getFIRLoggerClient(), query);
59+
asl_free(query);
60+
aslmsg m;
61+
const char *val;
62+
NSMutableArray *allMsg = [[NSMutableArray alloc] init];
63+
while ((m = asl_next(r)) != NULL) {
64+
val = asl_get(m, ASL_KEY_MSG);
65+
if (val) {
66+
[allMsg addObject:[NSString stringWithUTF8String:val]];
67+
}
68+
}
69+
asl_free(m);
70+
asl_release(r);
71+
return [allMsg containsObject:message];
72+
#pragma clang pop
73+
}
74+
4675
@end

0 commit comments

Comments
 (0)