diff options
| author | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:55:04 +0000 |
|---|---|---|
| committer | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:55:04 +0000 |
| commit | 323b8772cc71c47f2cc5d9d7286238e291515117 (patch) | |
| tree | a00bdd219e01b934f63c53b9aab3a93af35aa18f /base | |
| parent | fa293c072c9e15be1c098d5ab6e509f4c1e465bb (diff) | |
| download | chromium_src-323b8772cc71c47f2cc5d9d7286238e291515117.zip chromium_src-323b8772cc71c47f2cc5d9d7286238e291515117.tar.gz chromium_src-323b8772cc71c47f2cc5d9d7286238e291515117.tar.bz2 | |
Fix test failure: SysInfoTest.GoogleChromeOSVersionNumbersFirst
Review URL: http://codereview.chromium.org/467053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/sys_info_chromeos.cc | 4 | ||||
| -rw-r--r-- | base/sys_info_unittest.cc | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc index 4fd4a9d..af204df 100644 --- a/base/sys_info_chromeos.cc +++ b/base/sys_info_chromeos.cc @@ -43,9 +43,7 @@ void SysInfo::ParseLsbRelease(const std::string& lsb_release, int32 *major_version, int32 *minor_version, int32 *bugfix_version) { - size_t version_key_index = - lsb_release.find(kLinuxStandardBaseVersionKey, - arraysize(kLinuxStandardBaseVersionKey) - 1); + size_t version_key_index = lsb_release.find(kLinuxStandardBaseVersionKey); if (std::string::npos == version_key_index) { return; } diff --git a/base/sys_info_unittest.cc b/base/sys_info_unittest.cc index 40caf72..4339b6a 100644 --- a/base/sys_info_unittest.cc +++ b/base/sys_info_unittest.cc @@ -77,9 +77,9 @@ TEST_F(SysInfoTest, GoogleChromeOSVersionNumbers) { &os_major_version, &os_minor_version, &os_bugfix_version); - EXPECT_EQ(os_major_version, 1); - EXPECT_EQ(os_minor_version, 2); - EXPECT_EQ(os_bugfix_version, 3); + EXPECT_EQ(1, os_major_version); + EXPECT_EQ(2, os_minor_version); + EXPECT_EQ(3, os_bugfix_version); } TEST_F(SysInfoTest, GoogleChromeOSVersionNumbersFirst) { @@ -93,9 +93,9 @@ TEST_F(SysInfoTest, GoogleChromeOSVersionNumbersFirst) { &os_major_version, &os_minor_version, &os_bugfix_version); - EXPECT_EQ(os_major_version, 1); - EXPECT_EQ(os_minor_version, 2); - EXPECT_EQ(os_bugfix_version, 3); + EXPECT_EQ(1, os_major_version); + EXPECT_EQ(2, os_minor_version); + EXPECT_EQ(3, os_bugfix_version); } TEST_F(SysInfoTest, GoogleChromeOSNoVersionNumbers) { @@ -107,9 +107,9 @@ TEST_F(SysInfoTest, GoogleChromeOSNoVersionNumbers) { &os_major_version, &os_minor_version, &os_bugfix_version); - EXPECT_EQ(os_major_version, -1); - EXPECT_EQ(os_minor_version, -1); - EXPECT_EQ(os_bugfix_version, -1); + EXPECT_EQ(-1, os_major_version); + EXPECT_EQ(-1, os_minor_version); + EXPECT_EQ(-1, os_bugfix_version); } #endif // OS_CHROMEOS |