Relocate reuseable portions of ash/display/display_util.*

ui/display/manager/display_manager_utilities_unittest.cc

Index: ui/display/manager/display_manager_utilities_unittest.cc
diff --git a/ui/display/manager/display_manager_utilities_unittest.cc b/ui/display/manager/display_manager_utilities_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b82871b141c07499334bd7e7a4af764235650b4a
--- /dev/null
+++ b/ui/display/manager/display_manager_utilities_unittest.cc
@@ -0,0 +1,122 @@
+// Copyright 2014 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/display/display_util.h"
+
+#include "ui/display/manager/display_manager_utilities.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+//#include "ash/root_window_controller.h"
+//#include "ash/shell.h"
+//#include "ash/test/ash_test_base.h"
+//#include "ash/test/display_manager_test_api.h"
+
+namespace display {
+
+// typedef test::AshTestBase DisplayUtilTest;
+
+namespace {
+
+class ScopedSetInternalDisplayId {
+ public:
+  ScopedSetInternalDisplayId(int64_t);
+  ~ScopedSetInternalDisplayId();
+};
+
+ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64_t id) {
+  display::Display::SetInternalDisplayId(id);
+}
+
+ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
+  display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
+}
+
+}  // namespace
+
+TEST(DisplayUtilitiesTest, GenerateDisplayIdList) {
+  display::DisplayIdList list;
+  {
+    int64_t ids[] = {10, 1};
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(1, list[0]);
+    EXPECT_EQ(10, list[1]);
+
+    int64_t three_ids[] = {10, 5, 1};
+    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
+    ASSERT_EQ(3u, list.size());
+    EXPECT_EQ(1, list[0]);
+    EXPECT_EQ(5, list[1]);
+    EXPECT_EQ(10, list[2]);
+  }
+  {
+    int64_t ids[] = {10, 100};
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
+
+    int64_t three_ids[] = {10, 100, 1000};
+    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
+    ASSERT_EQ(3u, list.size());
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
+    EXPECT_EQ(1000, list[2]);
+  }
+  {
+    ScopedSetInternalDisplayId set_internal(100);
+    int64_t ids[] = {10, 100};
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(100, list[0]);
+    EXPECT_EQ(10, list[1]);
+
+    std::swap(ids[0], ids[1]);
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(100, list[0]);
+    EXPECT_EQ(10, list[1]);
+
+    int64_t three_ids[] = {10, 100, 1000};
+    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
+    ASSERT_EQ(3u, list.size());
+    EXPECT_EQ(100, list[0]);
+    EXPECT_EQ(10, list[1]);
+    EXPECT_EQ(1000, list[2]);
+  }
+  {
+    ScopedSetInternalDisplayId set_internal(10);
+    int64_t ids[] = {10, 100};
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
+
+    std::swap(ids[0], ids[1]);
+    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
+
+    int64_t three_ids[] = {10, 100, 1000};
+    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
+    ASSERT_EQ(3u, list.size());
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
+    EXPECT_EQ(1000, list[2]);
+  }
+}
+
+TEST(DisplayUtilitiesTest, DisplayIdListToString) {
+  {
+    int64_t ids[] = {10, 1, 16};
+    display::DisplayIdList list =
+        GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ("1,10,16", DisplayIdListToString(list));
+  }
+  {
+    ScopedSetInternalDisplayId set_internal(16);
+    int64_t ids[] = {10, 1, 16};
+    display::DisplayIdList list =
+        GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    EXPECT_EQ("16,1,10", DisplayIdListToString(list));
+  }
+}
+
+}  // namespace display