third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.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/modules/payments/PaymentRequestUpdateEventTest.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/modules/payments/PaymentRequestDetailsTest.cpp ('k') | third_party/WebKit/Source/modules/payments/PaymentResponseTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp

diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp

index 6f6c3870869b44e548a0f5ac3837f4e32738e446..f65812d81c09c577154fc986ae5ff32ea00957ae 100644

--- a/third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp

+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp

@@ -48,8 +48,8 @@ TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsCalled) {

scope.GetExceptionState());

EXPECT_FALSE(scope.GetExceptionState().HadException());

- EXPECT_CALL(*updater, OnUpdatePaymentDetails(testing::_));

- EXPECT_CALL(*updater, OnUpdatePaymentDetailsFailure(testing::_)).Times(0);

+ EXPECT_CALL(*updater, OnUpdatePaymentDetails(::testing::_));

+ EXPECT_CALL(*updater, OnUpdatePaymentDetailsFailure(::testing::_)).Times(0);

payment_details->Resolve("foo");

}

@@ -67,8 +67,8 @@ TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsFailureCalled) {

scope.GetExceptionState());

EXPECT_FALSE(scope.GetExceptionState().HadException());

- EXPECT_CALL(*updater, OnUpdatePaymentDetails(testing::_)).Times(0);

- EXPECT_CALL(*updater, OnUpdatePaymentDetailsFailure(testing::_));

+ EXPECT_CALL(*updater, OnUpdatePaymentDetails(::testing::_)).Times(0);

+ EXPECT_CALL(*updater, OnUpdatePaymentDetailsFailure(::testing::_));

payment_details->Reject("oops");

}