diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 20:21:36 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 20:21:36 +0000 |
| commit | 08d87dcc005057164d9cc19ddba5ddda77ce4942 (patch) | |
| tree | 946e480c2d6cf664288142c10f08b23737999fe5 /chrome/browser/task_manager_unittest.cc | |
| parent | 3eb07da6e868e49e28cb5a6d8a57037f2c45a20e (diff) | |
| download | chromium_src-08d87dcc005057164d9cc19ddba5ddda77ce4942.zip chromium_src-08d87dcc005057164d9cc19ddba5ddda77ce4942.tar.gz chromium_src-08d87dcc005057164d9cc19ddba5ddda77ce4942.tar.bz2 | |
[Mac] Enable some left-behind unit tests.
NavicationControllerTest, TaskManagerTest and BackFwdMenuModelTest.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/557063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/task_manager_unittest.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc index 0961b6d..d586a5c 100644 --- a/chrome/browser/task_manager_unittest.cc +++ b/chrome/browser/task_manager_unittest.cc @@ -16,6 +16,15 @@ namespace { +#if defined(OS_MACOSX) +// From task_manager.cc: +// Activity Monitor shows %cpu with one decimal digit -- be +// consistent with that. +const wchar_t *kZeroCPUUsage = L"0.0"; +#else +const wchar_t *kZeroCPUUsage = L"0"; +#endif + class TestResource : public TaskManager::Resource { public: TestResource() : refresh_called_(false) {} @@ -60,7 +69,7 @@ TEST_F(TaskManagerTest, Resources) { EXPECT_STREQ(L"test title", model->GetResourceTitle(0).c_str()); EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(), model->GetResourceNetworkUsage(0).c_str()); - EXPECT_STREQ(L"0", model->GetResourceCPUUsage(0).c_str()); + EXPECT_STREQ(kZeroCPUUsage, model->GetResourceCPUUsage(0).c_str()); task_manager.AddResource(&resource2); // Will be in the same group. ASSERT_EQ(2, model->ResourceCount()); @@ -69,7 +78,7 @@ TEST_F(TaskManagerTest, Resources) { EXPECT_STREQ(L"test title", model->GetResourceTitle(1).c_str()); EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(), model->GetResourceNetworkUsage(1).c_str()); - EXPECT_STREQ(L"0", model->GetResourceCPUUsage(1).c_str()); + EXPECT_STREQ(kZeroCPUUsage, model->GetResourceCPUUsage(1).c_str()); task_manager.RemoveResource(&resource1); // Now resource2 will be first in group. @@ -78,7 +87,7 @@ TEST_F(TaskManagerTest, Resources) { EXPECT_STREQ(L"test title", model->GetResourceTitle(0).c_str()); EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(), model->GetResourceNetworkUsage(0).c_str()); - EXPECT_STREQ(L"0", model->GetResourceCPUUsage(0).c_str()); + EXPECT_STREQ(kZeroCPUUsage, model->GetResourceCPUUsage(0).c_str()); task_manager.RemoveResource(&resource2); EXPECT_EQ(0, model->ResourceCount()); |