summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authornkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 16:07:10 +0000
committernkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 16:07:10 +0000
commitd14aab8fa55cf25a061ca220e79367c9d0402fe6 (patch)
tree79b9917411fa8d05e6c3e8d624405dae9e131453 /views
parent79d021115f2452cd8c0f259d8a912562cf29aa1b (diff)
downloadchromium_src-d14aab8fa55cf25a061ca220e79367c9d0402fe6.zip
chromium_src-d14aab8fa55cf25a061ca220e79367c9d0402fe6.tar.gz
chromium_src-d14aab8fa55cf25a061ca220e79367c9d0402fe6.tar.bz2
TableViewTests.Sort* started crashing. Marking as DISABLED_.
Revert 48168 - Mark TreeViewTests as FAILS_ rather than DISABLED_ TBR=jcivelli BUG=45015 Review URL: http://codereview.chromium.org/2171006 TBR=rafaelw@chromium.org Review URL: http://codereview.chromium.org/2824016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/table/table_view_unittest.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
index 852fd09..4ad3fd2 100644
--- a/views/controls/table/table_view_unittest.cc
+++ b/views/controls/table/table_view_unittest.cc
@@ -264,7 +264,7 @@ TEST_F(TableViewTest, DISABLED_Sort) {
// Failing: http://crbug.com/45015
// Tests changing the model while sorted.
-TEST_F(TableViewTest, FAILS_SortThenChange) {
+TEST_F(TableViewTest, DISABLED_SortThenChange) {
// Sort by first column descending.
TableView::SortDescriptors sort;
sort.push_back(TableView::SortDescriptor(0, false));
@@ -279,7 +279,7 @@ TEST_F(TableViewTest, FAILS_SortThenChange) {
// Failing: http://crbug.com/45015
// Tests adding to the model while sorted.
-TEST_F(TableViewTest, FAILS_AddToSorted) {
+TEST_F(TableViewTest, DISABLED_AddToSorted) {
// Sort by first column descending.
TableView::SortDescriptors sort;
sort.push_back(TableView::SortDescriptor(0, false));
@@ -301,7 +301,7 @@ TEST_F(TableViewTest, FAILS_AddToSorted) {
// Failing: http://crbug.com/45015
// Tests selection on sort.
-TEST_F(TableViewTest, FAILS_PersistSelectionOnSort) {
+TEST_F(TableViewTest, DISABLED_PersistSelectionOnSort) {
// Select row 0.
table_->Select(0);
@@ -319,13 +319,13 @@ TEST_F(TableViewTest, FAILS_PersistSelectionOnSort) {
// Failing: http://crbug.com/45015
// Tests selection iterator with sort.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnSort) {
+TEST_F(TableViewTest, PersistMultiSelectionOnSort) {
SetUpMultiSelectTestState(true);
}
// Failing: http://crbug.com/45015
// Tests selection persists after a change when sorted with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnChangeWithSort) {
+TEST_F(TableViewTest, PersistMultiSelectionOnChangeWithSort) {
SetUpMultiSelectTestState(true);
if (HasFatalFailure())
return;
@@ -337,7 +337,7 @@ TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnChangeWithSort) {
// Failing: http://crbug.com/45015
// Tests selection persists after a remove when sorted with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnRemoveWithSort) {
+TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnRemoveWithSort) {
SetUpMultiSelectTestState(true);
if (HasFatalFailure())
return;
@@ -349,7 +349,7 @@ TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnRemoveWithSort) {
// Failing: http://crbug.com/45015
// Tests selection persists after a add when sorted with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnAddWithSort) {
+TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnAddWithSort) {
SetUpMultiSelectTestState(true);
if (HasFatalFailure())
return;
@@ -361,7 +361,7 @@ TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnAddWithSort) {
// Failing: http://crbug.com/45015
// Tests selection persists after a change with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnChange) {
+TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnChange) {
SetUpMultiSelectTestState(false);
if (HasFatalFailure())
return;
@@ -373,7 +373,7 @@ TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnChange) {
// Failing: http://crbug.com/45015
// Tests selection persists after a remove with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnRemove) {
+TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnRemove) {
SetUpMultiSelectTestState(false);
if (HasFatalFailure())
return;
@@ -385,7 +385,7 @@ TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnRemove) {
// Failing: http://crbug.com/45015
// Tests selection persists after a add with iterator.
-TEST_F(TableViewTest, FAILS_PersistMultiSelectionOnAdd) {
+TEST_F(TableViewTest, DISABLED_PersistMultiSelectionOnAdd) {
SetUpMultiSelectTestState(false);
if (HasFatalFailure())
return;