third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp - Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)

Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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 | « third_party/WebKit/Source/platform/fonts/shaping/RunSegmenterTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp

diff --git a/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp b/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp

index 136fbe0a8fa22ad24758065ec48b4449ae348fcd..3b1ed38af3bca188b96dcdcc00d26b2f4de7d585 100644

--- a/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp

+++ b/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp

@@ -54,7 +54,7 @@ bool ApproximatelyEqual(const FloatBox& a, const FloatBox& b) {

if (!ApproximatelyEqual(m, n)) {

return ::testing::AssertionFailure()

<< " Value of:" << n_expr << std::endl

- << " Actual:" << testing::PrintToString(n) << std::endl

+ << " Actual:" << ::testing::PrintToString(n) << std::endl

<< "Expected Approx:" << expr << std::endl

<< " Which is:" << ::testing::PrintToString(m);

}

@@ -70,7 +70,7 @@ bool ApproximatelyEqual(const FloatBox& a, const FloatBox& b) {

if (!ApproximatelyEqual(m, new_m)) {

return ::testing::AssertionFailure()

<< " Value of:" << n_expr << std::endl

- << " Actual:" << testing::PrintToString(n) << std::endl

+ << " Actual:" << ::testing::PrintToString(n) << std::endl

<< "Not Contained in:" << expr << std::endl

<< " Which is:" << ::testing::PrintToString(m);

}