| Index: ui/display/chromeos/configure_displays_task_unittest.cc
|
| diff --git a/ui/display/chromeos/configure_displays_task_unittest.cc b/ui/display/chromeos/configure_displays_task_unittest.cc
|
| deleted file mode 100644
|
| index 347d8a28c84960cc84ce7c3a197dabf6dc30f8a7..0000000000000000000000000000000000000000
|
| --- a/ui/display/chromeos/configure_displays_task_unittest.cc
|
| +++ /dev/null
|
| @@ -1,245 +0,0 @@
|
| -// 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 <stddef.h>
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/macros.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/run_loop.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/display/chromeos/configure_displays_task.h"
|
| -#include "ui/display/chromeos/test/action_logger_util.h"
|
| -#include "ui/display/chromeos/test/test_native_display_delegate.h"
|
| -#include "ui/display/fake_display_snapshot.h"
|
| -
|
| -namespace ui {
|
| -namespace test {
|
| -
|
| -namespace {
|
| -
|
| -class ConfigureDisplaysTaskTest : public testing::Test {
|
| - public:
|
| - ConfigureDisplaysTaskTest()
|
| - : delegate_(&log_),
|
| - callback_called_(false),
|
| - status_(ConfigureDisplaysTask::ERROR),
|
| - small_mode_(gfx::Size(1366, 768), false, 60.0f),
|
| - big_mode_(gfx::Size(2560, 1600), false, 60.0f) {
|
| - displays_[0] = display::FakeDisplaySnapshot::Builder()
|
| - .SetId(123)
|
| - .SetNativeMode(small_mode_.Clone())
|
| - .SetCurrentMode(small_mode_.Clone())
|
| - .Build();
|
| -
|
| - displays_[1] = display::FakeDisplaySnapshot::Builder()
|
| - .SetId(456)
|
| - .SetNativeMode(big_mode_.Clone())
|
| - .SetCurrentMode(big_mode_.Clone())
|
| - .AddMode(small_mode_.Clone())
|
| - .Build();
|
| - }
|
| - ~ConfigureDisplaysTaskTest() override {}
|
| -
|
| - void ConfigureCallback(ConfigureDisplaysTask::Status status) {
|
| - callback_called_ = true;
|
| - status_ = status;
|
| - }
|
| -
|
| - protected:
|
| - base::MessageLoop message_loop_;
|
| - ActionLogger log_;
|
| - TestNativeDisplayDelegate delegate_;
|
| -
|
| - bool callback_called_;
|
| - ConfigureDisplaysTask::Status status_;
|
| -
|
| - const DisplayMode small_mode_;
|
| - const DisplayMode big_mode_;
|
| -
|
| - std::unique_ptr<DisplaySnapshot> displays_[2];
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(ConfigureDisplaysTaskTest);
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithNoDisplays) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - ConfigureDisplaysTask task(&delegate_, std::vector<DisplayConfigureRequest>(),
|
| - callback);
|
| -
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::SUCCESS, status_);
|
| - EXPECT_EQ(kNoActions, log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithOneDisplay) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - std::vector<DisplayConfigureRequest> requests(
|
| - 1,
|
| - DisplayConfigureRequest(displays_[0].get(), &small_mode_, gfx::Point()));
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::SUCCESS, status_);
|
| - EXPECT_EQ(GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithTwoDisplay) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - std::vector<DisplayConfigureRequest> requests;
|
| - for (size_t i = 0; i < arraysize(displays_); ++i) {
|
| - requests.push_back(DisplayConfigureRequest(
|
| - displays_[i].get(), displays_[i]->native_mode(), gfx::Point()));
|
| - }
|
| -
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::SUCCESS, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(
|
| - GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &big_mode_, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, DisableDisplayFails) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - delegate_.set_max_configurable_pixels(1);
|
| -
|
| - std::vector<DisplayConfigureRequest> requests(
|
| - 1, DisplayConfigureRequest(displays_[0].get(), nullptr, gfx::Point()));
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::ERROR, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(GetCrtcAction(*displays_[0], nullptr, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithOneDisplayFails) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - delegate_.set_max_configurable_pixels(1);
|
| -
|
| - std::vector<DisplayConfigureRequest> requests(
|
| - 1, DisplayConfigureRequest(displays_[1].get(), &big_mode_, gfx::Point()));
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::ERROR, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(
|
| - GetCrtcAction(*displays_[1], &big_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &small_mode_, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithTwoDisplayFails) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - delegate_.set_max_configurable_pixels(1);
|
| -
|
| - std::vector<DisplayConfigureRequest> requests;
|
| - for (size_t i = 0; i < arraysize(displays_); ++i) {
|
| - requests.push_back(DisplayConfigureRequest(
|
| - displays_[i].get(), displays_[i]->native_mode(), gfx::Point()));
|
| - }
|
| -
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::ERROR, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(
|
| - GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &big_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &small_mode_, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, ConfigureWithTwoDisplaysPartialSuccess) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - delegate_.set_max_configurable_pixels(small_mode_.size().GetArea());
|
| -
|
| - std::vector<DisplayConfigureRequest> requests;
|
| - for (size_t i = 0; i < arraysize(displays_); ++i) {
|
| - requests.push_back(DisplayConfigureRequest(
|
| - displays_[i].get(), displays_[i]->native_mode(), gfx::Point()));
|
| - }
|
| -
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::PARTIAL_SUCCESS, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(
|
| - GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &big_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &small_mode_, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -TEST_F(ConfigureDisplaysTaskTest, AsyncConfigureWithTwoDisplaysPartialSuccess) {
|
| - ConfigureDisplaysTask::ResponseCallback callback = base::Bind(
|
| - &ConfigureDisplaysTaskTest::ConfigureCallback, base::Unretained(this));
|
| -
|
| - delegate_.set_run_async(true);
|
| - delegate_.set_max_configurable_pixels(small_mode_.size().GetArea());
|
| -
|
| - std::vector<DisplayConfigureRequest> requests;
|
| - for (size_t i = 0; i < arraysize(displays_); ++i) {
|
| - requests.push_back(DisplayConfigureRequest(
|
| - displays_[i].get(), displays_[i]->native_mode(), gfx::Point()));
|
| - }
|
| -
|
| - ConfigureDisplaysTask task(&delegate_, requests, callback);
|
| - task.Run();
|
| -
|
| - EXPECT_FALSE(callback_called_);
|
| - base::RunLoop().RunUntilIdle();
|
| -
|
| - EXPECT_TRUE(callback_called_);
|
| - EXPECT_EQ(ConfigureDisplaysTask::PARTIAL_SUCCESS, status_);
|
| - EXPECT_EQ(
|
| - JoinActions(
|
| - GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &big_mode_, gfx::Point()).c_str(),
|
| - GetCrtcAction(*displays_[1], &small_mode_, gfx::Point()).c_str(),
|
| - nullptr),
|
| - log_.GetActionsAndClear());
|
| -}
|
| -
|
| -} // namespace test
|
| -} // namespace ui
|
|
|