Adding support for logging severity LS_NONE.

Bug: webrtc:8735
Change-Id: I07247ce67983f873febb8d8d32c25032a4608eae
Reviewed-on: https://webrtc-review.googlesource.com/c/40400
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Peter Hanspers <peterhanspers@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25197}
This commit is contained in:
Peter Hanspers
2018-10-15 22:47:38 +02:00
committed by Commit Bot
parent 2e47f7c4ee
commit d419db9a9e
4 changed files with 24 additions and 0 deletions

View File

@ -86,6 +86,8 @@ class CallbackLogSink : public rtc::LogSink {
return rtc::LS_WARNING;
case RTCLoggingSeverityError:
return rtc::LS_ERROR;
case RTCLoggingSeverityNone:
return rtc::LS_NONE;
}
}

View File

@ -18,6 +18,7 @@ typedef NS_ENUM(NSInteger, RTCLoggingSeverity) {
RTCLoggingSeverityInfo,
RTCLoggingSeverityWarning,
RTCLoggingSeverityError,
RTCLoggingSeverityNone,
};
// Wrapper for C++ RTC_LOG(sev) macros.

View File

@ -22,6 +22,8 @@ rtc::LoggingSeverity RTCGetNativeLoggingSeverity(RTCLoggingSeverity severity) {
return rtc::LS_WARNING;
case RTCLoggingSeverityError:
return rtc::LS_ERROR;
case RTCLoggingSeverityNone:
return rtc::LS_NONE;
}
}

View File

@ -66,6 +66,25 @@
[self waitForExpectations:@[ callbackExpectation ] timeout:10.0];
}
- (void)testCallbackDoesNotgetCalledForSeverityNone {
self.logger.severity = RTCLoggingSeverityNone;
XCTestExpectation *callbackExpectation = [self expectationWithDescription:@"unexpectedCallback"];
[self.logger start:^(NSString *message) {
[callbackExpectation fulfill];
XCTAssertTrue(false);
}];
RTCLogInfo("Just some info");
RTCLogWarning("Warning warning");
RTCLogError("Horrible error");
XCTWaiter *waiter = [[XCTWaiter alloc] init];
XCTWaiterResult result = [waiter waitForExpectations:@[ callbackExpectation ] timeout:1.0];
XCTAssertEqual(result, XCTWaiterResultTimedOut);
}
- (void)testStartingWithNilCallbackDoesNotCrash {
[self.logger start:nil];