Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3309)

Unified Diff: blimp/engine/app/ui/blimp_screen_unittest.cc

Issue 2629743003: Remove all blimp engine code (Closed)
Patch Set: Use consistent comment style in //chrome Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/engine/app/ui/blimp_screen.cc ('k') | blimp/engine/app/ui/blimp_window_parenting_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/engine/app/ui/blimp_screen_unittest.cc
diff --git a/blimp/engine/app/ui/blimp_screen_unittest.cc b/blimp/engine/app/ui/blimp_screen_unittest.cc
deleted file mode 100644
index dd6cc6427db3ee687279a3652fe22549f8ee8ff7..0000000000000000000000000000000000000000
--- a/blimp/engine/app/ui/blimp_screen_unittest.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2016 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 "blimp/engine/app/ui/blimp_screen.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/command_line.h"
-#include "base/files/file_util.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/memory/ptr_util.h"
-#include "base/strings/stringprintf.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/display/display.h"
-#include "ui/display/display_observer.h"
-#include "ui/display/screen.h"
-
-using testing::InSequence;
-
-namespace blimp {
-namespace engine {
-namespace {
-
-// Checks if two display::Displays have the ID.
-MATCHER_P(EqualsDisplay, display, "") {
- return display.id() == arg.id();
-}
-
-class MockDisplayObserver : public display::DisplayObserver {
- public:
- MockDisplayObserver() {}
- ~MockDisplayObserver() override {}
-
- MOCK_METHOD1(OnDisplayAdded, void(const display::Display&));
- MOCK_METHOD1(OnDisplayRemoved, void(const display::Display&));
- MOCK_METHOD2(OnDisplayMetricsChanged,
- void(const display::Display& display, uint32_t changed_metrics));
-};
-
-class BlimpScreenTest : public testing::Test {
- protected:
- void SetUp() override {
- screen_ = base::WrapUnique(new BlimpScreen);
- screen_->AddObserver(&observer1_);
- screen_->AddObserver(&observer2_);
- }
-
- std::unique_ptr<BlimpScreen> screen_;
- testing::StrictMock<MockDisplayObserver> observer1_;
- testing::StrictMock<MockDisplayObserver> observer2_;
-};
-
-TEST_F(BlimpScreenTest, ObserversAreInfomed) {
- auto display = screen_->GetPrimaryDisplay();
- uint32_t changed_metrics =
- display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
- display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
- display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
-
- InSequence s;
- EXPECT_CALL(observer1_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
- EXPECT_CALL(observer2_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
-
- changed_metrics = display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
- display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
- EXPECT_CALL(observer1_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
- EXPECT_CALL(observer2_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
-
- changed_metrics =
- display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
- display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
- display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
- EXPECT_CALL(observer1_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
- EXPECT_CALL(observer2_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
-
- gfx::Size size1(100, 200);
- screen_->UpdateDisplayScaleAndSize(2.0f, size1);
- EXPECT_EQ(size1, screen_->GetPrimaryDisplay().GetSizeInPixel());
- EXPECT_EQ(2.0f, screen_->GetPrimaryDisplay().device_scale_factor());
-
- screen_->UpdateDisplayScaleAndSize(2.0f, size1);
-
- gfx::Size size2(200, 100);
- screen_->UpdateDisplayScaleAndSize(2.0f, size2);
- EXPECT_EQ(size2, screen_->GetPrimaryDisplay().GetSizeInPixel());
- EXPECT_EQ(2.0f, screen_->GetPrimaryDisplay().device_scale_factor());
-
- screen_->UpdateDisplayScaleAndSize(3.0f, size2);
- EXPECT_EQ(3.0f, screen_->GetPrimaryDisplay().device_scale_factor());
-}
-
-TEST_F(BlimpScreenTest, RemoveObserver) {
- screen_->RemoveObserver(&observer2_);
- auto display = screen_->GetPrimaryDisplay();
- uint32_t changed_metrics =
- display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
- display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
- display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
- EXPECT_CALL(observer1_,
- OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
-
- gfx::Size size1(100, 100);
- screen_->UpdateDisplayScaleAndSize(2.0f, size1);
- EXPECT_EQ(size1, screen_->GetPrimaryDisplay().GetSizeInPixel());
-}
-
-} // namespace
-} // namespace engine
-} // namespace blimp
« no previous file with comments | « blimp/engine/app/ui/blimp_screen.cc ('k') | blimp/engine/app/ui/blimp_window_parenting_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698