Skip to content

GitLab

T
tangled
Commit bfa162fc authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot
Browse files
Options

[Payment Request] isolate unit tests with a "TestCase" struct 

These two files both define a TestCase struct in the anonymous namespace:
payment_details_validation_unittest.cc
payments_validators_unittest.cc

These can conflict in jumbo builds.  Let's isolate one of them by using
a file-specific namespace instead of the anonymous namespace.

Change-Id: Ic8e3fa255dde091311c02f73273a244782c4d2c3
Reviewed-on: https://chromium-review.googlesource.com/1180212Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584466}
parent 4b176fda
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 80 deletions
components/payments/core/payment_details_validation_unittest.cc
View file @ bfa162fc
...@@ -20,25 +20,28 @@ const bool DO_NOT_REQUIRE_TOTAL = false; ...@@ -20,25 +20,28 @@ const bool DO_NOT_REQUIRE_TOTAL = false;
const bool EXPECT_VALID = true; const bool EXPECT_VALID = true;
const bool EXPECT_INVALID = false; const bool EXPECT_INVALID = false;
struct TestCase { struct PaymentDetailsValidationTestCase {
TestCase(const char* details, bool require_total, bool expect_valid) PaymentDetailsValidationTestCase(const char* details,
bool require_total,
bool expect_valid)
: details(details), : details(details),
require_total(require_total), require_total(require_total),
expect_valid(expect_valid) {} expect_valid(expect_valid) {}
~TestCase() {} ~PaymentDetailsValidationTestCase() {}
const char* const details; const char* const details;
const bool require_total; const bool require_total;
const bool expect_valid; const bool expect_valid;
}; };
std::ostream& operator<<(std::ostream& out, const TestCase& test_case) { std::ostream& operator<<(std::ostream& out,
const PaymentDetailsValidationTestCase& test_case) {
out << test_case.details; out << test_case.details;
return out; return out;
} }
class PaymentDetailsValidationTest : public ::testing::TestWithParam<TestCase> { class PaymentDetailsValidationTest
}; : public ::testing::TestWithParam<PaymentDetailsValidationTestCase> {};
TEST_P(PaymentDetailsValidationTest, Test) { TEST_P(PaymentDetailsValidationTest, Test) {
auto value = base::JSONReader::Read(GetParam().details); auto value = base::JSONReader::Read(GetParam().details);
...@@ -53,9 +56,10 @@ TEST_P(PaymentDetailsValidationTest, Test) { ...@@ -53,9 +56,10 @@ TEST_P(PaymentDetailsValidationTest, Test) {
EXPECT_EQ(GetParam().expect_valid, ValidatePaymentDetails(details, &unused)); EXPECT_EQ(GetParam().expect_valid, ValidatePaymentDetails(details, &unused));
} }
INSTANTIATE_TEST_CASE_P(TestCases, INSTANTIATE_TEST_CASE_P(
TestCases,
PaymentDetailsValidationTest, PaymentDetailsValidationTest,
::testing::Values(TestCase(R"( ::testing::Values(PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -64,7 +68,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -64,7 +68,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "", "label": "",
...@@ -73,7 +77,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -73,7 +77,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -82,7 +86,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -82,7 +86,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -91,7 +95,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -91,7 +95,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -100,7 +104,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -100,7 +104,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -109,7 +113,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -109,7 +113,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -118,7 +122,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -118,7 +122,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -127,7 +131,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -127,7 +131,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -136,7 +140,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -136,7 +140,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -145,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -145,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -154,7 +158,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -154,7 +158,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -163,7 +167,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -163,7 +167,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -179,7 +183,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -179,7 +183,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "", "label": "",
...@@ -195,7 +199,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -195,7 +199,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "Tots", "label": "Tots",
...@@ -211,7 +215,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -211,7 +215,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "", "label": "",
...@@ -227,7 +231,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -227,7 +231,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"total": { "total": {
"label": "", "label": "",
...@@ -243,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -243,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
REQUIRE_TOTAL, REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -255,7 +259,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -255,7 +259,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -294,7 +298,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -294,7 +298,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_VALID), EXPECT_VALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -320,7 +324,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -320,7 +324,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -346,7 +350,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -346,7 +350,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -372,7 +376,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -372,7 +376,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
...@@ -398,7 +402,7 @@ INSTANTIATE_TEST_CASE_P(TestCases, ...@@ -398,7 +402,7 @@ INSTANTIATE_TEST_CASE_P(TestCases,
})", })",
DO_NOT_REQUIRE_TOTAL, DO_NOT_REQUIRE_TOTAL,
EXPECT_INVALID), EXPECT_INVALID),
TestCase(R"( PaymentDetailsValidationTestCase(R"(
{ {
"displayItems": [{ "displayItems": [{
"label": "Subtotal", "label": "Subtotal",
......
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