| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/app_list_item_list.h" | 5 #include "ui/app_list/app_list_item_list.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "ui/app_list/app_list_folder_item.h" | 10 #include "ui/app_list/app_list_folder_item.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 AppListItem* item_1 = CreateAndAddItem(GetItemId(1)); | 171 AppListItem* item_1 = CreateAndAddItem(GetItemId(1)); |
| 172 AppListItem* item_2 = CreateAndAddItem(GetItemId(2)); | 172 AppListItem* item_2 = CreateAndAddItem(GetItemId(2)); |
| 173 EXPECT_EQ(item_list_.item_count(), 3u); | 173 EXPECT_EQ(item_list_.item_count(), 3u); |
| 174 EXPECT_EQ(observer_.items_added(), 3u); | 174 EXPECT_EQ(observer_.items_added(), 3u); |
| 175 size_t index; | 175 size_t index; |
| 176 EXPECT_TRUE(FindItemIndex(item_1->id(), &index)); | 176 EXPECT_TRUE(FindItemIndex(item_1->id(), &index)); |
| 177 EXPECT_EQ(index, 1u); | 177 EXPECT_EQ(index, 1u); |
| 178 EXPECT_TRUE(VerifyItemListOrdinals()); | 178 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 179 | 179 |
| 180 scoped_ptr<AppListItem> item_removed = RemoveItemAt(1); | 180 scoped_ptr<AppListItem> item_removed = RemoveItemAt(1); |
| 181 EXPECT_EQ(item_removed, item_1); | 181 EXPECT_EQ(item_removed.get(), item_1); |
| 182 EXPECT_FALSE(FindItem(item_1->id())); | 182 EXPECT_FALSE(FindItem(item_1->id())); |
| 183 EXPECT_EQ(item_list_.item_count(), 2u); | 183 EXPECT_EQ(item_list_.item_count(), 2u); |
| 184 EXPECT_EQ(observer_.items_removed(), 1u); | 184 EXPECT_EQ(observer_.items_removed(), 1u); |
| 185 EXPECT_EQ(item_list_.item_at(0), item_0); | 185 EXPECT_EQ(item_list_.item_at(0), item_0); |
| 186 EXPECT_EQ(item_list_.item_at(1), item_2); | 186 EXPECT_EQ(item_list_.item_at(1), item_2); |
| 187 EXPECT_TRUE(VerifyItemListOrdinals()); | 187 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 188 } | 188 } |
| 189 | 189 |
| 190 TEST_F(AppListItemListTest, RemoveItem) { | 190 TEST_F(AppListItemListTest, RemoveItem) { |
| 191 AppListItem* item_0 = CreateAndAddItem(GetItemId(0)); | 191 AppListItem* item_0 = CreateAndAddItem(GetItemId(0)); |
| 192 AppListItem* item_1 = CreateAndAddItem(GetItemId(1)); | 192 AppListItem* item_1 = CreateAndAddItem(GetItemId(1)); |
| 193 AppListItem* item_2 = CreateAndAddItem(GetItemId(2)); | 193 AppListItem* item_2 = CreateAndAddItem(GetItemId(2)); |
| 194 EXPECT_EQ(item_list_.item_count(), 3u); | 194 EXPECT_EQ(item_list_.item_count(), 3u); |
| 195 EXPECT_EQ(observer_.items_added(), 3u); | 195 EXPECT_EQ(observer_.items_added(), 3u); |
| 196 EXPECT_EQ(item_0, item_list_.item_at(0)); | 196 EXPECT_EQ(item_0, item_list_.item_at(0)); |
| 197 EXPECT_EQ(item_1, item_list_.item_at(1)); | 197 EXPECT_EQ(item_1, item_list_.item_at(1)); |
| 198 EXPECT_EQ(item_2, item_list_.item_at(2)); | 198 EXPECT_EQ(item_2, item_list_.item_at(2)); |
| 199 EXPECT_TRUE(VerifyItemListOrdinals()); | 199 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 200 | 200 |
| 201 size_t index; | 201 size_t index; |
| 202 EXPECT_TRUE(FindItemIndex(item_1->id(), &index)); | 202 EXPECT_TRUE(FindItemIndex(item_1->id(), &index)); |
| 203 EXPECT_EQ(index, 1u); | 203 EXPECT_EQ(index, 1u); |
| 204 | 204 |
| 205 scoped_ptr<AppListItem> item_removed = RemoveItem(item_1->id()); | 205 scoped_ptr<AppListItem> item_removed = RemoveItem(item_1->id()); |
| 206 EXPECT_EQ(item_removed, item_1); | 206 EXPECT_EQ(item_removed.get(), item_1); |
| 207 EXPECT_FALSE(FindItem(item_1->id())); | 207 EXPECT_FALSE(FindItem(item_1->id())); |
| 208 EXPECT_EQ(item_list_.item_count(), 2u); | 208 EXPECT_EQ(item_list_.item_count(), 2u); |
| 209 EXPECT_EQ(observer_.items_removed(), 1u); | 209 EXPECT_EQ(observer_.items_removed(), 1u); |
| 210 EXPECT_TRUE(VerifyItemListOrdinals()); | 210 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 211 } | 211 } |
| 212 | 212 |
| 213 TEST_F(AppListItemListTest, MoveItem) { | 213 TEST_F(AppListItemListTest, MoveItem) { |
| 214 CreateAndAddItem(GetItemId(0)); | 214 CreateAndAddItem(GetItemId(0)); |
| 215 CreateAndAddItem(GetItemId(1)); | 215 CreateAndAddItem(GetItemId(1)); |
| 216 CreateAndAddItem(GetItemId(2)); | 216 CreateAndAddItem(GetItemId(2)); |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 EXPECT_TRUE(VerifyItemListOrdinals()); | 355 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 356 EXPECT_TRUE(VerifyItemOrder4(2, 0, 3, 1)); | 356 EXPECT_TRUE(VerifyItemOrder4(2, 0, 3, 1)); |
| 357 // last -> last | 357 // last -> last |
| 358 item_list_.SetItemPosition(item_list_.item_at(3), | 358 item_list_.SetItemPosition(item_list_.item_at(3), |
| 359 item_list_.item_at(3)->position().CreateAfter()); | 359 item_list_.item_at(3)->position().CreateAfter()); |
| 360 EXPECT_TRUE(VerifyItemListOrdinals()); | 360 EXPECT_TRUE(VerifyItemListOrdinals()); |
| 361 EXPECT_TRUE(VerifyItemOrder4(2, 0, 3, 1)); | 361 EXPECT_TRUE(VerifyItemOrder4(2, 0, 3, 1)); |
| 362 } | 362 } |
| 363 | 363 |
| 364 } // namespace app_list | 364 } // namespace app_list |
| OLD | NEW |