Separate the NTP app ordering from the app list app ordering

chrome/browser/ui/app_list/app_list_extension_sorting_unittest.cc

Index: chrome/browser/ui/app_list/app_list_extension_sorting_unittest.cc
diff --git a/chrome/browser/ui/app_list/app_list_extension_sorting_unittest.cc b/chrome/browser/ui/app_list/app_list_extension_sorting_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..19c3caa705051cf41c2575d06d13685ebe7b68f7
--- /dev/null
+++ b/chrome/browser/ui/app_list/app_list_extension_sorting_unittest.cc
@@ -0,0 +1,211 @@
+// 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 "chrome/browser/ui/app_list/app_list_extension_sorting.h"
+
+#include <string>
+
+#include "chrome/browser/extensions/extension_prefs_unittest.h"
+#include "chrome/browser/extensions/extension_sorting.h"
+#include "chrome/browser/extensions/test_extension_service.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "sync/api/string_ordinal.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+const char kHostedAppId[] = "dceacbkfkmllgmjmbhgkpjegnodmildf";
+const char kPackagedApp1Id[] = "emfkafnhnpcmabnnkckkchdilgeoekbo";
+const char kPackagedApp2Id[] = "jlklkagmeajbjiobondfhiekepofmljl";
+
+class MockExtensionService : public TestExtensionService {
+ public:
+  virtual const extensions::Extension* GetInstalledExtension(
+      const std::string& id) const OVERRIDE {
+    return NULL;
+  }
+  virtual void SyncExtensionChangeIfNeeded(
+      const extensions::Extension& extension) OVERRIDE {}
+};
+
+}  // namespace
+
+class AppListExtensionSortingTest : public extensions::ExtensionPrefsTest {
+ public:
+  AppListExtensionSortingTest() {}
+  virtual ~AppListExtensionSortingTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    prefs()->app_list_extension_sorting()->
+        SetExtensionService(&extension_service_);
+    extensions::ExtensionPrefsTest::SetUp();
+  }
+
+ protected:
+  AppListExtensionSorting* app_list_extension_sorting() {
+    return prefs()->app_list_extension_sorting();
+  }
+
+ private:
+  MockExtensionService extension_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(AppListExtensionSortingTest);
+};
+
+class AppListExtensionSortingInsertion : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    app_list_extension_sorting()->InsertAtFront(kHostedAppId);
+    app_list_extension_sorting()->InsertAtFront(kPackagedApp1Id);
+    app_list_extension_sorting()->InsertAtBack(kPackagedApp2Id);
+  }
+
+  virtual void Verify() OVERRIDE {
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kPackagedApp1Id, kHostedAppId));
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kHostedAppId, kPackagedApp2Id));
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kPackagedApp1Id, kPackagedApp2Id));
+  }
+};
+TEST_F(AppListExtensionSortingInsertion, AppListExtensionSortingInsertion) {}
+
+class AppListExtensionSortingContains : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    EXPECT_FALSE(app_list_extension_sorting()->Contains(kHostedAppId));
+    app_list_extension_sorting()->InsertAtFront(kHostedAppId);
+    EXPECT_FALSE(app_list_extension_sorting()->Contains(kPackagedApp1Id));
+    app_list_extension_sorting()->InsertAtBack(kPackagedApp1Id);
+    EXPECT_FALSE(app_list_extension_sorting()->Contains(kPackagedApp2Id));
+    app_list_extension_sorting()->InsertAtBack(kPackagedApp2Id);
+  }
+
+  virtual void Verify() OVERRIDE {
+    EXPECT_TRUE(app_list_extension_sorting()->Contains(kHostedAppId));
+    EXPECT_TRUE(app_list_extension_sorting()->Contains(kPackagedApp1Id));
+    EXPECT_TRUE(app_list_extension_sorting()->Contains(kPackagedApp2Id));
+  }
+};
+TEST_F(AppListExtensionSortingContains, AppListExtensionSortingContains) {}
+
+class AppListExtensionSortingErase : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    app_list_extension_sorting()->InsertAtFront(kHostedAppId);
+    EXPECT_TRUE(app_list_extension_sorting()->Contains(kHostedAppId));
+    app_list_extension_sorting()->Erase(kHostedAppId);
+  }
+
+  virtual void Verify() OVERRIDE {
+    EXPECT_FALSE(app_list_extension_sorting()->Contains(kHostedAppId));
+  }
+};
+TEST_F(AppListExtensionSortingErase, AppListExtensionSortingErase) {}
+
+class AppListExtensionSortingFixSyncCollisions
+    : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    syncer::StringOrdinal conflict_ordinal =
+        syncer::StringOrdinal::CreateInitialOrdinal();
+    app_list_extension_sorting()->
+        UpdateAppListOrdinalFromSync(kHostedAppId, conflict_ordinal);
+    app_list_extension_sorting()->
+        UpdateAppListOrdinalFromSync(kPackagedApp1Id, conflict_ordinal);
+    app_list_extension_sorting()->
+        UpdateAppListOrdinalFromSync(kPackagedApp2Id, conflict_ordinal);
+
+    app_list_extension_sorting()->FixSyncCollisions();
+  }
+
+  virtual void Verify() OVERRIDE {
+    // Conflicts are ordered by extension id.
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kHostedAppId, kPackagedApp1Id));
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kPackagedApp1Id, kPackagedApp2Id));
+  }
+};
+TEST_F(AppListExtensionSortingFixSyncCollisions,
+       AppListExtensionSortingFixSyncCollisions) {}
+
+class AppListExtensionSortingDefaultAppOrder
+    : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    // Erase the default ordinals set up when constructing the test environment.
+    app_list_extension_sorting()->Erase(extension_misc::kChromeAppId);
+    app_list_extension_sorting()->Erase(extension_misc::kWebStoreAppId);
+
+    // Add a pre-existing app. The default apps should be added in front of it.
+    app_list_extension_sorting()->UpdateAppListOrdinalFromSync(
+        kPackagedApp2Id,
+        syncer::StringOrdinal::CreateInitialOrdinal());
+
+    extensions::ExtensionIdList ids;
+    ids.push_back(kPackagedApp1Id);
+    ids.push_back(kPackagedApp2Id);
+    app_list_extension_sorting()->Initialize(ids, NULL);
+  }
+
+  virtual void Verify() OVERRIDE {
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(extension_misc::kChromeAppId,
+                          extension_misc::kWebStoreAppId));
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(extension_misc::kWebStoreAppId,
+                          kPackagedApp2Id));
+    EXPECT_FALSE(app_list_extension_sorting()->Contains(kPackagedApp1Id));
+  }
+};
+TEST_F(AppListExtensionSortingDefaultAppOrder,
+       AppListExtensionSortingDefaultAppOrder) {}
+
+class AppListExtensionSortingInitializedFromNTP
+    : public AppListExtensionSortingTest {
+ public:
+  virtual void Initialize() OVERRIDE {
+    EXPECT_TRUE(!app_list_extension_sorting()->Contains(kHostedAppId));
+    EXPECT_TRUE(!app_list_extension_sorting()->Contains(kPackagedApp1Id));
+    EXPECT_TRUE(!app_list_extension_sorting()->Contains(kPackagedApp2Id));
+
+    // Add apps to the NTP.
+    prefs()->extension_sorting()->SetPageOrdinal(
+        kPackagedApp2Id,
+        syncer::StringOrdinal::CreateInitialOrdinal());

[koz (OOO until 15th September), 2013/08/20 07:16:57]

CreateInitialOrdinal() always returns the same StringOrdinal, right? Can you put
that in a variable and reuse it to make the intent clear, eg:

syncer::StringOrdinal page1 = CreateInitialOrdinal();
extension_sorting()->SetPageOrdinal(kPackagedApp2Id, page1);
extension_sorting()->SetPageOrdinal(kPackagedApp1Id, page1);

syncer::StringOrdinal first_app = CreateInitialOrdinal();
extension_sorting()->SetAppOrdinal(kPackagedApp2Id, first_app);
extension_sorting()->SetAppOrdinal(kPackagedApp2Id, first_app.CreateAfter());

+    prefs()->extension_sorting()->SetPageOrdinal(
+        kPackagedApp1Id,
+        syncer::StringOrdinal::CreateInitialOrdinal());
+    prefs()->extension_sorting()->SetAppLaunchOrdinal(
+        kPackagedApp2Id,
+        syncer::StringOrdinal::CreateInitialOrdinal());
+    prefs()->extension_sorting()->SetAppLaunchOrdinal(
+        kPackagedApp1Id,
+        syncer::StringOrdinal::CreateInitialOrdinal().CreateAfter());
+
+    // Add a pre-existing app to the app list. The NTP apps should be added
+    // behind it.
+    app_list_extension_sorting()->UpdateAppListOrdinalFromSync(
+        kHostedAppId,
+        syncer::StringOrdinal::CreateInitialOrdinal());
+
+    extensions::ExtensionIdList ids;
+    ids.push_back(kPackagedApp1Id);
+    ids.push_back(kPackagedApp2Id);
+    ids.push_back(kHostedAppId);
+
+    app_list_extension_sorting()->Initialize(ids, prefs()->extension_sorting());
+  }
+
+  virtual void Verify() OVERRIDE {
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kHostedAppId, kPackagedApp2Id));
+    EXPECT_TRUE(app_list_extension_sorting()->
+        ExtensionPrecedes(kPackagedApp2Id, kPackagedApp1Id));
+  }
+};
+TEST_F(AppListExtensionSortingInitializedFromNTP,
+       AppListExtensionSortingInitializedFromNTP) {}