zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify the implementation of LoggingTest.

Browse Source 
This removes dependency on ConditionVariableWrapper and CriticalSectionWrapper which currently have a 'friend' relationship that I'd like to get rid of.

BUG=

Review URL: https://codereview.webrtc.org/1590983005

Cr-Commit-Position: refs/heads/master@{#11292}
This commit is contained in:
tommi
2016-01-18 10:20:17 -08:00
committed by Commit bot
parent f8c2baca4e
commit aff4b70db0
1 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
webrtc/system_wrappers/source/logging_unittest.cc
View File

@ -11,66 +11,48 @@
#include "webrtc/system_wrappers/include/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/event.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/system_wrappers/include/condition_variable_wrapper.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/system_wrappers/include/trace.h"
namespace webrtc {
namespace {
const char kTestLogString[] = "Incredibly important test message!(?)";
const int kTestLevel = kTraceWarning;
class LoggingTest : public ::testing::Test, public TraceCallback {
class LoggingTestCallback : public TraceCallback {
public:
virtual void Print(TraceLevel level, const char* msg, int length) {
CriticalSectionScoped cs(crit_.get());
// We test the length here to ensure (with high likelihood) that only our
// traces will be tested.
if (level_ != kTraceNone && static_cast<int>(expected_log_.str().size()) ==
length - Trace::kBoilerplateLength - 1) {
EXPECT_EQ(level_, level);
EXPECT_EQ(expected_log_.str(), &msg[Trace::kBoilerplateLength]);
level_ = kTraceNone;
cv_->Wake();
LoggingTestCallback(rtc::Event* event) : event_(event) {}
private:
void Print(TraceLevel level, const char* msg, int length) override {
if (static_cast<size_t>(length) < arraysize(kTestLogString) ||
level != kTestLevel) {
return;
}
std::string msg_str(msg, length);
if (msg_str.find(kTestLogString) != std::string::npos)
event_->Set();
}
protected:
LoggingTest()
: crit_(CriticalSectionWrapper::CreateCriticalSection()),
cv_(ConditionVariableWrapper::CreateConditionVariable()),
level_(kTraceNone),
expected_log_() {
}
void SetUp() {
Trace::CreateTrace();
Trace::SetTraceCallback(this);
}
void TearDown() {
Trace::SetTraceCallback(NULL);
Trace::ReturnTrace();
CriticalSectionScoped cs(crit_.get());
ASSERT_EQ(kTraceNone, level_) << "Print() was not called";
}
rtc::scoped_ptr<CriticalSectionWrapper> crit_;
rtc::scoped_ptr<ConditionVariableWrapper> cv_;
TraceLevel level_ GUARDED_BY(crit_);
std::ostringstream expected_log_ GUARDED_BY(crit_);
rtc::Event* const event_;
};
TEST_F(LoggingTest, LogStream) {
{
CriticalSectionScoped cs(crit_.get());
level_ = kTraceWarning;
std::string msg = "Important message";
expected_log_ << "(logging_unittest.cc:" << __LINE__ + 1 << "): " << msg;
LOG(LS_WARNING) << msg;
cv_->SleepCS(*crit_.get(), 2000);
}
}
} // namespace
TEST(LoggingTest, LogStream) {
Trace::CreateTrace();
rtc::Event event(false, false);
LoggingTestCallback callback(&event);
Trace::SetTraceCallback(&callback);
LOG(LS_WARNING) << kTestLogString;
EXPECT_TRUE(event.Wait(2000));
Trace::SetTraceCallback(nullptr);
Trace::ReturnTrace();
}
} // namespace webrtc