| Index: base/version_unittest.cc
|
| diff --git a/base/version_unittest.cc b/base/version_unittest.cc
|
| index fe445fb92592fee3ccaad8e9110878219915614d..4ca784fc11782c31115c567bda59a0ff2b345955 100644
|
| --- a/base/version_unittest.cc
|
| +++ b/base/version_unittest.cc
|
| @@ -14,17 +14,17 @@
|
| namespace {
|
|
|
| TEST(VersionTest, DefaultConstructor) {
|
| - Version v;
|
| + base::Version v;
|
| EXPECT_FALSE(v.IsValid());
|
| }
|
|
|
| TEST(VersionTest, ValueSemantics) {
|
| - Version v1("1.2.3.4");
|
| + base::Version v1("1.2.3.4");
|
| EXPECT_TRUE(v1.IsValid());
|
| - Version v3;
|
| + base::Version v3;
|
| EXPECT_FALSE(v3.IsValid());
|
| {
|
| - Version v2(v1);
|
| + base::Version v2(v1);
|
| v3 = v2;
|
| EXPECT_TRUE(v2.IsValid());
|
| EXPECT_EQ(v1, v2);
|
| @@ -34,9 +34,9 @@ TEST(VersionTest, ValueSemantics) {
|
|
|
| TEST(VersionTest, MoveSemantics) {
|
| const std::vector<uint32_t> components = {1, 2, 3, 4};
|
| - Version v1(std::move(components));
|
| + base::Version v1(std::move(components));
|
| EXPECT_TRUE(v1.IsValid());
|
| - Version v2("1.2.3.4");
|
| + base::Version v2("1.2.3.4");
|
| EXPECT_EQ(v1, v2);
|
| }
|
|
|
| @@ -76,7 +76,7 @@ TEST(VersionTest, GetVersionFromString) {
|
| };
|
|
|
| for (size_t i = 0; i < arraysize(cases); ++i) {
|
| - Version version(cases[i].input);
|
| + 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());
|
| @@ -105,8 +105,8 @@ TEST(VersionTest, Compare) {
|
| {"11.0.10", "15.5.28.130162", -1},
|
| };
|
| for (size_t i = 0; i < arraysize(cases); ++i) {
|
| - Version lhs(cases[i].lhs);
|
| - Version rhs(cases[i].rhs);
|
| + 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;
|
|
|
| @@ -161,7 +161,7 @@ TEST(VersionTest, CompareToWildcardString) {
|
| {"1.2.0.0.0.0", "1.2.*", 0},
|
| };
|
| for (size_t i = 0; i < arraysize(cases); ++i) {
|
| - const Version version(cases[i].lhs);
|
| + 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;
|
| }
|
| @@ -185,7 +185,7 @@ TEST(VersionTest, IsValidWildcardString) {
|
| {"*.2", false},
|
| };
|
| for (size_t i = 0; i < arraysize(cases); ++i) {
|
| - EXPECT_EQ(Version::IsValidWildcardString(cases[i].version),
|
| + EXPECT_EQ(base::Version::IsValidWildcardString(cases[i].version),
|
| cases[i].expected) << cases[i].version << "?" << cases[i].expected;
|
| }
|
| }
|
|
|