Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/shelf/shelf_navigator_unittest.cc

 // Copyright 2013 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/shelf/shelf_navigator.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 51 matching lines @@
   }
 
   const ShelfModel& model() { return *model_.get(); }
 
  private:
   scoped_ptr<ShelfModel> model_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfNavigatorTest);
 };
 
+class ShelfNavigatorLegacyShelfLayoutTest : public ShelfNavigatorTest {
+ public:
+  ShelfNavigatorLegacyShelfLayoutTest() : ShelfNavigatorTest() {}
+
+ protected:
+  virtual void SetUp() OVERRIDE {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kAshDisableAlternateShelfLayout);
+    ShelfNavigatorTest::SetUp();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShelfNavigatorLegacyShelfLayoutTest);
+};
+
 }  // namespace
 
 TEST_F(ShelfNavigatorTest, BasicCycle) {
   // An app shortcut and three platform apps.
   ShelfItemType types[] = {
     TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
   };
   // ShelfModel automatically adds BROWSER_SHORTCUT item at the
   // beginning, so '3' refers the first TYPE_PLATFORM_APP item.
   SetupMockShelfModel(types, arraysize(types), 3);
 
   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(5, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
+TEST_F(ShelfNavigatorLegacyShelfLayoutTest, BasicCycle) {
+  // An app shortcut and three platform apps.
+  ShelfItemType types[] = {
+    TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
+  };
+  // ShelfModel automatically adds BROWSER_SHORTCUT item at the
+  // beginning, so '2' refers the first TYPE_PLATFORM_APP item.
+  SetupMockShelfModel(types, arraysize(types), 2);
+
+  EXPECT_EQ(3, 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));
+}
+
 TEST_F(ShelfNavigatorTest, WrapToBeginning) {
   ShelfItemType types[] = {
     TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
   };
   SetupMockShelfModel(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(3, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
 }
 
+TEST_F(ShelfNavigatorLegacyShelfLayoutTest, WrapToBeginning) {
+  ShelfItemType types[] = {
+    TYPE_APP_SHORTCUT, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
+  };
+  SetupMockShelfModel(types, arraysize(types), 4);
+
+  // 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));
+}
+
 TEST_F(ShelfNavigatorTest, Empty) {
   SetupMockShelfModel(NULL, 0, -1);
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
   EXPECT_EQ(-1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 TEST_F(ShelfNavigatorTest, SingleEntry) {
   ShelfItemType type = TYPE_PLATFORM_APP;
   SetupMockShelfModel(&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(ShelfNavigatorLegacyShelfLayoutTest, SingleEntry) {
+  ShelfItemType type = TYPE_PLATFORM_APP;
+  SetupMockShelfModel(&type, 1, 1);
+
+  // 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(ShelfNavigatorTest, NoActive) {
   ShelfItemType types[] = {
     TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
   };
   // Special case: no items are 'STATUS_ACTIVE'.
   SetupMockShelfModel(types, arraysize(types), -1);
 
   // If there are no active status, pick the first running item as a fallback.
   EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
   EXPECT_EQ(2, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
+TEST_F(ShelfNavigatorLegacyShelfLayoutTest, NoActive) {
+  ShelfItemType types[] = {
+    TYPE_PLATFORM_APP, TYPE_PLATFORM_APP,
+  };
+  // Special case: no items are 'STATUS_ACTIVE'.
+  SetupMockShelfModel(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));
+}
+
 }  // namespace ash