
Macro incorrectly displays DISABLED_ON_ANDROID in test names for parameterized tests under --gtest_list_tests, causing tests to be disabled on all platforms since they contain the DISABLED_ prefix rather than their expanded variants. This expands the macro variants to inline if they're disabled or not, and removes building some tests under configurations where they should fail, instead of building them but disabling them by default. The change also removes gtest_disable.h as an unused include from many other files. BUG=webrtc:5387, webrtc:5400 R=kjellander@webrtc.org, phoglund@webrtc.org TBR=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1547343002 . Cr-Commit-Position: refs/heads/master@{#11150}
48 lines
1.3 KiB
C++
48 lines
1.3 KiB
C++
/*
|
|
* Copyright 2012 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/gunit.h"
|
|
#include "webrtc/base/nullsocketserver.h"
|
|
|
|
namespace rtc {
|
|
|
|
static const uint32_t kTimeout = 5000U;
|
|
|
|
class NullSocketServerTest
|
|
: public testing::Test,
|
|
public MessageHandler {
|
|
public:
|
|
NullSocketServerTest() {}
|
|
protected:
|
|
virtual void OnMessage(Message* message) {
|
|
ss_.WakeUp();
|
|
}
|
|
NullSocketServer ss_;
|
|
};
|
|
|
|
TEST_F(NullSocketServerTest, WaitAndSet) {
|
|
Thread thread;
|
|
EXPECT_TRUE(thread.Start());
|
|
thread.Post(this, 0);
|
|
// The process_io will be ignored.
|
|
const bool process_io = true;
|
|
EXPECT_TRUE_WAIT(ss_.Wait(SocketServer::kForever, process_io), kTimeout);
|
|
}
|
|
|
|
TEST_F(NullSocketServerTest, TestWait) {
|
|
uint32_t start = Time();
|
|
ss_.Wait(200, true);
|
|
// The actual wait time is dependent on the resolution of the timer used by
|
|
// the Event class. Allow for the event to signal ~20ms early.
|
|
EXPECT_GE(TimeSince(start), 180);
|
|
}
|
|
|
|
} // namespace rtc
|