| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/app_list/views/search_result_page_view.h" | 5 #include "ui/app_list/views/search_result_page_view.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "ui/app_list/app_list_model.h" | 9 #include "ui/app_list/app_list_model.h" |
| 10 #include "ui/app_list/test/app_list_test_view_delegate.h" | 10 #include "ui/app_list/test/app_list_test_view_delegate.h" |
| 11 #include "ui/app_list/test/test_search_result.h" | 11 #include "ui/app_list/test/test_search_result.h" |
| 12 #include "ui/app_list/views/search_result_list_view.h" | 12 #include "ui/app_list/views/search_result_list_view.h" |
| 13 #include "ui/app_list/views/search_result_list_view_delegate.h" | 13 #include "ui/app_list/views/search_result_list_view_delegate.h" |
| 14 #include "ui/app_list/views/search_result_tile_item_list_view.h" | 14 #include "ui/app_list/views/search_result_tile_item_list_view.h" |
| 15 #include "ui/app_list/views/search_result_view.h" | 15 #include "ui/app_list/views/search_result_view.h" |
| 16 #include "ui/views/controls/textfield/textfield.h" |
| 16 #include "ui/views/test/views_test_base.h" | 17 #include "ui/views/test/views_test_base.h" |
| 17 | 18 |
| 18 namespace app_list { | 19 namespace app_list { |
| 19 namespace test { | 20 namespace test { |
| 20 | 21 |
| 21 class SearchResultPageViewTest : public views::ViewsTestBase, | 22 class SearchResultPageViewTest : public views::ViewsTestBase, |
| 22 public SearchResultListViewDelegate { | 23 public SearchResultListViewDelegate { |
| 23 public: | 24 public: |
| 24 SearchResultPageViewTest() {} | 25 SearchResultPageViewTest() {} |
| 25 ~SearchResultPageViewTest() override {} | 26 ~SearchResultPageViewTest() override {} |
| 26 | 27 |
| 27 // Overridden from testing::Test: | 28 // Overridden from testing::Test: |
| 28 void SetUp() override { | 29 void SetUp() override { |
| 29 views::ViewsTestBase::SetUp(); | 30 views::ViewsTestBase::SetUp(); |
| 30 view_.reset(new SearchResultPageView()); | 31 view_.reset(new SearchResultPageView()); |
| 31 list_view_ = new SearchResultListView(this, &view_delegate_); | 32 list_view_ = new SearchResultListView(this, &view_delegate_); |
| 32 view_->AddSearchResultContainerView(GetResults(), list_view_); | 33 view_->AddSearchResultContainerView(GetResults(), list_view_); |
| 33 tile_list_view_ = new SearchResultTileItemListView(); | 34 textfield_.reset(new views::Textfield()); |
| 35 tile_list_view_ = new SearchResultTileItemListView(textfield_.get()); |
| 34 view_->AddSearchResultContainerView(GetResults(), tile_list_view_); | 36 view_->AddSearchResultContainerView(GetResults(), tile_list_view_); |
| 35 } | 37 } |
| 36 | 38 |
| 37 protected: | 39 protected: |
| 38 SearchResultPageView* view() { return view_.get(); } | 40 SearchResultPageView* view() { return view_.get(); } |
| 39 | 41 |
| 40 SearchResultListView* list_view() { return list_view_; } | 42 SearchResultListView* list_view() { return list_view_; } |
| 41 SearchResultTileItemListView* tile_list_view() { return tile_list_view_; } | 43 SearchResultTileItemListView* tile_list_view() { return tile_list_view_; } |
| 42 | 44 |
| 43 AppListModel::SearchResults* GetResults() { | 45 AppListModel::SearchResults* GetResults() { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 67 } | 69 } |
| 68 | 70 |
| 69 private: | 71 private: |
| 70 void OnResultInstalled(SearchResult* result) override {} | 72 void OnResultInstalled(SearchResult* result) override {} |
| 71 | 73 |
| 72 SearchResultListView* list_view_; | 74 SearchResultListView* list_view_; |
| 73 SearchResultTileItemListView* tile_list_view_; | 75 SearchResultTileItemListView* tile_list_view_; |
| 74 | 76 |
| 75 AppListTestViewDelegate view_delegate_; | 77 AppListTestViewDelegate view_delegate_; |
| 76 scoped_ptr<SearchResultPageView> view_; | 78 scoped_ptr<SearchResultPageView> view_; |
| 79 scoped_ptr<views::Textfield> textfield_; |
| 77 | 80 |
| 78 DISALLOW_COPY_AND_ASSIGN(SearchResultPageViewTest); | 81 DISALLOW_COPY_AND_ASSIGN(SearchResultPageViewTest); |
| 79 }; | 82 }; |
| 80 | 83 |
| 81 TEST_F(SearchResultPageViewTest, Basic) { | 84 TEST_F(SearchResultPageViewTest, Basic) { |
| 82 std::map<SearchResult::DisplayType, int> result_types; | 85 std::map<SearchResult::DisplayType, int> result_types; |
| 83 const int kListResults = 2; | 86 const int kListResults = 2; |
| 84 const int kTileResults = 1; | 87 const int kTileResults = 1; |
| 85 result_types[SearchResult::DISPLAY_LIST] = kListResults; | 88 result_types[SearchResult::DISPLAY_LIST] = kListResults; |
| 86 result_types[SearchResult::DISPLAY_TILE] = kTileResults; | 89 result_types[SearchResult::DISPLAY_TILE] = kTileResults; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 114 // Navigate off top of list. | 117 // Navigate off top of list. |
| 115 EXPECT_TRUE(KeyPress(ui::VKEY_UP)); | 118 EXPECT_TRUE(KeyPress(ui::VKEY_UP)); |
| 116 EXPECT_EQ(0, list_view()->selected_index()); | 119 EXPECT_EQ(0, list_view()->selected_index()); |
| 117 EXPECT_FALSE(KeyPress(ui::VKEY_UP)); | 120 EXPECT_FALSE(KeyPress(ui::VKEY_UP)); |
| 118 EXPECT_EQ(0, list_view()->selected_index()); | 121 EXPECT_EQ(0, list_view()->selected_index()); |
| 119 EXPECT_EQ(0, GetSelectedIndex()); | 122 EXPECT_EQ(0, GetSelectedIndex()); |
| 120 } | 123 } |
| 121 | 124 |
| 122 } // namespace test | 125 } // namespace test |
| 123 } // namespace app_list | 126 } // namespace app_list |
| OLD | NEW |