Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: webrtc/base/testutils.h

Issue 2819473004: base/testutils.h: Use namespace webrtc::testing instead of plain testing (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/virtualsocket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/testutils.h
diff --git a/webrtc/base/testutils.h b/webrtc/base/testutils.h
index 305d3d0a6b7df6555f022cc5775541a128f3f937..cda7a8457e73064353919bfdb0efc77e19a3fbe5 100644
--- a/webrtc/base/testutils.h
+++ b/webrtc/base/testutils.h
@@ -37,6 +37,7 @@
#include "webrtc/base/stringutils.h"
#include "webrtc/base/thread.h"
+namespace webrtc {
namespace testing {
using namespace rtc;
@@ -420,21 +421,21 @@ class SocketTestServer : public sigslot::has_slots<> {
// Unittest predicates which are similar to STREQ, but for raw memory
///////////////////////////////////////////////////////////////////////////////
-inline AssertionResult CmpHelperMemEq(const char* expected_expression,
- const char* expected_length_expression,
- const char* actual_expression,
- const char* actual_length_expression,
- const void* expected,
- size_t expected_length,
- const void* actual,
- size_t actual_length)
-{
+inline ::testing::AssertionResult CmpHelperMemEq(
+ const char* expected_expression,
+ const char* expected_length_expression,
+ const char* actual_expression,
+ const char* actual_length_expression,
+ const void* expected,
+ size_t expected_length,
+ const void* actual,
+ size_t actual_length) {
if ((expected_length == actual_length)
&& (0 == memcmp(expected, actual, expected_length))) {
- return AssertionSuccess();
+ return ::testing::AssertionSuccess();
}
- Message msg;
+ ::testing::Message msg;
msg << "Value of: " << actual_expression
<< " [" << actual_length_expression << "]";
if (true) { //!actual_value.Equals(actual_expression)) {
@@ -558,6 +559,8 @@ inline bool IsScreencastingAvailable() {
#endif
return true;
}
+
} // namespace testing
+} // namespace webrtc
#endif // WEBRTC_BASE_TESTUTILS_H__
« no previous file with comments | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/virtualsocket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698