diff options
author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:40:53 +0000 |
---|---|---|
committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:40:53 +0000 |
commit | 12126d37c6fafd799821164a00bf1fdd240b9ec3 (patch) | |
tree | 8a029e133da6d9ad82265b03dc930045b3ffd046 /base/version_unittest.cc | |
parent | 26807c6123b72a2ab30ff3fb2d5ab1e154fc3585 (diff) | |
download | chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.zip chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.tar.gz chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.tar.bz2 |
Remove two deprecated methods from base::Version
BUG=none
TEST=none
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10683005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/version_unittest.cc')
-rw-r--r-- | base/version_unittest.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/base/version_unittest.cc b/base/version_unittest.cc index 3af2175..15f3052 100644 --- a/base/version_unittest.cc +++ b/base/version_unittest.cc @@ -53,13 +53,12 @@ TEST_F(VersionTest, GetVersionFromString) { {"02.1", 0, false}, {"f.1", 0, false}, }; + for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { - scoped_ptr<Version> vers(Version::GetVersionFromString(cases[i].input)); - EXPECT_EQ(cases[i].success, vers.get() != NULL); - if (cases[i].success) { - EXPECT_TRUE(vers->IsValid()); - EXPECT_EQ(cases[i].parts, vers->components().size()); - } + Version version(cases[i].input); + EXPECT_EQ(cases[i].success, version.IsValid()); + if (cases[i].success) + EXPECT_EQ(cases[i].parts, version.components().size()); } } @@ -81,12 +80,12 @@ TEST_F(VersionTest, Compare) { {"1.0.3", "1.0.20", -1}, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { - scoped_ptr<Version> lhs(Version::GetVersionFromString(cases[i].lhs)); - scoped_ptr<Version> rhs(Version::GetVersionFromString(cases[i].rhs)); - EXPECT_EQ(lhs->CompareTo(*rhs), cases[i].expected) << - cases[i].lhs << " ? " << cases[i].rhs; + Version lhs(cases[i].lhs); + Version rhs(cases[i].rhs); + EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) << + cases[i].lhs << " ? " << cases[i].rhs; - EXPECT_EQ(lhs->IsOlderThan(cases[i].rhs), (cases[i].expected == -1)); + EXPECT_EQ(lhs.IsOlderThan(cases[i].rhs), (cases[i].expected == -1)); } } |