views: Move table and tree directories to ui/views/controls/.

views/controls/table/table_view_unittest.cc

Index: views/controls/table/table_view_unittest.cc
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
deleted file mode 100644
index 95a6820bfb58905115a44d88ef867c76e650310e..0000000000000000000000000000000000000000
--- a/views/controls/table/table_view_unittest.cc
+++ /dev/null
@@ -1,647 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// For WinDDK ATL compatibility, these ATL headers must come first.
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <atlbase.h>  // NOLINT
-#include <atlwin.h>  // NOLINT
-#endif
-
-#include <vector>  // NOLINT
-
-#include "base/compiler_specific.h"
-#include "base/message_loop.h"
-#include "base/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/table_model.h"
-#include "ui/base/models/table_model_observer.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-#include "views/controls/table/table_view.h"
-#include "views/controls/table/table_view2.h"
-
-// Put the tests in the views namespace to make it easier to declare them as
-// friend classes.
-namespace views {
-
-// TestTableModel --------------------------------------------------------------
-
-// Trivial TableModel implementation that is backed by a vector of vectors.
-// Provides methods for adding/removing/changing the contents that notify the
-// observer appropriately.
-//
-// Initial contents are:
-// 0, 1
-// 1, 1
-// 2, 2
-class TestTableModel : public ui::TableModel {
- public:
-  TestTableModel();
-
-  // Adds a new row at index |row| with values |c1_value| and |c2_value|.
-  void AddRow(int row, int c1_value, int c2_value);
-
-  // Removes the row at index |row|.
-  void RemoveRow(int row);
-
-  // Changes the values of the row at |row|.
-  void ChangeRow(int row, int c1_value, int c2_value);
-
-  // ui::TableModel:
-  virtual int RowCount() OVERRIDE;
-  virtual string16 GetText(int row, int column_id) OVERRIDE;
-  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
-  virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
-
- private:
-  ui::TableModelObserver* observer_;
-
-  // The data.
-  std::vector<std::vector<int> > rows_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestTableModel);
-};
-
-// Same behavior as TestTableModel, except even items are in one group, while
-// odd items are put in a different group.
-class GroupTestTableModel : public TestTableModel {
-  virtual bool HasGroups() { return true; }
-
-  virtual Groups GetGroups() {
-    Groups groups;
-    Group group1, group2;
-    group1.title = ASCIIToUTF16("Group 1");
-    group1.id = 0;
-    group2.title = ASCIIToUTF16("Group 2");
-    group2.id = 0;
-    groups.push_back(group1);
-    groups.push_back(group2);
-    return groups;
-  }
-
-  // Return group = 0 if row is even, otherwise group = 1.
-  virtual int GetGroupID(int row) { return row % 2; }
-};
-
-TestTableModel::TestTableModel() : observer_(NULL) {
-  AddRow(0, 0, 1);
-  AddRow(1, 1, 1);
-  AddRow(2, 2, 2);
-}
-
-void TestTableModel::AddRow(int row, int c1_value, int c2_value) {
-  DCHECK(row >= 0 && row <= static_cast<int>(rows_.size()));
-  std::vector<int> new_row;
-  new_row.push_back(c1_value);
-  new_row.push_back(c2_value);
-  rows_.insert(rows_.begin() + row, new_row);
-  if (observer_)
-    observer_->OnItemsAdded(row, 1);
-}
-void TestTableModel::RemoveRow(int row) {
-  DCHECK(row >= 0 && row <= static_cast<int>(rows_.size()));
-  rows_.erase(rows_.begin() + row);
-  if (observer_)
-    observer_->OnItemsRemoved(row, 1);
-}
-
-void TestTableModel::ChangeRow(int row, int c1_value, int c2_value) {
-  DCHECK(row >= 0 && row < static_cast<int>(rows_.size()));
-  rows_[row][0] = c1_value;
-  rows_[row][1] = c2_value;
-  if (observer_)
-    observer_->OnItemsChanged(row, 1);
-}
-
-int TestTableModel::RowCount() {
-  return static_cast<int>(rows_.size());
-}
-
-string16 TestTableModel::GetText(int row, int column_id) {
-  return UTF8ToUTF16(base::IntToString(rows_[row][column_id]));
-}
-
-void TestTableModel::SetObserver(ui::TableModelObserver* observer) {
-  observer_ = observer;
-}
-
-int TestTableModel::CompareValues(int row1, int row2, int column_id) {
-  return rows_[row1][column_id] - rows_[row2][column_id];
-}
-
-#if defined(OS_WIN)
-
-// TableViewTest ---------------------------------------------------------------
-
-class TableViewTest : public testing::Test, views::WidgetDelegate {
- public:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
-
-  virtual views::View* GetContentsView() OVERRIDE {
-    return table_;
-  }
-  virtual views::Widget* GetWidget() OVERRIDE {
-    return table_->GetWidget();
-  }
-  virtual const views::Widget* GetWidget() const OVERRIDE {
-    return table_->GetWidget();
-  }
-
- protected:
-  // Creates the model.
-  virtual TestTableModel* CreateModel();
-
-  // Verifies the view order matches that of the supplied arguments. The
-  // arguments are in terms of the model. For example, values of '1, 0' indicate
-  // the model index at row 0 is 1 and the model index at row 1 is 0.
-  void VerifyViewOrder(int first, ...);
-
-  // Verifies the selection matches the supplied arguments. The supplied
-  // arguments are in terms of this model. This uses the iterator returned by
-  // SelectionBegin.
-  void VerifySelectedRows(int first, ...);
-
-  // Configures the state for the various multi-selection tests.
-  // This selects model rows 0 and 1, and if |sort| is true the first column
-  // is sorted in descending order.
-  void SetUpMultiSelectTestState(bool sort);
-
-  scoped_ptr<TestTableModel> model_;
-
-  // The table. This is owned by the window.
-  TableView* table_;
-
- private:
-  MessageLoopForUI message_loop_;
-  views::Widget* window_;
-};
-
-void TableViewTest::SetUp() {
-  OleInitialize(NULL);
-  model_.reset(CreateModel());
-  std::vector<ui::TableColumn> columns;
-  columns.resize(2);
-  columns[0].id = 0;
-  columns[1].id = 1;
-  table_ = new TableView(model_.get(), columns, views::ICON_AND_TEXT,
-                         false, false, false);
-  window_ = views::Widget::CreateWindowWithBounds(
-      this,
-      gfx::Rect(100, 100, 512, 512));
-}
-
-void TableViewTest::TearDown() {
-  window_->Close();
-  // Temporary workaround to avoid leak of RootView::pending_paint_task_.
-  message_loop_.RunAllPending();
-  OleUninitialize();
-}
-
-void TableViewTest::VerifyViewOrder(int first, ...) {
-  va_list marker;
-  va_start(marker, first);
-  int value = first;
-  int index = 0;
-  for (int value = first, index = 0; value != -1; index++) {
-    ASSERT_EQ(value, table_->ViewToModel(index));
-    value = va_arg(marker, int);
-  }
-  va_end(marker);
-}
-
-void TableViewTest::VerifySelectedRows(int first, ...) {
-  va_list marker;
-  va_start(marker, first);
-  int value = first;
-  int index = 0;
-  TableView::iterator selection_iterator = table_->SelectionBegin();
-  for (int value = first, index = 0; value != -1; index++) {
-    ASSERT_TRUE(selection_iterator != table_->SelectionEnd());
-    ASSERT_EQ(value, *selection_iterator);
-    value = va_arg(marker, int);
-    ++selection_iterator;
-  }
-  ASSERT_TRUE(selection_iterator == table_->SelectionEnd());
-  va_end(marker);
-}
-
-void TableViewTest::SetUpMultiSelectTestState(bool sort) {
-  // Select two rows.
-  table_->SetSelectedState(0, true);
-  table_->SetSelectedState(1, true);
-
-  VerifySelectedRows(1, 0, -1);
-  if (!sort || HasFatalFailure())
-    return;
-
-  // Sort by first column descending.
-  TableView::SortDescriptors sd;
-  sd.push_back(TableView::SortDescriptor(0, false));
-  table_->SetSortDescriptors(sd);
-  VerifyViewOrder(2, 1, 0, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Make sure the two rows are sorted.
-  // NOTE: the order changed because iteration happens over view indices.
-  VerifySelectedRows(0, 1, -1);
-}
-
-TestTableModel* TableViewTest::CreateModel() {
-  return new TestTableModel();
-}
-
-// NullModelTableViewTest ------------------------------------------------------
-
-class NullModelTableViewTest : public TableViewTest {
- protected:
-  // Creates the model.
-  TestTableModel* CreateModel() {
-    return NULL;
-  }
-};
-
-// GroupModelTableViewTest -----------------------------------------------------
-class GroupModelTableViewTest : public TableViewTest {
- protected:
-  TestTableModel* CreateModel() {
-    return new GroupTestTableModel();
-  }
-};
-
-// Tests -----------------------------------------------------------------------
-
-// Failing: http://crbug.com/45015
-// Tests various sorting permutations.
-TEST_F(TableViewTest, DISABLED_Sort) {
-  // Sort by first column descending.
-  TableView::SortDescriptors sort;
-  sort.push_back(TableView::SortDescriptor(0, false));
-  table_->SetSortDescriptors(sort);
-  VerifyViewOrder(2, 1, 0, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Sort by second column ascending, first column descending.
-  sort.clear();
-  sort.push_back(TableView::SortDescriptor(1, true));
-  sort.push_back(TableView::SortDescriptor(0, false));
-  sort[1].ascending = false;
-  table_->SetSortDescriptors(sort);
-  VerifyViewOrder(1, 0, 2, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Clear the sort.
-  table_->SetSortDescriptors(TableView::SortDescriptors());
-  VerifyViewOrder(0, 1, 2, -1);
-  if (HasFatalFailure())
-    return;
-}
-
-// Failing: http://crbug.com/45015
-// Tests changing the model while sorted.
-TEST_F(TableViewTest, DISABLED_SortThenChange) {
-  // Sort by first column descending.
-  TableView::SortDescriptors sort;
-  sort.push_back(TableView::SortDescriptor(0, false));
-  table_->SetSortDescriptors(sort);
-  VerifyViewOrder(2, 1, 0, -1);
-  if (HasFatalFailure())
-    return;
-
-  model_->ChangeRow(0, 3, 1);
-  VerifyViewOrder(0, 2, 1, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests adding to the model while sorted.
-TEST_F(TableViewTest, DISABLED_AddToSorted) {
-  // Sort by first column descending.
-  TableView::SortDescriptors sort;
-  sort.push_back(TableView::SortDescriptor(0, false));
-  table_->SetSortDescriptors(sort);
-  VerifyViewOrder(2, 1, 0, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Add row so that it occurs first.
-  model_->AddRow(0, 5, -1);
-  VerifyViewOrder(0, 3, 2, 1, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Add row so that it occurs last.
-  model_->AddRow(0, -1, -1);
-  VerifyViewOrder(1, 4, 3, 2, 0, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection on sort.
-TEST_F(TableViewTest, DISABLED_PersistSelectionOnSort) {
-  // Select row 0.
-  table_->Select(0);
-
-  // Sort by first column descending.
-  TableView::SortDescriptors sort;
-  sort.push_back(TableView::SortDescriptor(0, false));
-  table_->SetSortDescriptors(sort);
-  VerifyViewOrder(2, 1, 0, -1);
-  if (HasFatalFailure())
-    return;
-
-  // Make sure 0 is still selected.
-  EXPECT_EQ(0, table_->FirstSelectedRow());
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection iterator with sort.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnSort) {
-  SetUpMultiSelectTestState(true);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a change when sorted with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnChangeWithSort) {
-  SetUpMultiSelectTestState(true);
-  if (HasFatalFailure())
-    return;
-
-  model_->ChangeRow(0, 3, 1);
-
-  VerifySelectedRows(1, 0, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a remove when sorted with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnRemoveWithSort) {
-  SetUpMultiSelectTestState(true);
-  if (HasFatalFailure())
-    return;
-
-  model_->RemoveRow(0);
-
-  VerifySelectedRows(0, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a add when sorted with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnAddWithSort) {
-  SetUpMultiSelectTestState(true);
-  if (HasFatalFailure())
-    return;
-
-  model_->AddRow(3, 4, 4);
-
-  VerifySelectedRows(0, 1, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a change with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnChange) {
-  SetUpMultiSelectTestState(false);
-  if (HasFatalFailure())
-    return;
-
-  model_->ChangeRow(0, 3, 1);
-
-  VerifySelectedRows(1, 0, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a remove with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnRemove) {
-  SetUpMultiSelectTestState(false);
-  if (HasFatalFailure())
-    return;
-
-  model_->RemoveRow(0);
-
-  VerifySelectedRows(0, -1);
-}
-
-// Failing: http://crbug.com/45015
-// Tests selection persists after a add with iterator.
-TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnAdd) {
-  SetUpMultiSelectTestState(false);
-  if (HasFatalFailure())
-    return;
-
-  model_->AddRow(3, 4, 4);
-
-  VerifySelectedRows(1, 0, -1);
-}
-
-TEST_F(GroupModelTableViewTest, IndividualSelectAcrossGroups) {
-  table_->SetSelectedState(0, true);
-  table_->SetSelectedState(1, true);
-  table_->SetSelectedState(2, true);
-  VerifySelectedRows(2, 1, 0, -1);
-}
-
-TEST_F(GroupModelTableViewTest, ShiftSelectAcrossGroups) {
-  table_->SetSelectedState(0, true);
-  // Try to select across groups - this should fail.
-  ASSERT_FALSE(table_->SelectMultiple(1, 0));
-  VerifySelectedRows(0, -1);
-}
-
-TEST_F(GroupModelTableViewTest, ShiftSelectSameGroup) {
-  table_->SetSelectedState(0, true);
-  // Try to select in the same group - this should work but should only select
-  // items in the "even" group.
-  ASSERT_TRUE(table_->SelectMultiple(2, 0));
-  VerifySelectedRows(2, 0, -1);
-}
-
-// Crashing: http://crbug.com/45015
-TEST_F(NullModelTableViewTest, DISABLED_NullModel) {
-  // There's nothing explicit to test. If there is a bug in TableView relating
-  // to a NULL model we'll crash.
-}
-
-#endif  // OS_WIN
-
-////////////////////////////////////////////////////////////////////////////////
-// TableView2 Tests
-
-class TableView2Test : public testing::Test, views::WidgetDelegate {
- public:
-  virtual void SetUp();
-  virtual void TearDown();
-
-  virtual views::View* GetContentsView() OVERRIDE {
-    return table_;
-  }
-  virtual views::Widget* GetWidget() OVERRIDE {
-    return table_->GetWidget();
-  }
-  virtual const views::Widget* GetWidget() const OVERRIDE {
-    return table_->GetWidget();
-  }
-
-  // Returns the contents of a cell in the table.
-  std::string GetCellValue(int row, int column);
-
- protected:
-  // Creates the model.
-  TestTableModel* CreateModel();
-
-  virtual views::TableTypes GetTableType() {
-    return views::TEXT_ONLY;
-  }
-
-  scoped_ptr<TestTableModel> model_;
-
-  // The table. This is owned by the window.
-  views::TableView2* table_;
-
- private:
-  MessageLoopForUI message_loop_;
-  views::Widget* window_;
-};
-
-void TableView2Test::SetUp() {
-#if defined(OS_WIN)
-  OleInitialize(NULL);
-#endif
-  model_.reset(CreateModel());
-  std::vector<ui::TableColumn> columns;
-  columns.resize(2);
-  columns[0].id = 0;
-  columns[1].id = 1;
-  table_ = new views::TableView2(model_.get(), columns, GetTableType(),
-                                 views::TableView2::NONE);
-  window_ = views::Widget::CreateWindowWithBounds(
-      this,
-      gfx::Rect(100, 100, 512, 512));
-  window_->Show();
-}
-
-void TableView2Test::TearDown() {
-  window_->Close();
-  // Temporary workaround to avoid leak of RootView::pending_paint_task_.
-  message_loop_.RunAllPending();
-#if defined(OS_WIN)
-  OleUninitialize();
-#endif
-}
-
-TestTableModel* TableView2Test::CreateModel() {
-  return new TestTableModel();
-}
-
-std::string TableView2Test::GetCellValue(int row, int column) {
-#if defined(OS_WIN)
-  wchar_t str[128] = {0};
-  LVITEM item = {0};
-  item.mask = LVIF_TEXT;
-  item.iItem = row;
-  item.iSubItem = column;
-  item.pszText = str;
-  item.cchTextMax = 128;
-  BOOL r = ListView_GetItem(table_->GetTestingHandle(), &item);
-  DCHECK(r);
-  return WideToUTF8(str);
-#else
-  GtkTreeModel* gtk_model =
-      gtk_tree_view_get_model(GTK_TREE_VIEW(table_->GetTestingHandle()));
-  DCHECK(gtk_model);
-  GtkTreeIter row_iter;
-  gboolean r = gtk_tree_model_iter_nth_child(gtk_model, &row_iter, NULL, row);
-  DCHECK(r);
-  gchar* text = NULL;
-  gtk_tree_model_get(gtk_model, &row_iter, column, &text, -1);
-  DCHECK(text);
-  std::string value(text);
-  g_free(text);
-  return value;
-#endif
-}
-
-// Tests that the table correctly reflects changes to the model.
-TEST_F(TableView2Test, ModelChangesTest) {
-  ASSERT_EQ(3, table_->GetRowCount());
-  EXPECT_EQ("0", GetCellValue(0, 0));
-  EXPECT_EQ("1", GetCellValue(1, 0));
-  EXPECT_EQ("2", GetCellValue(2, 1));
-
-  // Test adding rows and that OnItemsAdded works.
-  model_->AddRow(3, 3, 3);
-  model_->AddRow(4, 4, 4);
-  table_->OnItemsAdded(3, 2);
-  ASSERT_EQ(5, table_->GetRowCount());
-  EXPECT_EQ("3", GetCellValue(3, 0));
-  EXPECT_EQ("4", GetCellValue(4, 1));
-
-  // Test removing rows and that OnItemsRemoved works.
-  model_->RemoveRow(1);
-  model_->RemoveRow(1);
-  table_->OnItemsRemoved(1, 2);
-  ASSERT_EQ(3, table_->GetRowCount());
-  EXPECT_EQ("0", GetCellValue(0, 0));
-  EXPECT_EQ("3", GetCellValue(1, 0));
-  EXPECT_EQ("4", GetCellValue(2, 1));
-
-  // Test changing rows and that OnItemsChanged works.
-  model_->ChangeRow(1, 1, 1);
-  model_->ChangeRow(2, 2, 2);
-  table_->OnItemsChanged(1, 2);
-  EXPECT_EQ("0", GetCellValue(0, 0));
-  EXPECT_EQ("1", GetCellValue(1, 0));
-  EXPECT_EQ("2", GetCellValue(2, 1));
-
-  // Test adding and removing rows and using OnModelChanged.
-  model_->RemoveRow(2);
-  model_->AddRow(2, 5, 5);
-  model_->AddRow(3, 6, 6);
-  table_->OnModelChanged();
-  ASSERT_EQ(4, table_->GetRowCount());
-  EXPECT_EQ("0", GetCellValue(0, 0));
-  EXPECT_EQ("1", GetCellValue(1, 0));
-  EXPECT_EQ("5", GetCellValue(2, 1));
-  EXPECT_EQ("6", GetCellValue(3, 1));
-}
-
-// Test the selection on a single-selection table.
-TEST_F(TableView2Test, SingleSelectionTest) {
-  EXPECT_EQ(0, table_->SelectedRowCount());
-  EXPECT_EQ(-1, table_->GetFirstSelectedRow());
-
-  table_->SelectRow(0);
-  EXPECT_EQ(1, table_->SelectedRowCount());
-  EXPECT_EQ(0, table_->GetFirstSelectedRow());
-
-  table_->SelectRow(2);
-  EXPECT_EQ(1, table_->SelectedRowCount());
-  EXPECT_EQ(2, table_->GetFirstSelectedRow());
-
-  table_->ClearSelection();
-  EXPECT_EQ(0, table_->SelectedRowCount());
-  EXPECT_EQ(-1, table_->GetFirstSelectedRow());
-}
-
-// Row focusing are not supported on Linux yet.
-#if defined(OS_WIN)
-// Test the row focus on a single-selection table.
-TEST_F(TableView2Test, RowFocusTest) {
-  EXPECT_EQ(-1, table_->GetFirstFocusedRow());
-
-  table_->FocusRow(0);
-  EXPECT_EQ(0, table_->GetFirstFocusedRow());
-
-  table_->FocusRow(2);
-  EXPECT_EQ(2, table_->GetFirstFocusedRow());
-
-  table_->ClearRowFocus();
-  EXPECT_EQ(-1, table_->GetFirstSelectedRow());
-}
-#endif
-
-}  // namespace views