Commit e576d650 authored by Danyao Wang's avatar Danyao Wang Committed by Commit Bot

Rename enum names to avoid conflict with Objective C YES and NO.

Change-Id: I8f2cfb66099a3bf8bd03f3407ed763067a465f01
Reviewed-on: https://chromium-review.googlesource.com/c/1394883
Commit-Queue: Danyao Wang <danyao@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619735}
parent f04d213a
...@@ -20,7 +20,7 @@ using payments::mojom::blink::PaymentRequestClient; ...@@ -20,7 +20,7 @@ using payments::mojom::blink::PaymentRequestClient;
// HasEnrolledInstrumentTest is parameterized on this enum to test that // HasEnrolledInstrumentTest is parameterized on this enum to test that
// canMakePayment when PaymentRequestHasEnrolledInstrumentEnabled is false // canMakePayment when PaymentRequestHasEnrolledInstrumentEnabled is false
// behaves identically to hasEnrolledInstrument. // behaves identically to hasEnrolledInstrument.
enum class HasEnrolledInstrumentEnabled { YES, NO }; enum class HasEnrolledInstrumentEnabled { kYes, kNo };
class HasEnrolledInstrumentTest class HasEnrolledInstrumentTest
: public testing::Test, : public testing::Test,
...@@ -28,7 +28,7 @@ class HasEnrolledInstrumentTest ...@@ -28,7 +28,7 @@ class HasEnrolledInstrumentTest
void SetUp() override { void SetUp() override {
testing::Test::SetUp(); testing::Test::SetUp();
RuntimeEnabledFeatures::SetPaymentRequestHasEnrolledInstrumentEnabled( RuntimeEnabledFeatures::SetPaymentRequestHasEnrolledInstrumentEnabled(
GetParam() == HasEnrolledInstrumentEnabled::YES); GetParam() == HasEnrolledInstrumentEnabled::kYes);
} }
}; };
...@@ -40,7 +40,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectPromiseOnUserCancel) { ...@@ -40,7 +40,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectPromiseOnUserCancel) {
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectNoCall(), funcs.ExpectCall()); .Then(funcs.ExpectNoCall(), funcs.ExpectCall());
} else { } else {
...@@ -60,7 +60,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectPromiseOnUnknownError) { ...@@ -60,7 +60,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectPromiseOnUnknownError) {
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectNoCall(), funcs.ExpectCall()); .Then(funcs.ExpectNoCall(), funcs.ExpectCall());
} else { } else {
...@@ -79,7 +79,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectDuplicateRequest) { ...@@ -79,7 +79,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectDuplicateRequest) {
PaymentRequest* request = PaymentRequest::Create( PaymentRequest* request = PaymentRequest::Create(
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()); request->hasEnrolledInstrument(scope.GetScriptState());
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectNoCall(), funcs.ExpectCall()); .Then(funcs.ExpectNoCall(), funcs.ExpectCall());
...@@ -99,7 +99,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectQueryQuotaExceeded) { ...@@ -99,7 +99,7 @@ TEST_P(HasEnrolledInstrumentTest, RejectQueryQuotaExceeded) {
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectNoCall(), funcs.ExpectCall()); .Then(funcs.ExpectNoCall(), funcs.ExpectCall());
} else { } else {
...@@ -119,7 +119,7 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasNoEnrolledInstrument) { ...@@ -119,7 +119,7 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasNoEnrolledInstrument) {
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
String captor; String captor;
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectCall(&captor), funcs.ExpectNoCall()); .Then(funcs.ExpectCall(&captor), funcs.ExpectNoCall());
} else { } else {
...@@ -142,7 +142,7 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasEnrolledInstrument) { ...@@ -142,7 +142,7 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasEnrolledInstrument) {
scope.GetExecutionContext(), BuildPaymentMethodDataForTest(), scope.GetExecutionContext(), BuildPaymentMethodDataForTest(),
BuildPaymentDetailsInitForTest(), scope.GetExceptionState()); BuildPaymentDetailsInitForTest(), scope.GetExceptionState());
String captor; String captor;
if (GetParam() == HasEnrolledInstrumentEnabled::YES) { if (GetParam() == HasEnrolledInstrumentEnabled::kYes) {
request->hasEnrolledInstrument(scope.GetScriptState()) request->hasEnrolledInstrument(scope.GetScriptState())
.Then(funcs.ExpectCall(&captor), funcs.ExpectNoCall()); .Then(funcs.ExpectCall(&captor), funcs.ExpectNoCall());
} else { } else {
...@@ -159,8 +159,8 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasEnrolledInstrument) { ...@@ -159,8 +159,8 @@ TEST_P(HasEnrolledInstrumentTest, ReturnHasEnrolledInstrument) {
INSTANTIATE_TEST_CASE_P(ProgrammaticHasEnrolledInstrumentTest, INSTANTIATE_TEST_CASE_P(ProgrammaticHasEnrolledInstrumentTest,
HasEnrolledInstrumentTest, HasEnrolledInstrumentTest,
::testing::Values(HasEnrolledInstrumentEnabled::YES, ::testing::Values(HasEnrolledInstrumentEnabled::kYes,
HasEnrolledInstrumentEnabled::NO)); HasEnrolledInstrumentEnabled::kNo));
// Test fixture for canMakePayment when // Test fixture for canMakePayment when
// PaymentRequestHasEnrolledInstrumentEnabled is true. // PaymentRequestHasEnrolledInstrumentEnabled is true.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment