summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 18:49:18 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 18:49:18 +0000
commit0860b9b95aa1aa50b95fad2e6a8485618caaaadf (patch)
treec1705bfa3130ea5ddc1700e1ed8dd014e16a9774 /chrome/browser/task_manager_unittest.cc
parent5b0c921e2394fc657d58068cfce23a1f9593f775 (diff)
downloadchromium_src-0860b9b95aa1aa50b95fad2e6a8485618caaaadf.zip
chromium_src-0860b9b95aa1aa50b95fad2e6a8485618caaaadf.tar.gz
chromium_src-0860b9b95aa1aa50b95fad2e6a8485618caaaadf.tar.bz2
De-couple TaskManager from TableView code.
This is another step towards porting the TaskManager. TEST=Launch Chrome, open the task manager. You should see correctly reported and updated resource data. http://crbug.com/11461 Review URL: http://codereview.chromium.org/115031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_unittest.cc')
-rw-r--r--chrome/browser/task_manager_unittest.cc52
1 files changed, 22 insertions, 30 deletions
diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc
index b262d35..4550f8b 100644
--- a/chrome/browser/task_manager_unittest.cc
+++ b/chrome/browser/task_manager_unittest.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "app/l10n_util.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -24,57 +25,48 @@ class TestResource : public TaskManager::Resource {
} // namespace
-class TaskManagerTest : public testing::Test,
- public views::TableModelObserver {
- public:
- // TableModelObserver
- virtual void OnModelChanged() {}
- virtual void OnItemsChanged(int start, int length) {}
- virtual void OnItemsAdded(int start, int length) {}
- virtual void OnItemsRemoved(int start, int length) {}
+class TaskManagerTest : public testing::Test {
};
TEST_F(TaskManagerTest, Basic) {
TaskManager task_manager;
- TaskManagerTableModel* model = task_manager.table_model_;
+ TaskManagerModel* model = task_manager.model_;
EXPECT_FALSE(task_manager.BrowserProcessIsSelected());
- EXPECT_EQ(0, model->RowCount());
+ EXPECT_EQ(0, model->ResourceCount());
}
TEST_F(TaskManagerTest, Resources) {
TaskManager task_manager;
- TaskManagerTableModel* model = task_manager.table_model_;
- model->SetObserver(this);
+ TaskManagerModel* model = task_manager.model_;
TestResource resource1, resource2;
task_manager.AddResource(&resource1);
- ASSERT_EQ(1, model->RowCount());
- EXPECT_STREQ(L"test title",
- model->GetText(0, IDS_TASK_MANAGER_PAGE_COLUMN).c_str());
+ ASSERT_EQ(1, model->ResourceCount());
+ EXPECT_TRUE(model->IsResourceFirstInGroup(0));
+ EXPECT_STREQ(L"test title", model->GetResourceTitle(0).c_str());
EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(),
- model->GetText(0, IDS_TASK_MANAGER_NET_COLUMN).c_str());
- EXPECT_STREQ(L"0",
- model->GetText(0, IDS_TASK_MANAGER_CPU_COLUMN).c_str());
+ model->GetResourceNetworkUsage(0).c_str());
+ EXPECT_STREQ(L"0", model->GetResourceCPUUsage(0).c_str());
task_manager.AddResource(&resource2); // Will be in the same group.
- ASSERT_EQ(2, model->RowCount());
- EXPECT_STREQ(L"test title",
- model->GetText(1, IDS_TASK_MANAGER_PAGE_COLUMN).c_str());
+ ASSERT_EQ(2, model->ResourceCount());
+ EXPECT_TRUE(model->IsResourceFirstInGroup(0));
+ EXPECT_FALSE(model->IsResourceFirstInGroup(1));
+ EXPECT_STREQ(L"test title", model->GetResourceTitle(1).c_str());
EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(),
- model->GetText(1, IDS_TASK_MANAGER_NET_COLUMN).c_str());
- EXPECT_STREQ(L"", model->GetText(1, IDS_TASK_MANAGER_CPU_COLUMN).c_str());
+ model->GetResourceNetworkUsage(1).c_str());
+ EXPECT_STREQ(L"0", model->GetResourceCPUUsage(1).c_str());
task_manager.RemoveResource(&resource1);
// Now resource2 will be first in group.
- ASSERT_EQ(1, model->RowCount());
- EXPECT_STREQ(L"test title",
- model->GetText(0, IDS_TASK_MANAGER_PAGE_COLUMN).c_str());
+ ASSERT_EQ(1, model->ResourceCount());
+ EXPECT_TRUE(model->IsResourceFirstInGroup(0));
+ EXPECT_STREQ(L"test title", model->GetResourceTitle(0).c_str());
EXPECT_STREQ(l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT).c_str(),
- model->GetText(0, IDS_TASK_MANAGER_NET_COLUMN).c_str());
- EXPECT_STREQ(L"0",
- model->GetText(0, IDS_TASK_MANAGER_CPU_COLUMN).c_str());
+ model->GetResourceNetworkUsage(0).c_str());
+ EXPECT_STREQ(L"0", model->GetResourceCPUUsage(0).c_str());
task_manager.RemoveResource(&resource2);
- EXPECT_EQ(0, model->RowCount());
+ EXPECT_EQ(0, model->ResourceCount());
}