| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "app/table_model.h" | 7 #include "app/table_model.h" |
| 8 #include "app/table_model_observer.h" | 8 #include "app/table_model_observer.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 // Creates the model. | 229 // Creates the model. |
| 230 TestTableModel* CreateModel() { | 230 TestTableModel* CreateModel() { |
| 231 return NULL; | 231 return NULL; |
| 232 } | 232 } |
| 233 }; | 233 }; |
| 234 | 234 |
| 235 // Tests ----------------------------------------------------------------------- | 235 // Tests ----------------------------------------------------------------------- |
| 236 | 236 |
| 237 // Failing: http://crbug.com/45015 | 237 // Failing: http://crbug.com/45015 |
| 238 // Tests various sorting permutations. | 238 // Tests various sorting permutations. |
| 239 TEST_F(TableViewTest, FAILS_Sort) { | 239 TEST_F(TableViewTest, DISABLED_Sort) { |
| 240 // Sort by first column descending. | 240 // Sort by first column descending. |
| 241 TableView::SortDescriptors sort; | 241 TableView::SortDescriptors sort; |
| 242 sort.push_back(TableView::SortDescriptor(0, false)); | 242 sort.push_back(TableView::SortDescriptor(0, false)); |
| 243 table_->SetSortDescriptors(sort); | 243 table_->SetSortDescriptors(sort); |
| 244 VeriyViewOrder(2, 1, 0, -1); | 244 VeriyViewOrder(2, 1, 0, -1); |
| 245 if (HasFatalFailure()) | 245 if (HasFatalFailure()) |
| 246 return; | 246 return; |
| 247 | 247 |
| 248 // Sort by second column ascending, first column descending. | 248 // Sort by second column ascending, first column descending. |
| 249 sort.clear(); | 249 sort.clear(); |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 table_->FocusRow(0); | 564 table_->FocusRow(0); |
| 565 EXPECT_EQ(0, table_->GetFirstFocusedRow()); | 565 EXPECT_EQ(0, table_->GetFirstFocusedRow()); |
| 566 | 566 |
| 567 table_->FocusRow(2); | 567 table_->FocusRow(2); |
| 568 EXPECT_EQ(2, table_->GetFirstFocusedRow()); | 568 EXPECT_EQ(2, table_->GetFirstFocusedRow()); |
| 569 | 569 |
| 570 table_->ClearRowFocus(); | 570 table_->ClearRowFocus(); |
| 571 EXPECT_EQ(-1, table_->GetFirstSelectedRow()); | 571 EXPECT_EQ(-1, table_->GetFirstSelectedRow()); |
| 572 } | 572 } |
| 573 #endif | 573 #endif |
| OLD | NEW |