diff options
Diffstat (limited to 'chromium/third_party/webrtc/base/gunit.h')
| -rw-r--r-- | chromium/third_party/webrtc/base/gunit.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/chromium/third_party/webrtc/base/gunit.h b/chromium/third_party/webrtc/base/gunit.h index 7431fcf308e..1a6c36374e9 100644 --- a/chromium/third_party/webrtc/base/gunit.h +++ b/chromium/third_party/webrtc/base/gunit.h @@ -13,30 +13,29 @@ #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" -#if defined(WEBRTC_ANDROID) || defined(GTEST_RELATIVE_PATH) +#if defined(GTEST_RELATIVE_PATH) #include "testing/gtest/include/gtest/gtest.h" #else #include "testing/base/public/gunit.h" #endif // Wait until "ex" is true, or "timeout" expires. -#define WAIT(ex, timeout) \ - for (uint32 start = rtc::Time(); \ - !(ex) && rtc::Time() < start + timeout;) \ +#define WAIT(ex, timeout) \ + for (uint32_t start = rtc::Time(); !(ex) && rtc::Time() < start + timeout;) \ rtc::Thread::Current()->ProcessMessages(1); // This returns the result of the test in res, so that we don't re-evaluate // the expression in the XXXX_WAIT macros below, since that causes problems // when the expression is only true the first time you check it. -#define WAIT_(ex, timeout, res) \ - do { \ - uint32 start = rtc::Time(); \ - res = (ex); \ +#define WAIT_(ex, timeout, res) \ + do { \ + uint32_t start = rtc::Time(); \ + res = (ex); \ while (!res && rtc::Time() < start + timeout) { \ - rtc::Thread::Current()->ProcessMessages(1); \ - res = (ex); \ - } \ - } while (0); + rtc::Thread::Current()->ProcessMessages(1); \ + res = (ex); \ + } \ + } while (0) // The typical EXPECT_XXXX and ASSERT_XXXXs, but done until true or a timeout. #define EXPECT_TRUE_WAIT(ex, timeout) \ @@ -44,28 +43,28 @@ bool res; \ WAIT_(ex, timeout, res); \ if (!res) EXPECT_TRUE(ex); \ - } while (0); + } while (0) #define EXPECT_EQ_WAIT(v1, v2, timeout) \ do { \ bool res; \ WAIT_(v1 == v2, timeout, res); \ if (!res) EXPECT_EQ(v1, v2); \ - } while (0); + } while (0) #define ASSERT_TRUE_WAIT(ex, timeout) \ do { \ bool res; \ WAIT_(ex, timeout, res); \ if (!res) ASSERT_TRUE(ex); \ - } while (0); + } while (0) #define ASSERT_EQ_WAIT(v1, v2, timeout) \ do { \ bool res; \ WAIT_(v1 == v2, timeout, res); \ if (!res) ASSERT_EQ(v1, v2); \ - } while (0); + } while (0) // Version with a "soft" timeout and a margin. This logs if the timeout is // exceeded, but it only fails if the expression still isn't true after the @@ -83,6 +82,6 @@ if (!res) { \ EXPECT_TRUE(ex); \ } \ - } while (0); + } while (0) #endif // WEBRTC_BASE_GUNIT_H_ |