Move app list

ash/launcher/launcher_navigator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_navigator.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "base/compiler_specific.h"
@@ skipping 42 matching lines @@
 };
 
 } // namespace
 
 TEST_F(LauncherNavigatorTest, BasicCycle) {
   // An app shortcut and three windows
   LauncherItemType types[] = {
     TYPE_APP_SHORTCUT, TYPE_TABBED, TYPE_TABBED, TYPE_TABBED,
   };
   // LauncherModel automatically adds BROWSER_SHORTCUT item at the
   // beginning, so '2' refers the first TYPE_TABBED item.

[Mattias Nissler (ping if slow), 2012/09/11 08:42:30]

comment stale.

[DaveMoore, 2012/09/11 17:07:00]

Done.

-  SetupMockLauncherModel(types, arraysize(types), 2);
+  SetupMockLauncherModel(types, arraysize(types), 3);
 
-  EXPECT_EQ(3, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
+  EXPECT_EQ(4, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
 
   // Fourth one.  It will skip the APP_SHORTCUT at the beginning of the list and
   // the APP_LIST item which is automatically added at the end of items.
-  EXPECT_EQ(4, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
+  EXPECT_EQ(5, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 TEST_F(LauncherNavigatorTest, WrapToBeginning) {
   LauncherItemType types[] = {
     TYPE_APP_SHORTCUT, TYPE_TABBED, TYPE_TABBED, TYPE_TABBED,
   };
-  SetupMockLauncherModel(types, arraysize(types), 4);
+  SetupMockLauncherModel(types, arraysize(types), 5);
 
-  // Second one.  It skips the APP_LIST item at the end of the list,
-  // wraps to the beginning, and skips BROWSER_SHORTCUT and APP_SHORTCUT
-  // at the beginning of the list.
-  EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
+  // Second one.  It starts a the end, wraps to the beginning, and skips

[Mattias Nissler (ping if slow), 2012/09/11 08:42:30]

s/a/at/

[DaveMoore, 2012/09/11 17:07:00]

Done.

+  // APP_LIST, BROWSER_SHORTCUT and APP_SHORTCUT at the beginning of the list.
+  EXPECT_EQ(3, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
 }
 
 TEST_F(LauncherNavigatorTest, Empty) {
   SetupMockLauncherModel(NULL, 0, -1);
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 TEST_F(LauncherNavigatorTest, SingleEntry) {
   LauncherItemType type = TYPE_TABBED;
-  SetupMockLauncherModel(&type, 1, 1);
+  SetupMockLauncherModel(&type, 1, 2);
 
   // If there's only one item there and it is already active, there's no item
   // to be activated next.
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 TEST_F(LauncherNavigatorTest, NoActive) {
   LauncherItemType types[] = {
     TYPE_TABBED, TYPE_TABBED,
   };
   // Special case: no items are 'STATUS_ACTIVE'.
   SetupMockLauncherModel(types, arraysize(types), -1);
 
   // If there are no active status, pick the first running item as a fallback.
-  EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
-  EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
+  EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
+  EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 }  // namespace ash