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/app_list_view.h" | 5 #include "ui/app_list/views/app_list_view.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
11 #include "ui/app_list/app_list_switches.h" | 11 #include "ui/app_list/app_list_switches.h" |
12 #include "ui/app_list/pagination_model.h" | 12 #include "ui/app_list/pagination_model.h" |
13 #include "ui/app_list/test/app_list_test_model.h" | 13 #include "ui/app_list/test/app_list_test_model.h" |
14 #include "ui/app_list/test/app_list_test_view_delegate.h" | 14 #include "ui/app_list/test/app_list_test_view_delegate.h" |
15 #include "ui/app_list/views/app_list_folder_view.h" | 15 #include "ui/app_list/views/app_list_folder_view.h" |
16 #include "ui/app_list/views/app_list_main_view.h" | 16 #include "ui/app_list/views/app_list_main_view.h" |
17 #include "ui/app_list/views/apps_container_view.h" | 17 #include "ui/app_list/views/apps_container_view.h" |
18 #include "ui/app_list/views/apps_grid_view.h" | 18 #include "ui/app_list/views/apps_grid_view.h" |
19 #include "ui/app_list/views/contents_view.h" | 19 #include "ui/app_list/views/contents_view.h" |
20 #include "ui/app_list/views/search_box_view.h" | 20 #include "ui/app_list/views/search_box_view.h" |
21 #include "ui/app_list/views/start_page_view.h" | 21 #include "ui/app_list/views/start_page_view.h" |
22 #include "ui/app_list/views/test/apps_grid_view_test_api.h" | 22 #include "ui/app_list/views/test/apps_grid_view_test_api.h" |
| 23 #include "ui/app_list/views/tile_item_view.h" |
23 #include "ui/aura/test/aura_test_base.h" | 24 #include "ui/aura/test/aura_test_base.h" |
24 #include "ui/aura/window.h" | 25 #include "ui/aura/window.h" |
25 #include "ui/views/test/views_test_base.h" | 26 #include "ui/views/test/views_test_base.h" |
26 #include "ui/views/views_delegate.h" | 27 #include "ui/views/views_delegate.h" |
27 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 28 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
28 | 29 |
29 namespace app_list { | 30 namespace app_list { |
30 namespace test { | 31 namespace test { |
31 | 32 |
32 namespace { | 33 namespace { |
33 | 34 |
34 enum TestType { | 35 enum TestType { |
35 TEST_TYPE_START = 0, | 36 TEST_TYPE_START = 0, |
36 NORMAL = TEST_TYPE_START, | 37 NORMAL = TEST_TYPE_START, |
37 LANDSCAPE, | 38 LANDSCAPE, |
38 EXPERIMENTAL, | 39 EXPERIMENTAL, |
39 TEST_TYPE_END, | 40 TEST_TYPE_END, |
40 }; | 41 }; |
41 | 42 |
42 bool IsViewAtOrigin(views::View* view) { | 43 bool IsViewAtOrigin(views::View* view) { |
43 return view->bounds().origin().IsOrigin(); | 44 return view->bounds().origin().IsOrigin(); |
44 } | 45 } |
45 | 46 |
| 47 size_t GetVisibleTileItemViews(const std::vector<TileItemView*>& tiles) { |
| 48 size_t count = 0; |
| 49 for (std::vector<TileItemView*>::const_iterator it = tiles.begin(); |
| 50 it != tiles.end(); |
| 51 ++it) { |
| 52 if ((*it)->visible()) |
| 53 count++; |
| 54 } |
| 55 return count; |
| 56 } |
| 57 |
46 // Choose a set that is 3 regular app list pages and 2 landscape app list pages. | 58 // Choose a set that is 3 regular app list pages and 2 landscape app list pages. |
47 const int kInitialItems = 34; | 59 const int kInitialItems = 34; |
48 | 60 |
49 // Allows the same tests to run with different contexts: either an Ash-style | 61 // Allows the same tests to run with different contexts: either an Ash-style |
50 // root window or a desktop window tree host. | 62 // root window or a desktop window tree host. |
51 class AppListViewTestContext { | 63 class AppListViewTestContext { |
52 public: | 64 public: |
53 AppListViewTestContext(int test_type, aura::Window* parent); | 65 AppListViewTestContext(int test_type, aura::Window* parent); |
54 ~AppListViewTestContext(); | 66 ~AppListViewTestContext(); |
55 | 67 |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 EXPECT_NO_FATAL_FAILURE(CheckView(main_view)); | 253 EXPECT_NO_FATAL_FAILURE(CheckView(main_view)); |
242 EXPECT_NO_FATAL_FAILURE(CheckView(container_view->apps_grid_view())); | 254 EXPECT_NO_FATAL_FAILURE(CheckView(container_view->apps_grid_view())); |
243 EXPECT_FALSE(container_view->app_list_folder_view()->visible()); | 255 EXPECT_FALSE(container_view->app_list_folder_view()->visible()); |
244 | 256 |
245 Close(); | 257 Close(); |
246 } | 258 } |
247 | 259 |
248 void AppListViewTestContext::RunStartPageTest() { | 260 void AppListViewTestContext::RunStartPageTest() { |
249 EXPECT_FALSE(view_->GetWidget()->IsVisible()); | 261 EXPECT_FALSE(view_->GetWidget()->IsVisible()); |
250 EXPECT_EQ(-1, pagination_model_.total_pages()); | 262 EXPECT_EQ(-1, pagination_model_.total_pages()); |
251 delegate_->GetTestModel()->PopulateApps(kInitialItems); | 263 AppListTestModel* model = delegate_->GetTestModel(); |
| 264 model->PopulateApps(3); |
252 | 265 |
253 Show(); | 266 Show(); |
254 | 267 |
255 AppListMainView* main_view = view_->app_list_main_view(); | 268 AppListMainView* main_view = view_->app_list_main_view(); |
256 StartPageView* start_page_view = | 269 StartPageView* start_page_view = |
257 main_view->contents_view()->start_page_view(); | 270 main_view->contents_view()->start_page_view(); |
258 // Checks on the main view. | 271 // Checks on the main view. |
259 EXPECT_NO_FATAL_FAILURE(CheckView(main_view)); | 272 EXPECT_NO_FATAL_FAILURE(CheckView(main_view)); |
260 EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view())); | 273 EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view())); |
261 if (test_type_ == EXPERIMENTAL) { | 274 if (test_type_ == EXPERIMENTAL) { |
262 EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view)); | 275 EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view)); |
263 | 276 |
264 main_view->contents_view()->SetShowState(ContentsView::SHOW_START_PAGE); | 277 main_view->contents_view()->SetShowState(ContentsView::SHOW_START_PAGE); |
265 main_view->contents_view()->Layout(); | 278 main_view->contents_view()->Layout(); |
266 EXPECT_FALSE(main_view->search_box_view()->visible()); | 279 EXPECT_FALSE(main_view->search_box_view()->visible()); |
267 EXPECT_TRUE(IsViewAtOrigin(start_page_view)); | 280 EXPECT_TRUE(IsViewAtOrigin(start_page_view)); |
268 EXPECT_FALSE( | 281 EXPECT_FALSE( |
269 IsViewAtOrigin(main_view->contents_view()->apps_container_view())); | 282 IsViewAtOrigin(main_view->contents_view()->apps_container_view())); |
| 283 EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views())); |
270 | 284 |
271 main_view->contents_view()->SetShowState(ContentsView::SHOW_APPS); | 285 main_view->contents_view()->SetShowState(ContentsView::SHOW_APPS); |
272 main_view->contents_view()->Layout(); | 286 main_view->contents_view()->Layout(); |
273 EXPECT_TRUE(main_view->search_box_view()->visible()); | 287 EXPECT_TRUE(main_view->search_box_view()->visible()); |
274 EXPECT_FALSE(IsViewAtOrigin(start_page_view)); | 288 EXPECT_FALSE(IsViewAtOrigin(start_page_view)); |
275 EXPECT_TRUE( | 289 EXPECT_TRUE( |
276 IsViewAtOrigin(main_view->contents_view()->apps_container_view())); | 290 IsViewAtOrigin(main_view->contents_view()->apps_container_view())); |
| 291 |
| 292 // Check tiles hide and show on deletion and addition. |
| 293 model->CreateAndAddItem("Test app"); |
| 294 EXPECT_EQ(4u, GetVisibleTileItemViews(start_page_view->tile_views())); |
| 295 model->DeleteItem(model->GetItemName(0)); |
| 296 EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views())); |
277 } else { | 297 } else { |
278 EXPECT_EQ(NULL, start_page_view); | 298 EXPECT_EQ(NULL, start_page_view); |
279 } | 299 } |
280 | 300 |
281 Close(); | 301 Close(); |
282 } | 302 } |
283 | 303 |
284 class AppListViewTestAura : public views::ViewsTestBase, | 304 class AppListViewTestAura : public views::ViewsTestBase, |
285 public ::testing::WithParamInterface<int> { | 305 public ::testing::WithParamInterface<int> { |
286 public: | 306 public: |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, | 417 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, |
398 AppListViewTestAura, | 418 AppListViewTestAura, |
399 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 419 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
400 | 420 |
401 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, | 421 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, |
402 AppListViewTestDesktop, | 422 AppListViewTestDesktop, |
403 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 423 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
404 | 424 |
405 } // namespace test | 425 } // namespace test |
406 } // namespace app_list | 426 } // namespace app_list |
OLD | NEW |