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

Unified Diff: net/test/gtest_util.h

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: net/test/gtest_util.h
diff --git a/net/test/gtest_util.h b/net/test/gtest_util.h
index 14492c2a780c77dc51702d10ac4d77e6ba576e99..46418c7663ff3e6bfd355f3f1be6e231b393315d 100644
--- a/net/test/gtest_util.h
+++ b/net/test/gtest_util.h
@@ -17,26 +17,24 @@ namespace test {
// Internal implementation for the EXPECT_DFATAL and ASSERT_DFATAL
// macros. Do not use this directly.
-#define GTEST_DFATAL_(statement, matcher, fail) \
- GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
- if (true) { \
- ::net::test::ScopedMockLog gtest_log; \
- ::net::test::ScopedDisableExitOnDFatal gtest_disable_exit; \
- using ::testing::_; \
- EXPECT_CALL(gtest_log, Log(_, _, _, _, _)) \
- .WillRepeatedly(::testing::Return(false)); \
- EXPECT_CALL(gtest_log, Log(logging::LOG_DFATAL, _, _, _, matcher)) \
- .Times(::testing::AtLeast(1)) \
- .WillOnce(::testing::Return(false)); \
- gtest_log.StartCapturingLogs(); \
- { statement; } \
- gtest_log.StopCapturingLogs(); \
- if (!testing::Mock::VerifyAndClear(&gtest_log)) { \
- goto GTEST_CONCAT_TOKEN_(gtest_label_dfatal_, __LINE__); \
- } \
- } else \
- GTEST_CONCAT_TOKEN_(gtest_label_dfatal_, __LINE__): \
- fail("")
+#define GTEST_DFATAL_(statement, matcher, fail) \
+ GTEST_AMBIGUOUS_ELSE_BLOCKER_ if (true) { \
+ ::net::test::ScopedMockLog gtest_log; \
+ ::net::test::ScopedDisableExitOnDFatal gtest_disable_exit; \
+ using ::testing::_; \
+ EXPECT_CALL(gtest_log, Log(_, _, _, _, _)) \
+ .WillRepeatedly(::testing::Return(false)); \
+ EXPECT_CALL(gtest_log, Log(logging::LOG_DFATAL, _, _, _, matcher)) \
+ .Times(::testing::AtLeast(1)) \
+ .WillOnce(::testing::Return(false)); \
+ gtest_log.StartCapturingLogs(); \
+ { statement; } \
+ gtest_log.StopCapturingLogs(); \
+ if (!testing::Mock::VerifyAndClear(&gtest_log)) { \
+ goto GTEST_CONCAT_TOKEN_(gtest_label_dfatal_, __LINE__); \
+ } \
+ } \
+ else GTEST_CONCAT_TOKEN_(gtest_label_dfatal_, __LINE__) : fail("")
// The EXPECT_DFATAL and ASSERT_DFATAL macros are lightweight
// alternatives to EXPECT_DEBUG_DEATH and ASSERT_DEBUG_DEATH. They
@@ -69,27 +67,23 @@ namespace test {
#ifndef NDEBUG
-#define EXPECT_DEBUG_DFATAL(statement, regex) \
- EXPECT_DFATAL(statement, regex)
-#define ASSERT_DEBUG_DFATAL(statement, regex) \
- ASSERT_DFATAL(statement, regex)
+#define EXPECT_DEBUG_DFATAL(statement, regex) EXPECT_DFATAL(statement, regex)
+#define ASSERT_DEBUG_DFATAL(statement, regex) ASSERT_DFATAL(statement, regex)
#else // NDEBUG
#define EXPECT_DEBUG_DFATAL(statement, regex) \
- GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
- if (true) { \
+ GTEST_AMBIGUOUS_ELSE_BLOCKER_ if (true) { \
(void)(regex); \
statement; \
- } else \
- GTEST_NONFATAL_FAILURE_("")
+ } \
+ else GTEST_NONFATAL_FAILURE_("")
#define ASSERT_DEBUG_DFATAL(statement, regex) \
- GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
- if (true) { \
+ GTEST_AMBIGUOUS_ELSE_BLOCKER_ if (true) { \
(void)(regex); \
statement; \
- } else \
- GTEST_NONFATAL_FAILURE_("")
+ } \
+ else GTEST_NONFATAL_FAILURE_("")
#endif // NDEBUG

Powered by Google App Engine
This is Rietveld 408576698