summaryrefslogtreecommitdiff
path: root/chromium/base/version_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 15:05:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:33:47 +0000
commite684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch)
treed55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/base/version_unittest.cc
parent2b94bfe47ccb6c08047959d1c26e392919550e86 (diff)
downloadqtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/version_unittest.cc')
-rw-r--r--chromium/base/version_unittest.cc93
1 files changed, 46 insertions, 47 deletions
diff --git a/chromium/base/version_unittest.cc b/chromium/base/version_unittest.cc
index 285ca9cc43e..12b806399d0 100644
--- a/chromium/base/version_unittest.cc
+++ b/chromium/base/version_unittest.cc
@@ -75,12 +75,12 @@ TEST(VersionTest, GetVersionFromString) {
{"15.5.28.130162", 4, 15, true},
};
- for (size_t i = 0; i < arraysize(cases); ++i) {
- base::Version version(cases[i].input);
- EXPECT_EQ(cases[i].success, version.IsValid());
- if (cases[i].success) {
- EXPECT_EQ(cases[i].parts, version.components().size());
- EXPECT_EQ(cases[i].firstpart, version.components()[0]);
+ for (const auto& i : cases) {
+ base::Version version(i.input);
+ EXPECT_EQ(i.success, version.IsValid());
+ if (i.success) {
+ EXPECT_EQ(i.parts, version.components().size());
+ EXPECT_EQ(i.firstpart, version.components()[0]);
}
}
}
@@ -105,44 +105,43 @@ TEST(VersionTest, Compare) {
{"11.0.10", "15.5.28.130162", -1},
{"15.5.28.130162", "15.5.28.130162", 0},
};
- for (size_t i = 0; i < arraysize(cases); ++i) {
- base::Version lhs(cases[i].lhs);
- base::Version rhs(cases[i].rhs);
- EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) <<
- cases[i].lhs << " ? " << cases[i].rhs;
+ for (const auto& i : cases) {
+ base::Version lhs(i.lhs);
+ base::Version rhs(i.rhs);
+ EXPECT_EQ(lhs.CompareTo(rhs), i.expected) << i.lhs << " ? " << i.rhs;
// CompareToWildcardString() should have same behavior as CompareTo() when
// no wildcards are present.
- EXPECT_EQ(lhs.CompareToWildcardString(cases[i].rhs), cases[i].expected)
- << cases[i].lhs << " ? " << cases[i].rhs;
- EXPECT_EQ(rhs.CompareToWildcardString(cases[i].lhs), -cases[i].expected)
- << cases[i].lhs << " ? " << cases[i].rhs;
+ EXPECT_EQ(lhs.CompareToWildcardString(i.rhs), i.expected)
+ << i.lhs << " ? " << i.rhs;
+ EXPECT_EQ(rhs.CompareToWildcardString(i.lhs), -i.expected)
+ << i.lhs << " ? " << i.rhs;
// Test comparison operators
- switch (cases[i].expected) {
- case -1:
- EXPECT_LT(lhs, rhs);
- EXPECT_LE(lhs, rhs);
- EXPECT_NE(lhs, rhs);
- EXPECT_FALSE(lhs == rhs);
- EXPECT_FALSE(lhs >= rhs);
- EXPECT_FALSE(lhs > rhs);
- break;
- case 0:
- EXPECT_FALSE(lhs < rhs);
- EXPECT_LE(lhs, rhs);
- EXPECT_FALSE(lhs != rhs);
- EXPECT_EQ(lhs, rhs);
- EXPECT_GE(lhs, rhs);
- EXPECT_FALSE(lhs > rhs);
- break;
- case 1:
- EXPECT_FALSE(lhs < rhs);
- EXPECT_FALSE(lhs <= rhs);
- EXPECT_NE(lhs, rhs);
- EXPECT_FALSE(lhs == rhs);
- EXPECT_GE(lhs, rhs);
- EXPECT_GT(lhs, rhs);
- break;
+ switch (i.expected) {
+ case -1:
+ EXPECT_LT(lhs, rhs);
+ EXPECT_LE(lhs, rhs);
+ EXPECT_NE(lhs, rhs);
+ EXPECT_FALSE(lhs == rhs);
+ EXPECT_FALSE(lhs >= rhs);
+ EXPECT_FALSE(lhs > rhs);
+ break;
+ case 0:
+ EXPECT_FALSE(lhs < rhs);
+ EXPECT_LE(lhs, rhs);
+ EXPECT_FALSE(lhs != rhs);
+ EXPECT_EQ(lhs, rhs);
+ EXPECT_GE(lhs, rhs);
+ EXPECT_FALSE(lhs > rhs);
+ break;
+ case 1:
+ EXPECT_FALSE(lhs < rhs);
+ EXPECT_FALSE(lhs <= rhs);
+ EXPECT_NE(lhs, rhs);
+ EXPECT_FALSE(lhs == rhs);
+ EXPECT_GE(lhs, rhs);
+ EXPECT_GT(lhs, rhs);
+ break;
}
}
}
@@ -167,10 +166,10 @@ TEST(VersionTest, CompareToWildcardString) {
{"1.3.9", "1.3.*", 0},
{"1.2.0.0.0.0", "1.2.*", 0},
};
- for (size_t i = 0; i < arraysize(cases); ++i) {
- const base::Version version(cases[i].lhs);
- const int result = version.CompareToWildcardString(cases[i].rhs);
- EXPECT_EQ(result, cases[i].expected) << cases[i].lhs << "?" << cases[i].rhs;
+ for (const auto& i : cases) {
+ const base::Version version(i.lhs);
+ const int result = version.CompareToWildcardString(i.rhs);
+ EXPECT_EQ(result, i.expected) << i.lhs << "?" << i.rhs;
}
}
@@ -191,9 +190,9 @@ TEST(VersionTest, IsValidWildcardString) {
{"*", false},
{"*.2", false},
};
- for (size_t i = 0; i < arraysize(cases); ++i) {
- EXPECT_EQ(base::Version::IsValidWildcardString(cases[i].version),
- cases[i].expected) << cases[i].version << "?" << cases[i].expected;
+ for (const auto& i : cases) {
+ EXPECT_EQ(base::Version::IsValidWildcardString(i.version), i.expected)
+ << i.version << "?" << i.expected;
}
}