Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: views/focus/focus_manager_unittest.cc

Issue 7307038: Revert 91716 - Temporarily disable these tests while I repro the crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 tabbed_pane->AddTab(L"Awesome tab", nested_tabbed_pane); 1058 tabbed_pane->AddTab(L"Awesome tab", nested_tabbed_pane);
1059 nested_tabbed_pane->AddTab(L"Awesomer tab", tab_button); 1059 nested_tabbed_pane->AddTab(L"Awesomer tab", tab_button);
1060 1060
1061 EXPECT_TRUE(GetFocusManager()->ContainsView(view)); 1061 EXPECT_TRUE(GetFocusManager()->ContainsView(view));
1062 EXPECT_TRUE(GetFocusManager()->ContainsView(tabbed_pane)); 1062 EXPECT_TRUE(GetFocusManager()->ContainsView(tabbed_pane));
1063 EXPECT_TRUE(GetFocusManager()->ContainsView(nested_tabbed_pane)); 1063 EXPECT_TRUE(GetFocusManager()->ContainsView(nested_tabbed_pane));
1064 EXPECT_TRUE(GetFocusManager()->ContainsView(tab_button)); 1064 EXPECT_TRUE(GetFocusManager()->ContainsView(tab_button));
1065 EXPECT_FALSE(GetFocusManager()->ContainsView(detached_view.get())); 1065 EXPECT_FALSE(GetFocusManager()->ContainsView(detached_view.get()));
1066 } 1066 }
1067 1067
1068 TEST_F(FocusTraversalTest, DISABLED_NormalTraversal) { 1068 TEST_F(FocusTraversalTest, NormalTraversal) {
1069 const int kTraversalIDs[] = { kTopCheckBoxID, kAppleTextfieldID, 1069 const int kTraversalIDs[] = { kTopCheckBoxID, kAppleTextfieldID,
1070 kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID, 1070 kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID,
1071 kFruitButtonID, kFruitCheckBoxID, kComboboxID, kBroccoliButtonID, 1071 kFruitButtonID, kFruitCheckBoxID, kComboboxID, kBroccoliButtonID,
1072 kRosettaLinkID, kStupeurEtTremblementLinkID, 1072 kRosettaLinkID, kStupeurEtTremblementLinkID,
1073 kDinerGameLinkID, kRidiculeLinkID, kClosetLinkID, kVisitingLinkID, 1073 kDinerGameLinkID, kRidiculeLinkID, kClosetLinkID, kVisitingLinkID,
1074 kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID, 1074 kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
1075 kTaxiLinkID, kAsterixLinkID, kOKButtonID, kCancelButtonID, kHelpButtonID, 1075 kTaxiLinkID, kAsterixLinkID, kOKButtonID, kCancelButtonID, kHelpButtonID,
1076 kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID, 1076 kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
1077 kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID, 1077 kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
1078 kSearchTextfieldID, kSearchButtonID, kHelpLinkID, 1078 kSearchTextfieldID, kSearchButtonID, kHelpLinkID,
(...skipping 22 matching lines...) Expand all
1101 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) { 1101 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
1102 GetFocusManager()->AdvanceFocus(true); 1102 GetFocusManager()->AdvanceFocus(true);
1103 View* focused_view = GetFocusManager()->GetFocusedView(); 1103 View* focused_view = GetFocusManager()->GetFocusedView();
1104 EXPECT_TRUE(focused_view != NULL); 1104 EXPECT_TRUE(focused_view != NULL);
1105 if (focused_view) 1105 if (focused_view)
1106 EXPECT_EQ(kTraversalIDs[j], focused_view->id()); 1106 EXPECT_EQ(kTraversalIDs[j], focused_view->id());
1107 } 1107 }
1108 } 1108 }
1109 } 1109 }
1110 1110
1111 TEST_F(FocusTraversalTest, DISABLED_TraversalWithNonEnabledViews) { 1111 TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
1112 const int kDisabledIDs[] = { 1112 const int kDisabledIDs[] = {
1113 kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID, 1113 kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID,
1114 kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID, 1114 kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID,
1115 kTaxiLinkID, kAsterixLinkID, kHelpButtonID, kBoldCheckBoxID, 1115 kTaxiLinkID, kAsterixLinkID, kHelpButtonID, kBoldCheckBoxID,
1116 kSearchTextfieldID, kHelpLinkID }; 1116 kSearchTextfieldID, kHelpLinkID };
1117 1117
1118 const int kTraversalIDs[] = { kTopCheckBoxID, kAppleTextfieldID, 1118 const int kTraversalIDs[] = { kTopCheckBoxID, kAppleTextfieldID,
1119 kOrangeTextfieldID, kKiwiTextfieldID, kFruitButtonID, kBroccoliButtonID, 1119 kOrangeTextfieldID, kKiwiTextfieldID, kFruitButtonID, kBroccoliButtonID,
1120 kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID, 1120 kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID,
1121 kRidiculeLinkID, kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, 1121 kRidiculeLinkID, kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) { 1154 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
1155 GetFocusManager()->AdvanceFocus(true); 1155 GetFocusManager()->AdvanceFocus(true);
1156 focused_view = GetFocusManager()->GetFocusedView(); 1156 focused_view = GetFocusManager()->GetFocusedView();
1157 EXPECT_TRUE(focused_view != NULL); 1157 EXPECT_TRUE(focused_view != NULL);
1158 if (focused_view) 1158 if (focused_view)
1159 EXPECT_EQ(kTraversalIDs[j], focused_view->id()); 1159 EXPECT_EQ(kTraversalIDs[j], focused_view->id());
1160 } 1160 }
1161 } 1161 }
1162 } 1162 }
1163 1163
1164 TEST_F(FocusTraversalTest, DISABLED_TraversalWithInvisibleViews) { 1164 TEST_F(FocusTraversalTest, TraversalWithInvisibleViews) {
1165 const int kInvisibleIDs[] = { kTopCheckBoxID, kOKButtonID, 1165 const int kInvisibleIDs[] = { kTopCheckBoxID, kOKButtonID,
1166 kThumbnailContainerID }; 1166 kThumbnailContainerID };
1167 1167
1168 const int kTraversalIDs[] = { kAppleTextfieldID, kOrangeTextfieldID, 1168 const int kTraversalIDs[] = { kAppleTextfieldID, kOrangeTextfieldID,
1169 kBananaTextfieldID, kKiwiTextfieldID, kFruitButtonID, kFruitCheckBoxID, 1169 kBananaTextfieldID, kKiwiTextfieldID, kFruitButtonID, kFruitCheckBoxID,
1170 kComboboxID, kBroccoliButtonID, kRosettaLinkID, 1170 kComboboxID, kBroccoliButtonID, kRosettaLinkID,
1171 kStupeurEtTremblementLinkID, kDinerGameLinkID, kRidiculeLinkID, 1171 kStupeurEtTremblementLinkID, kDinerGameLinkID, kRidiculeLinkID,
1172 kClosetLinkID, kVisitingLinkID, kAmelieLinkID, kJoyeuxNoelLinkID, 1172 kClosetLinkID, kVisitingLinkID, kAmelieLinkID, kJoyeuxNoelLinkID,
1173 kCampingLinkID, kBriceDeNiceLinkID, kTaxiLinkID, kAsterixLinkID, 1173 kCampingLinkID, kBriceDeNiceLinkID, kTaxiLinkID, kAsterixLinkID,
1174 kCancelButtonID, kHelpButtonID, kStyleContainerID, kBoldCheckBoxID, 1174 kCancelButtonID, kHelpButtonID, kStyleContainerID, kBoldCheckBoxID,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) { 1206 for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
1207 GetFocusManager()->AdvanceFocus(true); 1207 GetFocusManager()->AdvanceFocus(true);
1208 focused_view = GetFocusManager()->GetFocusedView(); 1208 focused_view = GetFocusManager()->GetFocusedView();
1209 EXPECT_TRUE(focused_view != NULL); 1209 EXPECT_TRUE(focused_view != NULL);
1210 if (focused_view) 1210 if (focused_view)
1211 EXPECT_EQ(kTraversalIDs[j], focused_view->id()); 1211 EXPECT_EQ(kTraversalIDs[j], focused_view->id());
1212 } 1212 }
1213 } 1213 }
1214 } 1214 }
1215 1215
1216 TEST_F(FocusTraversalTest, DISABLED_PaneTraversal) { 1216 TEST_F(FocusTraversalTest, PaneTraversal) {
1217 // Tests trapping the traversal within a pane - useful for full 1217 // Tests trapping the traversal within a pane - useful for full
1218 // keyboard accessibility for toolbars. 1218 // keyboard accessibility for toolbars.
1219 1219
1220 // First test the left container. 1220 // First test the left container.
1221 const int kLeftTraversalIDs[] = { 1221 const int kLeftTraversalIDs[] = {
1222 kAppleTextfieldID, 1222 kAppleTextfieldID,
1223 kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID, 1223 kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID,
1224 kFruitButtonID, kFruitCheckBoxID, kComboboxID }; 1224 kFruitButtonID, kFruitCheckBoxID, kComboboxID };
1225 1225
1226 FocusSearch focus_search_left(left_container_, true, false); 1226 FocusSearch focus_search_left(left_container_, true, false);
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size())); 1727 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
1728 1728
1729 // Focus manager should be the last one to destruct. 1729 // Focus manager should be the last one to destruct.
1730 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str()); 1730 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
1731 1731
1732 // Clear window_ so that we don't try to close it again. 1732 // Clear window_ so that we don't try to close it again.
1733 window_ = NULL; 1733 window_ = NULL;
1734 } 1734 }
1735 1735
1736 } // namespace views 1736 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698