diff options
Diffstat (limited to 'Example/Core/Tests/FIRLoggerTest.m')
| -rw-r--r-- | Example/Core/Tests/FIRLoggerTest.m | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m index b871244..f179bde 100644 --- a/Example/Core/Tests/FIRLoggerTest.m +++ b/Example/Core/Tests/FIRLoggerTest.m @@ -17,7 +17,10 @@ #import "FIRTestCase.h" +// TODO - FIRLoggerTest should be split into a separate FIRLoggerTest and GULLoggerTest. +// No test should include both includes. #import <FirebaseCore/FIRLogger.h> +#import <GoogleUtilities/GULLogger.h> #import <asl.h> @@ -25,19 +28,19 @@ extern NSString *const kFIRDisableDebugModeApplicationArgument; extern NSString *const kFIREnableDebugModeApplicationArgument; -extern NSString *const kFIRPersistedDebugModeKey; +extern NSString *const kGULPersistedDebugModeKey; -extern const char *kFIRLoggerASLClientFacilityName; +extern const char *kGULLoggerASLClientFacilityName; extern void FIRResetLogger(void); extern void FIRSetLoggerUserDefaults(NSUserDefaults *defaults); -extern aslclient getFIRLoggerClient(void); +extern aslclient getGULLoggerClient(void); -extern dispatch_queue_t getFIRClientQueue(void); +extern dispatch_queue_t getGULClientQueue(void); -extern BOOL getFIRLoggerDebugMode(void); +extern BOOL getGULLoggerDebugMode(void); static NSString *const kMessageCode = @"I-COR000001"; @@ -95,9 +98,11 @@ static NSString *const kMessageCode = @"I-COR000001"; FIRLogError(kFIRLoggerCore, kMessageCode, @"Some error."); // Assert. - NSNumber *debugMode = [self.defaults objectForKey:kFIRPersistedDebugModeKey]; +#if MAKE_THREAD_SAFE + NSNumber *debugMode = [self.defaults objectForKey:kGULPersistedDebugModeKey]; XCTAssertNil(debugMode); - XCTAssertFalse(getFIRLoggerDebugMode()); + XCTAssertFalse(getGULLoggerDebugMode()); +#endif // Stop. [processInfoMock stopMocking]; @@ -112,10 +117,12 @@ static NSString *const kMessageCode = @"I-COR000001"; // Test. FIRLogError(kFIRLoggerCore, kMessageCode, @"Some error."); +#ifdef MAKE_THREAD_SAFE // Assert. - NSNumber *debugMode = [self.defaults objectForKey:kFIRPersistedDebugModeKey]; + NSNumber *debugMode = [self.defaults objectForKey:kGULPersistedDebugModeKey]; XCTAssertTrue(debugMode.boolValue); - XCTAssertTrue(getFIRLoggerDebugMode()); + XCTAssertTrue(getGULLoggerDebugMode()); +#endif // Stop. [processInfoMock stopMocking]; @@ -124,15 +131,17 @@ static NSString *const kMessageCode = @"I-COR000001"; - (void)testInitializeASLForDebugModeWithUserDefaults { // Stub. NSNumber *debugMode = @YES; - [self.defaults setBool:debugMode.boolValue forKey:kFIRPersistedDebugModeKey]; + [self.defaults setBool:debugMode.boolValue forKey:kGULPersistedDebugModeKey]; // Test. FIRLogError(kFIRLoggerCore, kMessageCode, @"Some error."); // Assert. - debugMode = [self.defaults objectForKey:kFIRPersistedDebugModeKey]; + debugMode = [self.defaults objectForKey:kGULPersistedDebugModeKey]; XCTAssertTrue(debugMode.boolValue); - XCTAssertTrue(getFIRLoggerDebugMode()); +#if MAKE_THREAD_SAFE + XCTAssertTrue(getGULLoggerDebugMode()); +#endif } - (void)testMessageCodeFormat { @@ -240,7 +249,7 @@ static NSString *const kMessageCode = @"I-COR000001"; - (void)drainFIRClientQueue { dispatch_semaphore_t workerSemaphore = dispatch_semaphore_create(0); - dispatch_async(getFIRClientQueue(), ^{ + dispatch_async(getGULClientQueue(), ^{ dispatch_semaphore_signal(workerSemaphore); }); dispatch_semaphore_wait(workerSemaphore, DISPATCH_TIME_FOREVER); @@ -250,8 +259,8 @@ static NSString *const kMessageCode = @"I-COR000001"; #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_set_query(query, ASL_KEY_FACILITY, kGULLoggerASLClientFacilityName, ASL_QUERY_OP_EQUAL); + aslresponse r = asl_search(getGULLoggerClient(), query); asl_free(query); aslmsg m; const char *val; |